From 45397db458fca50a34c1602e30c818796ded7bed Mon Sep 17 00:00:00 2001 From: julian Date: Sat, 7 Jul 2018 11:53:27 +0200 Subject: [PATCH] Fixed collision-detection-bug --- .../endlessroll/entities/collision/CollisionDetector.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionDetector.java b/app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionDetector.java index e6968e8..0334c8a 100644 --- a/app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionDetector.java +++ b/app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionDetector.java @@ -148,6 +148,8 @@ public class CollisionDetector { boolean triangleVertex3InQuad = isPointInQuad(triangle.getBottomLeftVertex(), quad); if (triangleVertex3InQuad) return true; + if (triangle.getTopEdge() >= quad.getTopEdge() && triangle.getBottomEdge() <= quad.getBottomEdge() && ((triangle.getLeftEdge() <= quad.getRightEdge() && triangle.getLeftEdge() >= quad.getLeftEdge()) || (triangle.getRightEdge() <= quad.getRightEdge() && triangle.getRightEdge() >= quad.getLeftEdge()))) + return true; return false; }