diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 65854de..abef6f4 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,6 @@ eclipse.preferences.version=1 encoding//src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/ModelFactory.java=UTF-8 +encoding//src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/Quaternion3D.java=UTF-8 encoding//src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/Universe.java=UTF-8 +encoding//src/main/java/org/ntlab/radishforandroidstudio/java3d/AxisAngle4d.java=UTF-8 encoding//src/main/java/org/ntlab/radishforandroidstudio/java3d/Box.java=UTF-8 diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index 01f8cb2..b3f7ac6 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -145,7 +145,7 @@ setPosition(position); setAngle(angle); setModelID(modelID); - updateAreaURI(); +// updateAreaURI(); } public void update(Position3D position, Quaternion3D angle, String areaURI) { diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 64738e3..8db7788 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -120,7 +120,7 @@ setAngle(angle); setCameraState(cameraState); updateEmoteType(animationClassToStart); - updateAreaURI(); +// updateAreaURI(); return this; } diff --git a/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/Quaternion3D.java b/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/Quaternion3D.java index 346be55..c5e7453 100644 --- a/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/Quaternion3D.java +++ b/src/main/java/org/ntlab/radishforandroidstudio/framework/model3D/Quaternion3D.java @@ -7,7 +7,7 @@ public class Quaternion3D extends Property3D { private Quat4d quaternion; - // コンストラクタ============================= + // 繧ウ繝ウ繧ケ繝医Λ繧ッ繧ソ============================= public Quaternion3D() { AxisAngle4d aa = new AxisAngle4d(0.0, 0.0, 1.0, 0.0); quaternion = new Quat4d(); @@ -33,7 +33,7 @@ return quaternion; } - // ゲッタ================================= + // 繧イ繝�繧ソ================================= public double getX() { return quaternion.x; } @@ -61,7 +61,7 @@ return axisAngle; } - // セッタ================================= + // 繧サ繝�繧ソ================================= public Quaternion3D setQuaternion(double x, double y, double z, double w) { quaternion = new Quat4d(x, y, z, w); return this; @@ -73,6 +73,22 @@ quaternion.set(aa); return this; } + + public void setX(double x) { + quaternion.x = x; + } + + public void setY(double y) { + quaternion.y = y; + } + + public void setZ(double z) { + quaternion.z = z; + } + + public void setW(double w) { + quaternion.w = w; + } public Quaternion3D add(AxisAngle4d aa) { Quat4d q = new Quat4d(); diff --git a/src/main/java/org/ntlab/radishforandroidstudio/java3d/AxisAngle4d.java b/src/main/java/org/ntlab/radishforandroidstudio/java3d/AxisAngle4d.java index 2a6fcd9..6bc4d3b 100644 --- a/src/main/java/org/ntlab/radishforandroidstudio/java3d/AxisAngle4d.java +++ b/src/main/java/org/ntlab/radishforandroidstudio/java3d/AxisAngle4d.java @@ -7,14 +7,14 @@ public double z; static final double EPS = 1.0e-12; - // コンストラクタ + // 繧ウ繝ウ繧ケ繝医Λ繧ッ繧ソ public AxisAngle4d() { x = 0.0; y = 0.0; z = 0.0; } - // コンストラクタ + //縲�繧ウ繝ウ繧ケ繝医Λ繧ッ繧ソ public AxisAngle4d(double px, double py, double pz, double pa) { x = px; y = py;