diff --git a/GameEngine/src/main/java/gameEngine/GameEditor.java b/GameEngine/src/main/java/gameEngine/GameEditor.java index d8d06d6..c51335d 100644 --- a/GameEngine/src/main/java/gameEngine/GameEditor.java +++ b/GameEngine/src/main/java/gameEngine/GameEditor.java @@ -142,7 +142,7 @@ // New GameObjectを作成し、画面を更新 private void createNewGameObject() { - gameScene.CreateNewObject(); // 新しいGameObjectを作成 + gameScene.createNewObject(); // 新しいGameObjectを作成 applyGameObjectChanges(); repaint(); // 画面を再描画 } @@ -155,7 +155,7 @@ GameObject selectedObject = gameScene.gameObjects.get(selectedId); if (selectedObject != null) { // コンポーネントを追加 (例: Mesh など) - gameScene.AddComponent(selectedObject); + gameScene.addComponent(selectedObject); JOptionPane.showMessageDialog(this, "Component Added to " + selectedObject.name); } } diff --git a/GameEngine/src/main/java/gameEngine/entites/Camera.java b/GameEngine/src/main/java/gameEngine/entites/Camera.java index a2b5c13..50aa07e 100644 --- a/GameEngine/src/main/java/gameEngine/entites/Camera.java +++ b/GameEngine/src/main/java/gameEngine/entites/Camera.java @@ -9,7 +9,8 @@ private final ProjectionType projection; - public Camera(ProjectionType projection){ + public Camera(int id, ProjectionType projection){ + super(id); this.projection = projection; } diff --git a/GameEngine/src/main/java/gameEngine/entites/Entity.java b/GameEngine/src/main/java/gameEngine/entites/Entity.java index 4b7f895..fd964b1 100644 --- a/GameEngine/src/main/java/gameEngine/entites/Entity.java +++ b/GameEngine/src/main/java/gameEngine/entites/Entity.java @@ -4,11 +4,13 @@ public class Entity { + private int entityId; // 作成時に割り当て public Transform transform = new Transform(); public boolean active = true; public String name = "GameEntity"; - public Entity() { + public Entity(int id) { + entityId = id; } public void setActive(boolean active) { @@ -17,4 +19,7 @@ public void setName(String name){ this.name = name; } + public int getId(){ + return entityId; + } } diff --git a/GameEngine/src/main/java/gameEngine/entites/GameObject.java b/GameEngine/src/main/java/gameEngine/entites/GameObject.java index c59df94..b3c852a 100644 --- a/GameEngine/src/main/java/gameEngine/entites/GameObject.java +++ b/GameEngine/src/main/java/gameEngine/entites/GameObject.java @@ -6,12 +6,11 @@ import java.util.List; public class GameObject extends Entity { - private int objectID; // 作成時に割り当て private final List gameComponents = new ArrayList<>(); - public GameObject(int id){ - objectID = id; + public GameObject(int id) { + super(id); } public void addComponent(GameComponent component) { @@ -30,8 +29,4 @@ } } - public int getId(){ - return objectID; - } - } \ 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 da3ab5a..006c1a8 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/GameScene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/GameScene.java @@ -42,12 +42,12 @@ } } - public void CreateNewObject(){ + public void createNewObject(){ if(isCreateObject) return; isCreateObject = true; } - public void AddComponent(GameObject gameObject){ + public void addComponent(GameObject gameObject){ if(isAddComponent) return; addComponentObject = gameObject; isAddComponent = true; diff --git a/GameEngine/src/main/java/gameEngine/scenes/Scene.java b/GameEngine/src/main/java/gameEngine/scenes/Scene.java index 251c364..f244241 100644 --- a/GameEngine/src/main/java/gameEngine/scenes/Scene.java +++ b/GameEngine/src/main/java/gameEngine/scenes/Scene.java @@ -15,9 +15,9 @@ public abstract void update(float dt); - public void CreateNewObject() { + public void createNewObject() { + } + public void addComponent(GameObject selectedObject) { } - public void AddComponent(GameObject selectedObject) { - } }