diff --git a/GameEngine/src/main/java/gameEngine/entites/Entity.java b/GameEngine/src/main/java/gameEngine/entites/Entity.java index 4a30fcb..4b7f895 100644 --- a/GameEngine/src/main/java/gameEngine/entites/Entity.java +++ b/GameEngine/src/main/java/gameEngine/entites/Entity.java @@ -5,8 +5,16 @@ public class Entity { public Transform transform = new Transform(); + public boolean active = true; + public String name = "GameEntity"; public Entity() { } + public void setActive(boolean active) { + this.active = active; + } + public void setName(String name){ + this.name = name; + } } diff --git a/GameEngine/src/main/java/gameEngine/entites/GameObject.java b/GameEngine/src/main/java/gameEngine/entites/GameObject.java index 33e9660..c59df94 100644 --- a/GameEngine/src/main/java/gameEngine/entites/GameObject.java +++ b/GameEngine/src/main/java/gameEngine/entites/GameObject.java @@ -7,8 +7,7 @@ public class GameObject extends Entity { private int objectID; // 作成時に割り当て - public boolean active = true; - public String name = "GameObject"; + private final List gameComponents = new ArrayList<>(); public GameObject(int id){ @@ -35,12 +34,4 @@ return objectID; } - public void setName(String name){ - this.name = name; - } - - public void setActive(boolean active) { - this.active = active; - } - } \ No newline at end of file diff --git a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java index cc2b03c..da3ab5a 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java @@ -57,7 +57,7 @@ int newId = gameObjects.size(); gameObjects.put(newId, new GameObject(newId)); gameObjects.get(newId).addComponent(new Mesh(gameObjects.get(newId), Mesh.MeshType.SPRITE, "test.png")); - gameObjects.get(newId).setName("Player" + newId); + gameObjects.get(newId).setName("NewEntity" + newId); } private void addComponent(){