diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index f2e55d1..6dc0fe6 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.Model3D; +import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D; @@ -19,6 +20,7 @@ private Quaternion3D angle; private Attribute attribute; private Model3D model; + private Object3D object; @JSONHint(ignore = true) public static final int UNIQUE_ID_LENGTH = 12; @@ -36,6 +38,7 @@ setAngle(angle); setAttribute(attribute); setModel(modelID); + setPlaceable(object); } public Position3D getPosition() { @@ -53,7 +56,7 @@ public Quaternion3D getAngle() { return angle; } - + public Attribute getAttribute() { return attribute; } @@ -91,9 +94,9 @@ private double cof; // ���C�W�� private Attribute() { - + } - + public Attribute(boolean moveable, double cof) { setMoveable(moveable); setCof(cof); diff --git a/src/main/java/cactusServer/resources/ObjectsRest.java b/src/main/java/cactusServer/resources/ObjectsRest.java index 6d213ab..200610c 100644 --- a/src/main/java/cactusServer/resources/ObjectsRest.java +++ b/src/main/java/cactusServer/resources/ObjectsRest.java @@ -28,7 +28,7 @@ @Path("/{objectId}") @GET - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getObject(@PathParam("instanceId") String instanceId, @PathParam("objectId") String objectId) { Instance instance = Instances.getInstance().getInstance(instanceId); @@ -39,19 +39,19 @@ } @GET - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getObjects(@PathParam("instanceId") String instanceId) { return JSON.encode(Instances.getInstance().getInstance(instanceId).getObjects()); } @POST - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) - public String createObject(@PathParam("instanceId") String instanceId, - @FormParam("position") Position3D position, @FormParam("velocity") Velocity3D velocity, - @FormParam("angularVelocity") AngularVelocity3D angularVelocity, @FormParam("angle") Quaternion3D angle, - @FormParam("attribute") Attribute attribute, @FormParam("model") int modelID) { + public String createObject(@PathParam("instanceId") String instanceId, @FormParam("position") Position3D position, + @FormParam("velocity") Velocity3D velocity, @FormParam("angularVelocity") AngularVelocity3D angularVelocity, + @FormParam("angle") Quaternion3D angle, @FormParam("attribute") Attribute attribute, + @FormParam("model") int modelID) { Instance instance = Instances.getInstance().getInstance(instanceId); HashMap idMap = instance.createObject(position, velocity, angularVelocity, angle, attribute, modelID); @@ -65,7 +65,7 @@ @Path("/{objectId}") @PUT - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String updateObject(@PathParam("instanceId") String instanceId, @PathParam("objectId") String objectId, @FormParam("position") Position3D position, @FormParam("velocity") Velocity3D velocity, diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 0294f21..0e7f785 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -30,6 +30,7 @@ @ApplicationPath("/rest") public class App extends ResourceConfig implements Runnable { private ScheduledThreadPoolExecutor task = new ScheduledThreadPoolExecutor(4); + private int instancesSize; public App() { ObjectModelManager.getInstance(); @@ -45,6 +46,17 @@ @Override public void run() { //System.out.println("�^�X�N�����s"); + instancesSize = Instances.getInstance().getInstances().size(); + for(int i=0;i