Fehler im Kollisionsmodell behoben, durch den die Objekte nicht sofor…

…t nach unten fielen, wenn sie oben an ein Hindernis stießen; git-svn-id: https://jumpnevolve.googlecode.com/svn/trunk/jumpnevolve@320 42192f38-024e-0d60-f621-68f43529c6e9
niklasf · Nov 12, 2011 · 3a7b422 · 3a7b422
1 parent c0c7754
commit 3a7b422
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/com/googlecode/jumpnevolve/game/Level.java b/src/com/googlecode/jumpnevolve/game/Level.java
@@ -18,6 +18,7 @@
 import com.googlecode.jumpnevolve.graphics.effects.FogEmitterFactory;
 import com.googlecode.jumpnevolve.graphics.effects.ParticleEffect;
 import com.googlecode.jumpnevolve.graphics.effects.SprayEmitterFactory;
+import com.googlecode.jumpnevolve.graphics.effects.WaterfallEmitterFactory;
 import com.googlecode.jumpnevolve.graphics.world.World;
 import com.googlecode.jumpnevolve.math.Vector;
 import com.googlecode.jumpnevolve.util.Parameter;

diff --git a/src/com/googlecode/jumpnevolve/graphics/world/AbstractObject.java b/src/com/googlecode/jumpnevolve/graphics/world/AbstractObject.java
@@ -24,7 +24,6 @@
 import org.newdawn.slick.Graphics;
 import org.newdawn.slick.Input;
 
-import com.googlecode.jumpnevolve.game.objects.SpringingSoldier;
 import com.googlecode.jumpnevolve.game.player.PlayerFigure;
 import com.googlecode.jumpnevolve.graphics.Drawable;
 import com.googlecode.jumpnevolve.graphics.GraphicUtils;

diff --git a/src/com/googlecode/jumpnevolve/math/NextCircle.java b/src/com/googlecode/jumpnevolve/math/NextCircle.java
@@ -57,9 +57,12 @@ public CollisionResult getCollision(NextShape other, Vector deltaVelocity,
 		} else if (other instanceof NextPolygon) {
 			return other.getCollision(this, deltaVelocity.neg(), otherMoveable,
 					thisMoveable).invert();
+		} else {
+			// Leere, da nicht identifizierbar Kollision zurückgeben
+			colRe.setNotIntersecting();
+			colRe.setWillNotIntersect();
+			return colRe;
 		}
-		colRe.setNotIntersecting();
-		return colRe;
 	}
 
 	@Override

diff --git a/src/com/googlecode/jumpnevolve/math/NextCollision.java b/src/com/googlecode/jumpnevolve/math/NextCollision.java
@@ -150,14 +150,12 @@ public NextShape correctPosition(NextShape toCorrect) {
 		Vector restore = Vector.ZERO;
 		if (this.isIntersecting) {
 			restore = this.getIsRestoring();
-		} else if (this.willIntersect) {
-			restore = this.getWillRestoring();
-		}
-		if (!Float.isNaN(restore.x) && !Float.isNaN(restore.y)) {
-			return toCorrect.modifyCenter(toCorrect.getCenter().add(restore));
-		} else {
-			return toCorrect;
+			if (!Float.isNaN(restore.x) && !Float.isNaN(restore.y)) {
+				return toCorrect.modifyCenter(toCorrect.getCenter()
+						.add(restore));
+			}
 		}
+		return toCorrect;
 	}
 
 	/**