diff --git a/GameEngine/src/main/java/gameEngine/ConnectionManager.java b/GameEngine/src/main/java/gameEngine/ConnectionManager.java index 8e3f740..9d5874d 100644 --- a/GameEngine/src/main/java/gameEngine/ConnectionManager.java +++ b/GameEngine/src/main/java/gameEngine/ConnectionManager.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import gameEngine.entites.Entity; import gameEngine.entites.GameObject; import gameEngine.entites.gameComponents.*; import gameEngine.input.Input; diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/ButtonComponent.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/ButtonComponent.java index a54ac69..017e670 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/ButtonComponent.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/ButtonComponent.java @@ -1,15 +1,16 @@ package gameEngine.entites.gameComponents; import gameEngine.entites.Entity; +import gameEngine.entites.GameObject; import gameEngine.views.Button; import gameEngine.views.Color; public class ButtonComponent extends GameComponent { private Button button; - public ButtonComponent(Entity entity) { - this.button = new Button(entity.transform.position.x, entity.transform.position.y, - entity.transform.scale.x, entity.transform.scale.y); + public ButtonComponent(GameObject parent) { + this.button = new Button(parent.transform.position.x, parent.transform.position.y, + parent.transform.scale.x, parent.transform.scale.y); } @Override diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/ComponentView.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/ComponentView.java index d623478..9bf08f5 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/ComponentView.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/ComponentView.java @@ -10,8 +10,8 @@ public GameObject.Connectiontype connectionType; private PortView portviewA; - public ComponentView(Entity entity, GameObject.Connectiontype connectionType){ - this.parent = entity; + public ComponentView(GameObject parent, GameObject.Connectiontype connectionType){ + this.parent = parent; this.sprite = new Sprite("GameEngine/resources/ComponentView.png"); sprite.updateSpriteDimensions(); portviewA = new PortView(PortView.PortType.OUT, parent); diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/CopyEntity.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/CopyEntity.java index bb9d02e..079fd5d 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/CopyEntity.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/CopyEntity.java @@ -10,9 +10,9 @@ public class CopyEntity extends GameComponent{ Window window = Window.get(); - private Entity entity; - public CopyEntity(Entity entity){ - this.entity = entity; + private GameObject parent; + public CopyEntity(GameObject parent){ + this.parent = parent; } @Override public GameComponent copy() { @@ -22,8 +22,8 @@ public void update() { if(Input.GetKeyDown(GLFW_KEY_G)){ - window.getScene().Instantiate((GameObject) entity); - System.out.println(entity.getName() + " copied."); + window.getScene().Instantiate((GameObject) parent); + System.out.println(parent.getName() + " copied."); } } } diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/Draggable.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/Draggable.java index f497964..4893aa0 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/Draggable.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/Draggable.java @@ -2,6 +2,7 @@ import gameEngine.Time; import gameEngine.entites.Entity; +import gameEngine.entites.GameObject; import gameEngine.input.Input; import gameEngine.input.MouseInput; import gameEngine.scenes.EditorScene; @@ -9,7 +10,7 @@ import gameEngine.views.Window; public abstract class Draggable extends GameComponent { - protected Entity parent; + protected GameObject parent; protected boolean isDraggable = true; protected boolean isDragging = false; diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/EntityView.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/EntityView.java index 3414f18..0291386 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/EntityView.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/EntityView.java @@ -1,6 +1,7 @@ package gameEngine.entites.gameComponents; import gameEngine.entites.Entity; +import gameEngine.entites.GameObject; import gameEngine.views.Sprite; import org.joml.Vector3f; @@ -10,8 +11,8 @@ private PortView portviewA; private PortView portviewB; - public EntityView(Entity entity){ - this.parent = entity; + public EntityView(GameObject parent){ + this.parent = parent; this.sprite = new Sprite("GameEngine/resources/EntityView.png"); sprite.updateSpriteDimensions(); portviewA = new PortView(PortView.PortType.IN, parent); diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/Mesh.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/Mesh.java index 68b3490..5b3b2f7 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/Mesh.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/Mesh.java @@ -1,6 +1,7 @@ package gameEngine.entites.gameComponents; import gameEngine.entites.Entity; +import gameEngine.entites.GameObject; import gameEngine.views.Color; import gameEngine.views.Sprite; import org.joml.Vector3f; @@ -14,7 +15,7 @@ private final MeshType type; private Sprite sprite; - public Mesh(Entity parent, MeshType type, String texturePath) { + public Mesh(GameObject parent, MeshType type, String texturePath) { this.parent = parent; this.type = type; if (type == MeshType.SPRITE) { @@ -22,7 +23,7 @@ sprite.updateSpriteDimensions(); } } - public Mesh(Mesh original, Entity newParent) { + public Mesh(Mesh original, GameObject newParent) { this.type = original.type; this.sprite = original.sprite; this.parent = newParent; diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/MoveImage.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/MoveImage.java index 21fdd09..4f0e405 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/MoveImage.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/MoveImage.java @@ -3,18 +3,16 @@ import gameEngine.entites.GameObject; import gameEngine.input.*; import gameEngine.views.Color; -import gameEngine.views.Window; import static org.lwjgl.glfw.GLFW.*; -import static org.lwjgl.opengl.GL11.*; public class MoveImage extends GameComponent{ - private Entity entity; + private GameObject parent; - public MoveImage(Entity entity){ - this.entity = entity; + public MoveImage(GameObject parent){ + this.parent = parent; } @Override public GameComponent copy() { @@ -24,88 +22,88 @@ public void update() { if(Input.GetKey(GLFW_KEY_O)){ - GameObject gameObject = (GameObject) entity; + GameObject gameObject = (GameObject) parent; TextMesh textmesh = gameObject.getComponent(TextMesh.class); textmesh.setTextSize(textmesh.getTextSize() + 1); } if(Input.GetKey(GLFW_KEY_P)){ - GameObject gameObject = (GameObject) entity; + GameObject gameObject = (GameObject) parent; TextMesh textmesh = gameObject.getComponent(TextMesh.class); textmesh.setTextSize(textmesh.getTextSize() - 1); } if(Input.GetKeyDown(GLFW_KEY_I)){ - GameObject gameObject = (GameObject) entity; + GameObject gameObject = (GameObject) parent; TextMesh textmesh = gameObject.getComponent(TextMesh.class); textmesh.setText("popopo"); } if(Input.GetKeyDown(GLFW_KEY_U)){ - GameObject gameObject = (GameObject) entity; + GameObject gameObject = (GameObject) parent; TextMesh textmesh = gameObject.getComponent(TextMesh.class); textmesh.setColor(new Color(1f,0f,1f,1f)); } if (Input.GetKey(GLFW_KEY_W)) { - float y = entity.transform.position.y; - entity.transform.setPosition(entity.transform.position.x, y - 1, entity.transform.position.z); + float y = parent.transform.position.y; + parent.transform.setPosition(parent.transform.position.x, y - 1, parent.transform.position.z); } if (Input.GetKey(GLFW_KEY_A)) { - float x = entity.transform.position.x; - entity.transform.setPosition(x - 1, entity.transform.position.y, entity.transform.position.z); + float x = parent.transform.position.x; + parent.transform.setPosition(x - 1, parent.transform.position.y, parent.transform.position.z); } if (Input.GetKey(GLFW_KEY_S)) { - float y = entity.transform.position.y; - entity.transform.setPosition(entity.transform.position.x, y + 1, entity.transform.position.z); + float y = parent.transform.position.y; + parent.transform.setPosition(parent.transform.position.x, y + 1, parent.transform.position.z); } if (Input.GetKey(GLFW_KEY_D)) { - float x = entity.transform.position.x; - entity.transform.setPosition(x + 1, entity.transform.position.y, entity.transform.position.z); + float x = parent.transform.position.x; + parent.transform.setPosition(x + 1, parent.transform.position.y, parent.transform.position.z); } if (Input.GetKey(GLFW_KEY_Q)) { - float z = entity.transform.position.z; - entity.transform.setPosition(entity.transform.position.x, entity.transform.position.y, z - 1); + float z = parent.transform.position.z; + parent.transform.setPosition(parent.transform.position.x, parent.transform.position.y, z - 1); } if (Input.GetKey(GLFW_KEY_E)) { - float z = entity.transform.position.z; - entity.transform.setPosition(entity.transform.position.x, entity.transform.position.y, z + 1); + float z = parent.transform.position.z; + parent.transform.setPosition(parent.transform.position.x, parent.transform.position.y, z + 1); } if (Input.GetKey(GLFW_KEY_Z)) { - float rotation = entity.transform.rotation.x; + float rotation = parent.transform.rotation.x; rotation -= 1; if (rotation < 0) rotation += 360; - entity.transform.setRotation(rotation, entity.transform.rotation.y, entity.transform.rotation.z); // 左回転 + parent.transform.setRotation(rotation, parent.transform.rotation.y, parent.transform.rotation.z); // 左回転 } if (Input.GetKey(GLFW_KEY_C)) { - float rotation = entity.transform.rotation.x; + float rotation = parent.transform.rotation.x; rotation += 1; if (rotation >= 360) rotation -= 360; - entity.transform.setRotation(rotation ,entity.transform.rotation.y, entity.transform.rotation.z); // 右回転 + parent.transform.setRotation(rotation , parent.transform.rotation.y, parent.transform.rotation.z); // 右回転 } if (Input.GetKey(GLFW_KEY_UP)) { - float rotation = entity.transform.rotation.y; + float rotation = parent.transform.rotation.y; rotation -= 1; if (rotation < 0) rotation += 360; - entity.transform.setRotation(entity.transform.rotation.x, rotation, entity.transform.rotation.z); // 左回転 + parent.transform.setRotation(parent.transform.rotation.x, rotation, parent.transform.rotation.z); // 左回転 } if (Input.GetKey(GLFW_KEY_DOWN)) { - float rotation = entity.transform.rotation.y; + float rotation = parent.transform.rotation.y; rotation += 1; if (rotation >= 360) rotation -= 360; - entity.transform.setRotation(entity.transform.rotation.x, rotation, entity.transform.rotation.z); // 右回転 + parent.transform.setRotation(parent.transform.rotation.x, rotation, parent.transform.rotation.z); // 右回転 } if (Input.GetKey(GLFW_KEY_LEFT)) { - float rotation = entity.transform.rotation.z; + float rotation = parent.transform.rotation.z; rotation -= 1; if (rotation < 0) rotation += 360; - entity.transform.setRotation(entity.transform.rotation.x, entity.transform.rotation.y, rotation); // 左回転 + parent.transform.setRotation(parent.transform.rotation.x, parent.transform.rotation.y, rotation); // 左回転 } if (Input.GetKey(GLFW_KEY_RIGHT)) { - float rotation = entity.transform.rotation.z; + float rotation = parent.transform.rotation.z; rotation += 1; if (rotation >= 360) rotation -= 360; - entity.transform.setRotation(entity.transform.rotation.x, entity.transform.rotation.y, rotation); // 右回転 + parent.transform.setRotation(parent.transform.rotation.x, parent.transform.rotation.y, rotation); // 右回転 } } } diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/Physics.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/Physics.java index 84be1d9..ce375a9 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/Physics.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/Physics.java @@ -1,17 +1,17 @@ package gameEngine.entites.gameComponents; import gameEngine.Time; -import gameEngine.entites.Entity; +import gameEngine.entites.GameObject; public class Physics extends GameComponent{ - private Entity entity; + private GameObject parent; public boolean useGravity = true; private float gravity = 9.8f; // 地球の重力加速度を使用 private float velocityY = 0; // Y軸方向の速度 Resetしなければ速度が引き継がれる - public Physics(Entity entity){ - this.entity = entity; + public Physics(GameObject parent){ + this.parent = parent; } @Override @@ -25,8 +25,8 @@ velocityY += gravity * deltaTime; - float y = entity.transform.position.y; - entity.transform.setPosition(entity.transform.position.x, y + velocityY * deltaTime, entity.transform.position.z); + float y = parent.transform.position.y; + parent.transform.setPosition(parent.transform.position.x, y + velocityY * deltaTime, parent.transform.position.z); } } diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/PortView.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/PortView.java index 182e2fc..efc6873 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/PortView.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/PortView.java @@ -2,6 +2,7 @@ import gameEngine.ConnectionManager; import gameEngine.entites.Entity; +import gameEngine.entites.GameObject; import gameEngine.scenes.EditorScene; import gameEngine.views.Sprite; import gameEngine.input.Input; @@ -15,9 +16,9 @@ private ConnectionManager connectionManager; private Sprite sprite; private Vector3f position = new Vector3f(0,0,0); - private Entity parent; + private GameObject parent; - public PortView(PortType portType, Entity parent){ + public PortView(PortType portType, GameObject parent){ this.parent = parent; EditorScene editorScene = (EditorScene) Window.get().getScene(); this.connectionManager = editorScene.connectionManager; diff --git a/GameEngine/src/main/java/gameEngine/entites/gameComponents/TextMesh.java b/GameEngine/src/main/java/gameEngine/entites/gameComponents/TextMesh.java index 33a8a3f..6c1bc2b 100644 --- a/GameEngine/src/main/java/gameEngine/entites/gameComponents/TextMesh.java +++ b/GameEngine/src/main/java/gameEngine/entites/gameComponents/TextMesh.java @@ -1,6 +1,7 @@ package gameEngine.entites.gameComponents; import gameEngine.entites.Entity; +import gameEngine.entites.GameObject; import gameEngine.input.Input; import gameEngine.input.MouseInput; import gameEngine.scenes.EditorScene; @@ -15,12 +16,12 @@ private boolean isEditingText = false; private StringBuilder inputBuffer = new StringBuilder(); - public TextMesh(Entity parent, String text, int textSize) { + public TextMesh(GameObject parent, String text, int textSize) { this.parent = parent; this.textRenderer = new Text(parent.transform.position.x, parent.transform.position.y, text, textSize); } - public TextMesh(TextMesh original, Entity newParent) { + public TextMesh(TextMesh original, GameObject newParent) { this.parent = newParent; this.textRenderer = new Text( newParent.transform.position.x, diff --git a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java index defd4c6..10a7169 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java @@ -12,8 +12,6 @@ public class GameScene extends Scene { - private boolean changingScene = false; - public GameScene(){ System.out.println("Active Game scene"); glClearColor(1, 1, 1, 0); @@ -59,8 +57,7 @@ public void update(float dt) { changeScene(0, dt); //Editorシーンへの以降処理 for (Entity entity : entities.values()) { - if (entity instanceof GameObject) { - GameObject gameObject = (GameObject) entity; + if (entity instanceof GameObject gameObject) { if(gameObject.getComponent(EntityView.class) != null) continue; if(gameObject.getComponent(ComponentView.class) != null) continue; if(gameObject.getComponent(TextMesh.class) != null) continue; diff --git a/GameEngine/src/main/java/gameEngine/views/Window.java b/GameEngine/src/main/java/gameEngine/views/Window.java index 928eeb6..74ffd3f 100644 --- a/GameEngine/src/main/java/gameEngine/views/Window.java +++ b/GameEngine/src/main/java/gameEngine/views/Window.java @@ -1,11 +1,5 @@ package gameEngine.views; -import gameEngine.ConnectionManager; -import gameEngine.GameEditor; -import gameEngine.SwingGameEditor; import gameEngine.Time; -import gameEngine.entites.Entity; -import gameEngine.entites.GameObject; -import gameEngine.entites.gameComponents.*; import gameEngine.input.*; import gameEngine.scenes.*;