diff options
| author | Steve <steveb9@u.washington.edu> | 2011-03-05 06:47:56 +0000 |
|---|---|---|
| committer | Steve <steveb9@u.washington.edu> | 2011-03-05 06:47:56 +0000 |
| commit | fc2ec6d178948d6b97d07d733948583d357c20d2 (patch) | |
| tree | 9146c1480241d28737f884ddac4f0b286282e8d0 /src/common | |
| parent | 627e9848bdc01c7fb0e9e03452ac2ef454e61e9f (diff) | |
Added Alden's March 4 changes which are between lines 161-174 (I left the old code in comments just in case) Now, hopefully I can use it in tick!
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/CollidableObject.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/common/CollidableObject.java b/src/common/CollidableObject.java index 38e4d23..4c04281 100644 --- a/src/common/CollidableObject.java +++ b/src/common/CollidableObject.java @@ -158,8 +158,18 @@ public abstract class CollidableObject implements Serializable { inverseInertiaTensorCache = null;
}
+ //Alden mar4 change
public void resolveCollisions(CollidableObject other) {
- ArrayList<CollisionInfo> collisions = CollisionDetector.calculateCollisions(this, other);
+ resolveCollisions(other, CollisionDetector.calculateCollisions(this, other));
+ }
+
+ /*public void resolveCollisions(CollidableObject other) {
+ ArrayList<CollisionInfo> collisions = CollisionDetector.calculateCollisions(this, other);
+ if (collisions.isEmpty())
+ return;
+ */
+ //Alden mar4 change
+ public void resolveCollisions(CollidableObject other, ArrayList<CollisionInfo> collisions) {
if (collisions.isEmpty())
return;
@@ -318,7 +328,7 @@ public abstract class CollidableObject implements Serializable { }
}
-private static final int NODE_TYPE_BRANCH = 1;
+ private static final int NODE_TYPE_BRANCH = 1;
private static final int NODE_TYPE_TRANSFORM = 2;
private static final int NODE_TYPE_PRIMITIVE = 3;
private static final int NODE_TYPE_SHAPE = 4;
|