diff --git a/GameEngine/src/main/java/gameEngine/Time.java b/GameEngine/src/main/java/gameEngine/Time.java index 49abfd7..dd026db 100644 --- a/GameEngine/src/main/java/gameEngine/Time.java +++ b/GameEngine/src/main/java/gameEngine/Time.java @@ -25,7 +25,6 @@ currentFps = frameCount / ((currentTime - lastFpsCheckTime) * 1E-9f); frameCount = 0; lastFpsCheckTime = currentTime; - System.out.println("Current FPS: " + currentFps); } // フレームレート制限 @@ -47,4 +46,8 @@ frameCount = 0; currentFps = 0; } + + public static int getFPS(){ + return (int)currentFps; + } } diff --git a/GameEngine/src/main/java/gameEngine/views/Color.java b/GameEngine/src/main/java/gameEngine/views/Color.java index c5d3539..f64b7ee 100644 --- a/GameEngine/src/main/java/gameEngine/views/Color.java +++ b/GameEngine/src/main/java/gameEngine/views/Color.java @@ -18,8 +18,8 @@ public static final Color RED = new Color(1, 0, 0); public static final Color GREEN = new Color(0, 1, 0); public static final Color BLUE = new Color(0, 0, 1); - public static final Color WHITE = new Color(0, 0, 0); - public static final Color BLACK = new Color(1, 1, 1); + public static final Color WHITE = new Color(1, 1, 1); + public static final Color BLACK = new Color(0, 0, 0); public static final Color GRAY = new Color(0.75f,0.75f,0.75f); public static final Color YELLOW = new Color(1, 1, 0); public static final Color MAGENTA = new Color(1, 0, 1); diff --git a/GameEngine/src/main/java/gameEngine/views/Window.java b/GameEngine/src/main/java/gameEngine/views/Window.java index 116d4c9..7db4091 100644 --- a/GameEngine/src/main/java/gameEngine/views/Window.java +++ b/GameEngine/src/main/java/gameEngine/views/Window.java @@ -25,6 +25,7 @@ public int height; private String title; private long glfwWindow; + private Text fpsText; private EditorScene editorScene ; @@ -66,6 +67,7 @@ public void runFromEditor() { Window.changeScene(0); + fpsText = new Text(0,0,"",20); run(); } @@ -136,6 +138,10 @@ currentScene.update(dt); currentScene.processTasks(); + fpsText.setText("" + Time.getFPS()); + fpsText.setColor(Color.WHITE); + fpsText.update(); + MouseInput.endFrame(); KeyInput.endFrame(); }