diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 665701c..add0c54 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -137,7 +137,7 @@ } public IDAddressedEntity createObject(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, - Angle angle, Attribute attribute, String model) { + Quaternion3D angle, Attribute attribute, String model) { String id = RandomStringGenerator.generateUniqueString(Object.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, objMap.keySet()); Object object = new Object(position, velocity, angularVelocity, angle, attribute, model); 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/resources/ObjectsRest.java b/src/main/java/cactusServer/resources/ObjectsRest.java index 62e4ede..f218195 100644 --- a/src/main/java/cactusServer/resources/ObjectsRest.java +++ b/src/main/java/cactusServer/resources/ObjectsRest.java @@ -9,6 +9,7 @@ import javax.ws.rs.core.MediaType; 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; @@ -39,7 +40,7 @@ @Produces(MediaType.APPLICATION_JSON) public URIAddressedEntity createObject(@PathParam("instanceId") String instanceId, @FormParam("position") Position3D position, @FormParam("velocity") Velocity3D velocity, - @FormParam("angularVelocity") AngularVelocity3D angularVelocity, @FormParam("angle") Angle angle, + @FormParam("angularVelocity") AngularVelocity3D angularVelocity, @FormParam("angle") Quaternion3D angle, @FormParam("attribute") Attribute attribute, @FormParam("model") String model) { Instance instance = Instances.getInstance().getInstance(instanceId); IDAddressedEntity ae = instance.createObject(position, velocity, angularVelocity, angle, attribute, model); diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java new file mode 100644 index 0000000..811bb88 --- /dev/null +++ b/src/main/java/cactusServer/utils/App.java @@ -0,0 +1,21 @@ +package cactusServer.utils; + +import javax.ws.rs.ApplicationPath; +import javax.ws.rs.core.Application; + +import org.glassfish.jersey.server.ResourceConfig; + +import cactusServer.models.Accounts; +import cactusServer.models.CharacterManager; +import cactusServer.models.StageManager; + +@SuppressWarnings("unused") +@ApplicationPath("/rest") +public class App extends ResourceConfig { + public App() { + StageManager.getInstance(); + CharacterManager.getInstance(); + Accounts.getInstance().createAcount("aaa", "bbb", "c"); + System.out.println("pass"); + } +} \ No newline at end of file diff --git a/src/main/java/cactusServer/utils/Initialize.java b/src/main/java/cactusServer/utils/Initialize.java deleted file mode 100644 index b322bd0..0000000 --- a/src/main/java/cactusServer/utils/Initialize.java +++ /dev/null @@ -1,20 +0,0 @@ -package cactusServer.utils; - -import java.io.IOException; - -import javax.ws.rs.ProcessingException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.core.Application; -import javax.ws.rs.ext.Provider; - -import cactusServer.models.*; -import org.glassfish.jersey.server.filter.*; -import org.glassfish.jersey.server.spi.ContainerProvider; -@Provider -public class Initialize implements ContainerRequestFilter { - @Override - public void filter(ContainerRequestContext requestContext) throws IOException { - StageManager.getInstance(); - } -} diff --git a/src/main/java/test/app/App.java b/src/main/java/test/app/App.java deleted file mode 100644 index 0bd8958..0000000 --- a/src/main/java/test/app/App.java +++ /dev/null @@ -1,12 +0,0 @@ -package test.app; - -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; - -import org.glassfish.jersey.server.ResourceConfig; - -@SuppressWarnings("unused") -@ApplicationPath("/rest") -public class App extends ResourceConfig { - -} \ No newline at end of file