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); }