summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve <steveb9@u.washington.edu>2011-03-16 09:35:09 +0000
committerSteve <steveb9@u.washington.edu>2011-03-16 09:35:09 +0000
commit55408e7f25147667e390fd902631484f388e701f (patch)
tree4b957031ead0d126fe4e3a6b324b7ab1a1a7cfe8
parent033976c152a23455d37bb90898037a477cd737bd (diff)
troubleshooting a particle problem with the blimp
-rw-r--r--src/common/CollidableObject.java2
-rw-r--r--src/tesseract/World.java5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/common/CollidableObject.java b/src/common/CollidableObject.java
index 79e21f7..a6208ac 100644
--- a/src/common/CollidableObject.java
+++ b/src/common/CollidableObject.java
@@ -598,7 +598,7 @@ public abstract class CollidableObject implements Serializable {
}
return appearance;
}
-
+
public boolean removeMe() {
// TODO Auto-generated method stub
return detachMe;
diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index ac13bb1..7cc67a4 100644
--- a/src/tesseract/World.java
+++ b/src/tesseract/World.java
@@ -219,9 +219,9 @@ public class World implements Observer {
List<CollidableObject> toRemove = new LinkedList<CollidableObject>();
for (int i = 0; i < myObjects.size(); i++) {
CollidableObject obj = myObjects.get(i);
- if (obj.removeMe()) {
+ /*if (obj.removeMe()) {
toRemove.add(obj);
- }
+ }*/
// Apply forces
for (Force force : myForces) {
if(!(obj instanceof Blimp)) {
@@ -382,7 +382,6 @@ public class World implements Observer {
myObjects.clear();
addHalfspaces();
-
}
/**