diff --git a/src/main/java/cactusServer/entities/MovableObject.java b/src/main/java/cactusServer/entities/MovableObject.java index 4d6d1a2..6d45442 100644 --- a/src/main/java/cactusServer/entities/MovableObject.java +++ b/src/main/java/cactusServer/entities/MovableObject.java @@ -1,10 +1,12 @@ package cactusServer.entities; +import org.ntlab.radishforandroidstudio.framework.gameMain.OvergroundActor; 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; +import org.ntlab.radishforandroidstudio.framework.physics.Solid3D; import org.ntlab.radishforandroidstudio.framework.physics.Velocity3D; import org.ntlab.radishforandroidstudio.java3d.Box; import org.ntlab.radishforandroidstudio.java3d.Primitive; @@ -36,8 +38,8 @@ public MovableObject(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, Quaternion3D angle, Attribute attribute, int modelID) { setPrim(new Box()); - setObject(new Object3D("", prim)); - setPlaceable(object); + setObject(new Solid3D(new Object3D("", prim))); + setPlaceable(new OvergroundActor((Solid3D) object, null)); setPosition(position); setVelocity(velocity); setAngularVelocity(angularVelocity); @@ -72,7 +74,8 @@ public void setPosition(Position3D position) { this.position = position; - if(placeable != null)((Object3D)(getPlaceable().getBody())).setPosition(position); + if (placeable != null) + ((Object3D) (getPlaceable().getBody())).setPosition(position); } public void setVelocity(Velocity3D velocity) { @@ -85,7 +88,8 @@ public void setAngle(Quaternion3D angle) { this.angle = angle; - if(placeable != null)((Object3D) getPlaceable().getBody()).apply(angle, false); + if (placeable != null) + ((Object3D) getPlaceable().getBody()).apply(angle, false); } public void setAttribute(Attribute attribute) {