diff --git a/src/main/java/cactusServer/entities/Entity3D.java b/src/main/java/cactusServer/entities/Entity3D.java new file mode 100644 index 0000000..527a279 --- /dev/null +++ b/src/main/java/cactusServer/entities/Entity3D.java @@ -0,0 +1,23 @@ +package cactusServer.entities; + +import framework.model3D.Placeable; + +public abstract class Entity3D extends Entity { + private Placeable placeable; + + protected Entity3D() { + // JSONDecode���̌Ăяo���p + } + + public Entity3D(Placeable placeable) { + setPlaceable(placeable); + } + + public Placeable getPlaceable() { + return placeable; + } + + public void setPlaceable(Placeable placeable) { + this.placeable = placeable; + } +} diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index e8860ad..8c5068b 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -13,6 +13,7 @@ import cactusServer.utils.RandomStringGenerator; import cactusServer.entities.Character; import framework.model3D.Position3D; +import framework.model3D.Universe; import framework.physics.AngularVelocity3D; import framework.physics.Velocity3D; import net.arnx.jsonic.JSONHint; @@ -27,6 +28,7 @@ private String name; private State state; private String stage; + private Universe universe; private HashMap areaMap = new HashMap<>(); private HashMap objMap = new HashMap<>(); private HashMap characterMap = new HashMap<>(); @@ -47,6 +49,7 @@ setName(name); setState(state); setStage(stageModel); + universe = new Universe(); } public String getName() { diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 4d1ce8e..fa70f8c 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -4,7 +4,7 @@ import framework.model3D.Position3D; import net.arnx.jsonic.JSONHint; -public class Player extends Entity { +public class Player extends Entity3D { private String instanceURI; private String characterURI; private String areaURI;