diff --git a/src/main/java/cactusServer/entities/Object.java b/src/main/java/cactusServer/entities/Object.java index f2e55d1..6dc0fe6 100644 --- a/src/main/java/cactusServer/entities/Object.java +++ b/src/main/java/cactusServer/entities/Object.java @@ -1,6 +1,7 @@ package cactusServer.entities; import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; +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.physics.AngularVelocity3D; @@ -19,6 +20,7 @@ private Quaternion3D angle; private Attribute attribute; private Model3D model; + private Object3D object; @JSONHint(ignore = true) public static final int UNIQUE_ID_LENGTH = 12; @@ -36,6 +38,7 @@ setAngle(angle); setAttribute(attribute); setModel(modelID); + setPlaceable(object); } public Position3D getPosition() { @@ -53,7 +56,7 @@ public Quaternion3D getAngle() { return angle; } - + public Attribute getAttribute() { return attribute; } @@ -91,9 +94,9 @@ private double cof; // ���C�W�� private Attribute() { - + } - + public Attribute(boolean moveable, double cof) { setMoveable(moveable); setCof(cof);