diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index b3f7ac6..ec3533c 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -2,8 +2,11 @@ import java.util.HashMap; +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.java3d.Box; +import org.ntlab.radishforandroidstudio.java3d.Primitive; import cactusServer.models.Instances; import cactusServer.utils.RandomStringGenerator; @@ -16,6 +19,8 @@ private Position3D position; private Quaternion3D angle; private int modelID; + private Primitive prim; + private Object3D object; private HashMap itemMap = new HashMap<>(); @JSONHint(ignore = true) @@ -33,6 +38,8 @@ setAngle(angle); setModelID(modelID); initAreaURI(instanceId); + setPrim(new Box()); + setObject(new Object3D("",prim)); } public String getAccountURI() { @@ -170,4 +177,20 @@ public Item destroyItem(String itemId) { return itemMap.remove(itemId); } + + public Primitive getPrim() { + return prim; + } + + public void setPrim(Primitive prim) { + this.prim = prim; + } + + public Object3D getObject() { + return object; + } + + public void setObject(Object3D object) { + this.object = object; + } } diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index 722cd9f..1d27457 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -22,7 +22,8 @@ private Quaternion3D angle; private Attribute attribute; private Model3D model; - private Primitive prim = new Box(); + private Primitive prim; + private Object3D object; @JSONHint(ignore = true) public static final int UNIQUE_ID_LENGTH = 12; @@ -40,7 +41,8 @@ setAngle(angle); setAttribute(attribute); setModel(modelID); - Object3D object = new Object3D("",prim); + prim = new Box(); + object = new Object3D("",prim); setPlaceable(object); } @@ -122,4 +124,20 @@ } } + public Primitive getPrim() { + return prim; + } + + public void setPrim(Primitive prim) { + this.prim = prim; + } + + public Object3D getObject() { + return object; + } + + public void setObject(Object3D object) { + this.object = object; + } + } \ No newline at end of file diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 0e7f785..f9d1b46 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -12,6 +12,7 @@ import org.ntlab.radishforandroidstudio.framework.model3D.Position3D; import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; import org.ntlab.radishforandroidstudio.framework.physics.AngularVelocity3D; +import org.ntlab.radishforandroidstudio.framework.physics.PhysicsUtility; import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; import cactusServer.entities.*; @@ -45,15 +46,16 @@ @Override public void run() { - //System.out.println("�^�X�N�����s"); + // System.out.println("�^�X�N�����s"); instancesSize = Instances.getInstance().getInstances().size(); - for(int i=0;i