diff options
| author | Steve <steveb9@u.washington.edu> | 2011-03-18 02:08:33 +0000 |
|---|---|---|
| committer | Steve <steveb9@u.washington.edu> | 2011-03-18 02:08:33 +0000 |
| commit | 544548ac412807b38295bfb4c1159c6980ef90ff (patch) | |
| tree | d2e0569af37098f2a6b76d66b8cca83521f860c5 /src/common/CollisionDetector.java | |
| parent | 8177b32a6bf985826acab6df25e313edb50104cd (diff) | |
commented out the CollisionDetector work around 275, 276
Added transient declaration to my_blimp
Pass fin colorAttributes instead of texture
Diffstat (limited to 'src/common/CollisionDetector.java')
| -rw-r--r-- | src/common/CollisionDetector.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/CollisionDetector.java b/src/common/CollisionDetector.java index f193a29..dbe2b15 100644 --- a/src/common/CollisionDetector.java +++ b/src/common/CollisionDetector.java @@ -272,8 +272,8 @@ public class CollisionDetector { if (a instanceof Sphere && b instanceof Sphere)
return calculateCollisions((Sphere)a, (Sphere)b);
- if (!a.getBounds().intersect(b.getBounds()))
- return EMPTY_COLLISION_LIST;
+ /*if (!a.getBounds().intersect(b.getBounds()))
+ return EMPTY_COLLISION_LIST;*/
if (a instanceof Particle)
return calculateCollisions((Particle)a, b);
|