diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index a4d24f0..c1f43c8 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -6,7 +6,7 @@ import java.util.Map; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; -//import org.ntlab.radishforandroidstudio.framework.model3D.Angle; +import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; import cactusServer.models.Instances; import cactusServer.utils.RandomStringGenerator; @@ -17,7 +17,7 @@ private String areaURI; private String name; private Position3D position; - private Angle angle; + private Quaternion3D angle; private String modelID; private HashMap itemMap = new HashMap<>(); @@ -28,12 +28,12 @@ // JSONDecode���̌Ăяo���p } - public Character(String instanceId, String accountURI, String name, Position3D position, Angle angle, + public Character(String instanceId, String accountURI, String name, Position3D position, Quaternion3D angle, String modelID) { setAccountURI(accountURI); setName(name); setPosition(position); - setAngle(angle); + setQuaternion3D(angle); setModelID(modelID); initAreaURI(instanceId); } @@ -50,7 +50,7 @@ return position; } - public Angle getAngle() { + public Quaternion3D getQuaternion3D() { return angle; } @@ -84,7 +84,7 @@ this.position = position; } - public void setAngle(Angle angle) { + public void setQuaternion3D(Quaternion3D angle) { this.angle = angle; } @@ -142,9 +142,9 @@ return ""; } - public void update(Position3D position, Angle angle, String modelID, String areaURI) { + public void update(Position3D position, Quaternion3D angle, String modelID, String areaURI) { setPosition(position); - setAngle(angle); + setQuaternion3D(angle); if (modelID != null) { setModelID(modelID); } diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 15a2e95..665701c 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -11,7 +11,7 @@ import org.ntlab.radishforandroidstudio.framework.model3D.ModelFileFormatException; import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; -//import org.ntlab.radishforandroidstudio.framework.model3D.Angle; +import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; import org.ntlab.radishforandroidstudio.framework.model3D.Universe; import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D; import org.ntlab.radishforandroidstudio.framework.physics.Ground; @@ -147,7 +147,7 @@ } public IDAddressedEntity createCharacter(String instanceId, String accountURI, String name, Position3D position, - Angle angle, String model) { + Quaternion3D angle, String model) { String id = RandomStringGenerator.generateUniqueString(Character.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, characterMap.keySet()); Character character = new Character(instanceId, accountURI, name, position, angle, model); @@ -160,7 +160,7 @@ return this; } - public Character updateCharacter(String characterId, Position3D position, Angle angle, String modelID) { + public Character updateCharacter(String characterId, Position3D position, Quaternion3D angle, String modelID) { Character character = characterMap.get(characterId); character.update(position, angle, modelID, null); // areaURI(��4����)�̍X�V�͌Ăяo����Ŏ����ōs���� return character; diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index aecae53..a0945b8 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -2,7 +2,7 @@ import org.ntlab.radishforandroidstudio.framework.gameMain.Actor; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; -//import org.ntlab.radishforandroidstudio.framework.model3D.Angle; +import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; import cactusServer.models.Instances; import net.arnx.jsonic.JSONHint; @@ -12,7 +12,7 @@ private String characterURI; private String areaURI; private Position3D position; - private Angle angle; + private Quaternion3D angle; private CameraState cameraState; private EmoteState emoteState; @JSONHint(ignore = true) @@ -48,7 +48,7 @@ private void readCharacterData(String characterURI) { Character character = getCharacter(characterURI); setPosition(character.getPosition()); - setAngle(character.getAngle()); + setQuaternion3D(character.getQuaternion3D()); setAreaURI(character.getAreaURI()); setCharacterURI(characterURI); } @@ -69,7 +69,7 @@ return position; } - public Angle getAngle() { + public Quaternion3D getQuaternion3D() { return angle; } @@ -97,7 +97,7 @@ this.position = position; } - public void setAngle(Angle angle) { + public void setQuaternion3D(Quaternion3D angle) { this.angle = angle; } @@ -113,11 +113,11 @@ setEmoteState(new EmoteState(animationClassToStart)); } - public Player update(String characterURI, Position3D position, Angle angle, CameraState cameraState, + public Player update(String characterURI, Position3D position, Quaternion3D angle, CameraState cameraState, EmoteState.EmoteType animationClassToStart) { setCharacterURI(characterURI); setPosition(position); - setAngle(angle); + setQuaternion3D(angle); setCameraState(cameraState); updateEmoteType(animationClassToStart); updateAreaURI(); diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index 378f1c6..08c2397 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -5,9 +5,8 @@ import java.util.List; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; -//import org.ntlab.radishforandroidstudio.framework.model3D.Angle; +import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; -import cactusServer.entities.Angle; import cactusServer.entities.CameraState; import cactusServer.entities.EmoteState; import cactusServer.entities.IDAddressedEntity; @@ -122,7 +121,7 @@ return instance; } - public Player updatePlayer(String playerId, String characterURI, Position3D position, Angle angle, + public Player updatePlayer(String playerId, String characterURI, Position3D position, Quaternion3D angle, CameraState cameraState, EmoteState.EmoteType animationClassToStart) { Player player = playerMap.get(playerId); player.update(characterURI, position, angle, cameraState, animationClassToStart); diff --git a/src/main/java/cactusServer/resources/InstancesRest.java b/src/main/java/cactusServer/resources/InstancesRest.java index 0793efe..b2d2445 100644 --- a/src/main/java/cactusServer/resources/InstancesRest.java +++ b/src/main/java/cactusServer/resources/InstancesRest.java @@ -14,8 +14,8 @@ import org.glassfish.jersey.process.internal.RequestScoped; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; +import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; -import cactusServer.entities.Angle; import cactusServer.entities.Area; import cactusServer.entities.Area.Allowed; import cactusServer.entities.CameraState; @@ -108,7 +108,7 @@ @Produces(MediaType.APPLICATION_JSON) public URIAddressedEntity createCharacter(@PathParam("instanceId") String instanceId, @FormParam("accountURI") String accountURI, @FormParam("name") String name, - @FormParam("position") Position3D position, @FormParam("angle") Angle angle, + @FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle, @FormParam("modelID") String modelID) { Instance instance = Instances.getInstance().getInstance(instanceId); IDAddressedEntity ae = instance.createCharacter(instanceId, accountURI, name, position, angle, modelID); @@ -138,7 +138,7 @@ @Produces(MediaType.APPLICATION_JSON) public Player updatePlayer(@PathParam("instanceId") String instanceId, @FormParam("playerId") String playerId, @FormParam("characterURI") String characterURI, @FormParam("position") Position3D position, - @FormParam("angle") Angle angle, @FormParam("cameraState") CameraState cameraState, + @FormParam("angle") Quaternion3D angle, @FormParam("cameraState") CameraState cameraState, @FormParam("animationClassToStart") EmoteState.EmoteType animationClassToStart) { return Instances.getInstance().updatePlayer(playerId, characterURI, position, angle, cameraState, animationClassToStart); @@ -148,7 +148,7 @@ @PUT @Produces(MediaType.APPLICATION_JSON) public Character updateCharacter(@FormParam("characterId") String characterId, - @FormParam("position") Position3D position, @FormParam("angle") Angle angle, @FormParam("modelID") String modelID) { + @FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle, @FormParam("modelID") String modelID) { Character character = updateCharacter(characterId, position, angle, modelID); if (character != null) { throw new WebApplicationException(200);