summaryrefslogtreecommitdiff
path: root/src/tesseract/World.java
diff options
context:
space:
mode:
authorSteve <steveb9@u.washington.edu>2011-03-15 22:16:17 +0000
committerSteve <steveb9@u.washington.edu>2011-03-15 22:16:17 +0000
commitce4cfb6670eaba20e27f8c5f499980be59bf0853 (patch)
tree217d1c4290ccbd55d2741b79f6b7b7d728089809 /src/tesseract/World.java
parente6538f3f532fdcd35d0c97c2bc45caa1c7af0f35 (diff)
Added blimp model
Remove gravity for the blimp in World line 224
Diffstat (limited to 'src/tesseract/World.java')
-rw-r--r--src/tesseract/World.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index deb907c..b2ca82a 100644
--- a/src/tesseract/World.java
+++ b/src/tesseract/World.java
@@ -27,6 +27,7 @@ import tesseract.forces.Force;
import tesseract.objects.HalfSpace;
import tesseract.objects.Particle;
import tesseract.objects.PhysicalObject;
+import tesseract.objects.blimp.Blimp;
import common.CollidableObject;
import common.CollisionDetector;
@@ -220,7 +221,9 @@ public class World implements Observer {
// Apply forces
for (Force force : myForces) {
- force.applyForceTo((PhysicalObject) obj);
+ if(!(obj instanceof Blimp)) {
+ force.applyForceTo((PhysicalObject) obj);
+ }
}
// Update the object's state.