diff --git a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java index 6a94662..9e025b9 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java @@ -7,10 +7,7 @@ import gameEngine.entites.Camera; import gameEngine.entites.EditorEntity; import gameEngine.entites.Entity; -import gameEngine.entites.editorComponents.CameraView; -import gameEngine.entites.editorComponents.ComponentView; -import gameEngine.entites.editorComponents.DraggableComponent; -import gameEngine.entites.editorComponents.EntityView; +import gameEngine.entites.editorComponents.*; import gameEngine.geometry.Transform; import gameEngine.input.Input; import gameEngine.views.Window; @@ -212,4 +209,12 @@ } } } + + //以下テスト用 + private void connectAllComponent(){ + for(EditorEntity editorEntity: editorEntities.values()){ + + } + + } } diff --git a/GameEngine/src/main/java/gameEngine/views/Window.java b/GameEngine/src/main/java/gameEngine/views/Window.java index 06e9150..12bc56a 100644 --- a/GameEngine/src/main/java/gameEngine/views/Window.java +++ b/GameEngine/src/main/java/gameEngine/views/Window.java @@ -28,17 +28,20 @@ private Text fpsText; private EditorScene editorScene ; + private static boolean playDTRAM = false; private Window() { this.width = 1200; this.height = 900; this.title = "PuniPuniGameEngine"; init(); + System.out.println("JVM Version: " + System.getProperty("java.vm.version")); } public static void changeScene(int newScene) { switch (newScene) { case 0: // EditorScene + playDTRAM = false; if (window.editorScene == null) { window.editorScene = new EditorScene(window.width, window.height); } @@ -52,6 +55,7 @@ else currentScene = new GameScene(); break; case 2: //DTRAM Scene + playDTRAM = true; currentScene = new GameScene(); break; default: @@ -134,12 +138,14 @@ while (!glfwWindowShouldClose(glfwWindow)) { glfwPollEvents(); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - float dt = Time.deltaTime; + float dt = Time.deltaTime; if (dt >= 0) { + if(currentScene instanceof GameScene && !playDTRAM) System.out.println(System.nanoTime()); //開始 currentScene.update(dt); currentScene.processTasks(); + if(currentScene instanceof GameScene && !playDTRAM) System.out.println(System.nanoTime()); //終了 fpsText.setText("" + Time.getFPS()); fpsText.setColor(Color.WHITE); @@ -148,6 +154,7 @@ MouseInput.endFrame(); KeyInput.endFrame(); } + glfwSwapBuffers(glfwWindow); Time.update(); }