diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index 2aa5a93..a4d24f0 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.Quaternion3D; +//import org.ntlab.radishforandroidstudio.framework.model3D.Angle; import cactusServer.models.Instances; import cactusServer.utils.RandomStringGenerator; @@ -17,7 +17,7 @@ private String areaURI; private String name; private Position3D position; - private Quaternion3D angle; + private Angle angle; private String modelID; private HashMap itemMap = new HashMap<>(); @@ -28,7 +28,7 @@ // JSONDecode���̌Ăяo���p } - public Character(String instanceId, String accountURI, String name, Position3D position, Quaternion3D angle, + public Character(String instanceId, String accountURI, String name, Position3D position, Angle angle, String modelID) { setAccountURI(accountURI); setName(name); @@ -50,7 +50,7 @@ return position; } - public Quaternion3D getAngle() { + public Angle getAngle() { return angle; } @@ -84,7 +84,7 @@ this.position = position; } - public void setAngle(Quaternion3D angle) { + public void setAngle(Angle angle) { this.angle = angle; } @@ -142,7 +142,7 @@ return ""; } - public void update(Position3D position, Quaternion3D angle, String modelID, String areaURI) { + public void update(Position3D position, Angle angle, String modelID, String areaURI) { setPosition(position); setAngle(angle); if (modelID != null) { diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 665701c..15a2e95 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.Quaternion3D; +//import org.ntlab.radishforandroidstudio.framework.model3D.Angle; 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, - Quaternion3D angle, String model) { + Angle 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, Quaternion3D angle, String modelID) { + public Character updateCharacter(String characterId, Position3D position, Angle 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 093017f..aecae53 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.Quaternion3D; +//import org.ntlab.radishforandroidstudio.framework.model3D.Angle; import cactusServer.models.Instances; import net.arnx.jsonic.JSONHint; @@ -12,7 +12,7 @@ private String characterURI; private String areaURI; private Position3D position; - private Quaternion3D angle; + private Angle angle; private CameraState cameraState; private EmoteState emoteState; @JSONHint(ignore = true) @@ -69,7 +69,7 @@ return position; } - public Quaternion3D getAngle() { + public Angle getAngle() { return angle; } @@ -97,7 +97,7 @@ this.position = position; } - public void setAngle(Quaternion3D angle) { + public void setAngle(Angle angle) { this.angle = angle; } @@ -113,7 +113,7 @@ setEmoteState(new EmoteState(animationClassToStart)); } - public Player update(String characterURI, Position3D position, Quaternion3D angle, CameraState cameraState, + public Player update(String characterURI, Position3D position, Angle angle, CameraState cameraState, EmoteState.EmoteType animationClassToStart) { setCharacterURI(characterURI); setPosition(position); diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index 76731ad..378f1c6 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -5,7 +5,7 @@ import java.util.List; import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; -import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; +//import org.ntlab.radishforandroidstudio.framework.model3D.Angle; import cactusServer.entities.Angle; import cactusServer.entities.CameraState; @@ -122,7 +122,7 @@ return instance; } - public Player updatePlayer(String playerId, String characterURI, Position3D position, Quaternion3D angle, + public Player updatePlayer(String playerId, String characterURI, Position3D position, Angle angle, CameraState cameraState, EmoteState.EmoteType animationClassToStart) { Player player = playerMap.get(playerId); player.update(characterURI, position, angle, cameraState, animationClassToStart);