diff options
Diffstat (limited to 'src/tesseract/objects/PhysicalObject.java')
| -rw-r--r-- | src/tesseract/objects/PhysicalObject.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tesseract/objects/PhysicalObject.java b/src/tesseract/objects/PhysicalObject.java index 2634ca2..73e0c91 100644 --- a/src/tesseract/objects/PhysicalObject.java +++ b/src/tesseract/objects/PhysicalObject.java @@ -22,9 +22,12 @@ import com.sun.j3d.utils.geometry.Primitive; * @author Jesse Morgan */ public class PhysicalObject extends CollidableObject { + protected boolean collidable; + public PhysicalObject(final Vector3f thePosition, final float mass) { super(mass); this.position.set(thePosition); + collidable = true; } public List<PhysicalObject> spawnChildren(final float duration) { @@ -67,7 +70,7 @@ public class PhysicalObject extends CollidableObject { } public void resolveCollisions(final PhysicalObject other) { - if (this.node != null && other.node != null) { + if (collidable && other.collidable) { super.resolveCollisions(other); } }
|