diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index 20f9465..b8cab8e 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -1,6 +1,7 @@ package cactusServer.entities; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; +import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D; import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; @@ -13,7 +14,7 @@ private Position3D position; private Velocity3D velocity; private AngularVelocity3D angularVelocity; - private Angle angle; + private Quaternion3D angle; private Attribute attribute; private String model; @@ -25,7 +26,7 @@ // JSONDecode���̌Ăяo���p } - public Object(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, Angle angle, + public Object(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, Quaternion3D angle, Attribute attribute, String model) { setPosition(position); setVelocity(velocity); @@ -47,7 +48,7 @@ return angularVelocity; } - public Angle getAngle() { + public Quaternion3D getAngle() { return angle; } @@ -71,7 +72,7 @@ this.angularVelocity = angularVelocity; } - public void setAngle(Angle angle) { + public void setAngle(Quaternion3D angle) { this.angle = angle; } diff --git a/src/main/java/cactusServer/models/StageManager.java b/src/main/java/cactusServer/models/StageManager.java index 4a65953..2ad43b9 100644 --- a/src/main/java/cactusServer/models/StageManager.java +++ b/src/main/java/cactusServer/models/StageManager.java @@ -1,7 +1,6 @@ package cactusServer.models; import java.util.HashMap; -import java.util.HashSet; import javax.inject.Singleton; @@ -10,7 +9,8 @@ @Singleton public class StageManager { private static StageManager theInstance = null; - private HashMap model = new HashMap<>(); + private HashMap model = new HashMap<>(); + private StageManager() { } @@ -22,6 +22,10 @@ return theInstance; } + public void setModel(int key, Model3D model3d) { + model.put(key, model3d); + } + public Model3D getStage(int stageID) { return model.get(stageID); } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index f004bd8..811bb88 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -6,6 +6,7 @@ import org.glassfish.jersey.server.ResourceConfig; import cactusServer.models.Accounts; +import cactusServer.models.CharacterManager; import cactusServer.models.StageManager; @SuppressWarnings("unused") @@ -13,6 +14,7 @@ public class App extends ResourceConfig { public App() { StageManager.getInstance(); + CharacterManager.getInstance(); Accounts.getInstance().createAcount("aaa", "bbb", "c"); System.out.println("pass"); }