diff --git a/GameEngine/src/main/java/gameEngine/entites/editorComponents/EntityView.java b/GameEngine/src/main/java/gameEngine/entites/editorComponents/EntityView.java index 344dd5f..53e449a 100644 --- a/GameEngine/src/main/java/gameEngine/entites/editorComponents/EntityView.java +++ b/GameEngine/src/main/java/gameEngine/entites/editorComponents/EntityView.java @@ -1,6 +1,7 @@ package gameEngine.entites.editorComponents; import gameEngine.entites.EditorEntity; +import gameEngine.geometry.Transform; import gameEngine.views.Sprite; import gameEngine.views.Window; import org.joml.Vector3f; @@ -35,15 +36,15 @@ @Override public void update() { - sprite.setPosition(parent.transform.position); - sprite.setRotation(parent.transform.rotation); - sprite.setScale(parent.transform.scale); + Transform transform = parent.transform; + sprite.setPosition(transform.position); + sprite.setRotation(transform.rotation); + sprite.setScale(transform.scale); sprite.update(); - Vector3f pos = new Vector3f(parent.transform.position.x-30,parent.transform.position.y+8,parent.transform.position.z); - portviewA.update(pos, parent.transform.rotation, parent.transform.scale); + Vector3f pos = new Vector3f(transform.position.x-30,transform.position.y+8, transform.position.z); + portviewA.update(pos, transform.rotation, transform.scale); portviewA.handleDragging(); -// pos = new Vector3f(parent.transform.position.x-15,parent.transform.position.y+40,parent.transform.position.z); -// portviewB.update(pos, parent.transform.rotation, parent.transform.scale); + } @Override diff --git a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java index 6304827..981492b 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java @@ -136,7 +136,6 @@ editorCamera.move(velocity.x, velocity.y, velocity.z); for (EditorEntity editorEntity : editorEntities.values()) { - // 速度ベクトルを基にエンティティを移動 editorEntity.transform.setPosition( editorEntity.transform.position.x - velocity.x, editorEntity.transform.position.y - velocity.y, diff --git a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java index fe556bf..f04081e 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java @@ -68,7 +68,8 @@ public void update(float dt) { changeScene(0, dt); //Editorシーンへの以降処理 for (Entity entity : entities.values()) { - if (entity instanceof GameObject gameObject) { + if (entity instanceof GameObject) { + GameObject gameObject = (GameObject) entity; if(gameObject.getComponent(TextMesh.class) != null) continue; gameObject.updateComponents(); } diff --git a/GameEngine/src/main/java/gameEngine/views/Window.java b/GameEngine/src/main/java/gameEngine/views/Window.java index 7db4091..3067dc8 100644 --- a/GameEngine/src/main/java/gameEngine/views/Window.java +++ b/GameEngine/src/main/java/gameEngine/views/Window.java @@ -67,12 +67,12 @@ public void runFromEditor() { Window.changeScene(0); - fpsText = new Text(0,0,"",20); run(); } public void run() { System.out.println("Hello LWJGL " + Version.getVersion() + "!"); + fpsText = new Text(0,0,"",20); loop(); glfwFreeCallbacks(glfwWindow); glfwDestroyWindow(glfwWindow);