diff --git a/GameEngine/src/main/java/gameEngine/SwingGameEditor.java b/GameEngine/src/main/java/gameEngine/SwingGameEditor.java index b5fd16b..2c41d65 100644 --- a/GameEngine/src/main/java/gameEngine/SwingGameEditor.java +++ b/GameEngine/src/main/java/gameEngine/SwingGameEditor.java @@ -202,9 +202,6 @@ String component = (String) componentDropdown.getSelectedItem(); switch (component) { - case "ColorController": - gameScene.addComponentToGameObject(gameObject, new ColorController()); - break; case "CopyEntity": gameScene.addComponentToGameObject(gameObject, new CopyEntity(gameObject)); break; diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/ColorController.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/ColorController.java deleted file mode 100644 index 7bba6c8..0000000 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/ColorController.java +++ /dev/null @@ -1,59 +0,0 @@ -package gameEngine.entites.gameComponents; -import gameEngine.entites.Entity; -import gameEngine.entites.GameObject; -import gameEngine.input.*; -import gameEngine.views.Color; - -import static org.lwjgl.glfw.GLFW.*; -import static org.lwjgl.opengl.GL11.*; - -public class ColorController extends GameComponent { - private Color color = new Color(0,0,0); - - public ColorController() { - } - - @Override - public GameComponent copy() { - return this; - } - - - public void init() { - color = Color.BLACK; - } - - public void update() { - if (Input.GetKey(GLFW_KEY_R)) { - color = Color.RED; - System.out.println("R"); - } - - if (Input.GetKeyUp(GLFW_KEY_G)) { - color = Color.GREEN; - System.out.println("G"); - } - - if (Input.GetKeyDown(GLFW_KEY_B)) { - color = Color.BLUE; - System.out.println("B"); - } - - if (Input.GetMouseButton(0)) { - color = Color.CYAN; - System.out.println("CYAN"); - } - if (Input.GetMouseButtonUp(1)) { - color = Color.YELLOW; - System.out.println("YELLOW"); - } - if (Input.GetMouseButtonDown(2)) { - color = Color.MAGENTA; - System.out.println("MAGENTA"); - } - - glClearColor(color.r, color.g, color.b, 0.0F); - } - - -} diff --git a/GameEngine/src/main/java/gameEngine/scenes/Scene.java b/GameEngine/src/main/java/gameEngine/scenes/Scene.java index 8292421..9984dab 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/Scene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/Scene.java @@ -83,9 +83,6 @@ if (original.getComponent(TextMesh.class) != null) { newGameObject.addComponent(new TextMesh((TextMesh)original.getComponent(TextMesh.class).copy(), newGameObject)); } - if (original.getComponent(ColorController.class) != null) { - newGameObject.addComponent(new ColorController()); - } if (original.getComponent(CopyEntity.class) != null) { newGameObject.addComponent(new CopyEntity(newGameObject)); }