diff --git a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java index 8b15577..3f0aac9 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/EditorScene.java @@ -8,9 +8,12 @@ import gameEngine.entites.gameComponents.Draggable; import gameEngine.entites.gameComponents.EntityView; import gameEngine.entites.gameComponents.TextMesh; +import gameEngine.input.Input; +import gameEngine.views.Color; import gameEngine.views.Window; import org.joml.Vector3f; +import java.awt.event.KeyEvent; import java.util.HashMap; import static org.lwjgl.opengl.GL11.glClearColor; @@ -21,16 +24,7 @@ public HashMap editorEntities = new HashMap<>(); private Entity selectedEntity = null; public ConnectionManager connectionManager = new ConnectionManager(); - - public Entity getEditorEntity(String eid) { - return editorEntities.get(eid); - } - public void addEditorEntity(String eid, Entity entity) { - editorEntities.put(eid, entity); - } - public void removeEditorEntity(String eid) { - editorEntities.remove(eid); - } + private Color editorBackColor = new Color(1,1,1,0); public EditorScene(float windowWidth, float windowHeight){ System.out.println("Active Editor scene"); @@ -38,13 +32,6 @@ gameEditor.setScene(this); glClearColor(1, 1, 1, 0); } -// public EditorScene(HashMap editorEntities){ -// this.editorEntities = editorEntities; -// System.out.println("Active Editor scene"); -// gameEditor = new GameEditor(this); -// gameEditor.setScene(this); -// glClearColor(1, 1, 1, 0); -// } @Override public void update(float dt) { @@ -61,6 +48,17 @@ gameEditor.update(); } + public Entity getEditorEntity(String eid) { + return editorEntities.get(eid); + } + public void addEditorEntity(String eid, Entity entity) { + editorEntities.put(eid, entity); + } + public void removeEditorEntity(String eid) { + editorEntities.remove(eid); + } + + private GameObject createGameObject(){ int entitiesLength = editorEntities.size(); String newId = Integer.toString(entitiesLength); @@ -143,4 +141,6 @@ } } } + + }