From 544548ac412807b38295bfb4c1159c6980ef90ff Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 18 Mar 2011 02:08:33 +0000 Subject: commented out the CollisionDetector work around 275, 276 Added transient declaration to my_blimp Pass fin colorAttributes instead of texture --- src/common/CollisionDetector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common') 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); -- cgit v1.2.3