summaryrefslogtreecommitdiff
path: root/src/common/CollisionDetector.java
diff options
context:
space:
mode:
authorSteve <steveb9@u.washington.edu>2011-03-05 08:50:37 +0000
committerSteve <steveb9@u.washington.edu>2011-03-05 08:50:37 +0000
commitc57f08a1c3373b0436d49dc6d2c61d3889cf894d (patch)
tree20201783dab176aff309e75ef45b31c9d95bd273 /src/common/CollisionDetector.java
parentfc2ec6d178948d6b97d07d733948583d357c20d2 (diff)
altered tick method in World with Alden Mar4 suggestions. I think its correct.
While testing found bug with emitter. It isn't the mar4 changes. will check out older code and check when it broke.
Diffstat (limited to 'src/common/CollisionDetector.java')
-rw-r--r--src/common/CollisionDetector.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/CollisionDetector.java b/src/common/CollisionDetector.java
index c4d03e8..a4c7b53 100644
--- a/src/common/CollisionDetector.java
+++ b/src/common/CollisionDetector.java
@@ -245,7 +245,7 @@ public class CollisionDetector {
return calculateCollisions((HalfSpace)a, (Particle)b);
if (b instanceof Sphere)
return calculateCollisions((HalfSpace)a, (Sphere)b);
- return calculateCollisions((HalfSpace)a, b.getVertices());
+ return calculateCollisions((HalfSpace) a, b.getVertices());
}
if (b instanceof HalfSpace) {
if (a instanceof Particle)