diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2011-02-18 03:51:20 +0000 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2011-02-18 03:51:20 +0000 |
| commit | 7331807050f7392e4354902c3f4ef24753ca6b32 (patch) | |
| tree | 5e9991bb3ed2e2fc6381af5aa3e49cbbbb6b5cbf | |
| parent | 893a4bf81d9db58ffd68782389625b2a893fcf90 (diff) | |
Fixed Gravity.
| -rw-r--r-- | src/tesseract/forces/Gravity.java | 7 | ||||
| -rw-r--r-- | src/tesseract/objects/PhysicalObject.java | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/tesseract/forces/Gravity.java b/src/tesseract/forces/Gravity.java index 3cbf33e..75c3e76 100644 --- a/src/tesseract/forces/Gravity.java +++ b/src/tesseract/forces/Gravity.java @@ -43,7 +43,12 @@ public class Gravity extends Force { * @return A vector describing the force */ protected Vector3f calculateForce(final PhysicalObject obj) { - return new Vector3f(0, -myGravity, 0); + if (obj.getInverseMass() != 0 ) { + return new Vector3f(0, -myGravity / obj.getInverseMass(), 0); + + } else { + return new Vector3f(); + } } } diff --git a/src/tesseract/objects/PhysicalObject.java b/src/tesseract/objects/PhysicalObject.java index cdfca54..e2f31c8 100644 --- a/src/tesseract/objects/PhysicalObject.java +++ b/src/tesseract/objects/PhysicalObject.java @@ -138,5 +138,9 @@ public class PhysicalObject extends CollidableObject { public boolean isNodeNull() { return this.node == null; + } + + public float getInverseMass() { + return this.inverseMass; }
}
\ No newline at end of file |