diff --git a/GameEngine/src/main/java/gameEngine/entites/Entity.java b/GameEngine/src/main/java/gameEngine/entites/Entity.java index 26b00aa..093dcba 100644 --- a/GameEngine/src/main/java/gameEngine/entites/Entity.java +++ b/GameEngine/src/main/java/gameEngine/entites/Entity.java @@ -10,7 +10,6 @@ private String entityId; // 作成時に割り当て public Transform transform = new Transform(); - public Transform originalTransform = new Transform(); //Editorで保持 public boolean active = true; public String name = "Entity"; @@ -18,15 +17,6 @@ entityId = eid; } - public void saveOriginalTransform() { - this.originalTransform = new Transform(this.transform); - } - - public void restoreOriginalTransform() { - this.transform = new Transform(this.originalTransform); - } - - public void setActive(boolean active) { this.active = active; } diff --git a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java index d102d48..dfd933c 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java @@ -4,6 +4,8 @@ import gameEngine.entites.GameObject; import gameEngine.entites.gameComponents.ComponentView; import gameEngine.entites.gameComponents.EntityView; +import gameEngine.entites.gameComponents.Mesh; +import gameEngine.entites.gameComponents.MoveImage; import java.util.HashMap; @@ -20,6 +22,33 @@ glClearColor(1, 1, 1, 0); } + public void addNewObject(GameObject editorObject) { + enqueueTask(() -> addNewGameObject(editorObject)); + } + + + private GameObject createGameObject(){ + int entitiesLength = entities.size(); + String newId = Integer.toString(entitiesLength); + GameObject gameObject = new GameObject(newId); + addEntity(newId, gameObject); + return gameObject; + } + + private void addNewGameObject(GameObject editorObject) { + GameObject object = createGameObject(); + object.transform.setPosition(editorObject.transform.position.x,editorObject.transform.position.y,0); + + for(GameObject.Connectiontype connectionType: editorObject.ComponentConnections) { + if(connectionType == GameObject.Connectiontype.Mesh){ + object.addComponent(new Mesh(object, Mesh.MeshType.SPRITE, "GameEngine/resources/0.png")); + } + if(connectionType == GameObject.Connectiontype.MoveImage){ + object.addComponent(new MoveImage(object)); + } + } + } + @Override public void update(float dt) { changeScene(0, dt); //Editorシーンへの以降処理 diff --git a/GameEngine/src/main/java/gameEngine/scenes/Scene.java b/GameEngine/src/main/java/gameEngine/scenes/Scene.java index a769cc1..498c236 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/Scene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/Scene.java @@ -50,32 +50,6 @@ entities.remove(eid); } - public void addNewObject(GameObject editorObject) { - enqueueTask(() -> addNewGameObject(editorObject)); - } - - - private GameObject createGameObject(){ - int entitiesLength = entities.size(); - String newId = Integer.toString(entitiesLength); - GameObject gameObject = new GameObject(newId); - addEntity(newId, gameObject); - return gameObject; - } - - private void addNewGameObject(GameObject editorObject) { - GameObject object = createGameObject(); - object.transform.setPosition(editorObject.transform.position.x,editorObject.transform.position.y,0); - - for(GameObject.Connectiontype connectionType: editorObject.ComponentConnections) { - if(connectionType == GameObject.Connectiontype.Mesh){ - object.addComponent(new Mesh(object, Mesh.MeshType.SPRITE, "GameEngine/resources/0.png")); - } - if(connectionType == GameObject.Connectiontype.MoveImage){ - object.addComponent(new MoveImage(object)); - } - } - } public void addComponentToGameObject(GameObject gameObject, GameComponent component) { enqueueTask(() -> gameObject.addComponent(component)); diff --git a/GameEngine/src/main/java/gameEngine/views/Window.java b/GameEngine/src/main/java/gameEngine/views/Window.java index aec6fbf..dba3a41 100644 --- a/GameEngine/src/main/java/gameEngine/views/Window.java +++ b/GameEngine/src/main/java/gameEngine/views/Window.java @@ -30,7 +30,6 @@ public int height; private String title; private long glfwWindow; - //private static SwingGameEditor swingGameEditor; private static GameEditor gameEditor; public ConnectionManager connectionManager = new ConnectionManager(); @@ -50,17 +49,11 @@ currentScene = new EditorScene(); } else { currentScene = new EditorScene(editorEntities); - for (Entity entity : currentScene.entities.values()) { - entity.restoreOriginalTransform(); - } gameEditor.setScene(currentScene); } initializeSceneEntities(); break; case 1: // GameScene - for (Entity entity : currentScene.entities.values()) { - entity.saveOriginalTransform(); - } EditorScene editorScene = (EditorScene) currentScene; editorEntities = editorScene.editorEntities; HashMap gameSceneEntities = new HashMap<>(editorEntities); @@ -80,8 +73,6 @@ gameObject.initComponents(); // コンポーネントの初期化 } } - //if(swingGameEditor != null) swingGameEditor.updateListByScene(currentScene); // ゲームエディタ側にシーン情報を渡す - } public static Window get() {