Add horizontalWallCollision method.

d569ab0f · 9831111 · 06746c8f · d569ab0f
Commit d569ab0f authored Jul 31, 2020 by 9831111 🙂
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 21 deletions

GameState.java src/GameState.java +21 -21

No files found.
--- a/src/GameState.java
+++ b/src/GameState.java
@@ -112,16 +112,16 @@ public class GameState {
        return null;
    }

-//    public Wall horizontalWallCollision() {
-//        for (Wall wall : Controller.walls) {
-//            if (wall.getWidth() == 50 && wall.getHeight() == 5) {
-//                if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 50, 5)))) {
-//                    return wall;
-//                }
-//            }
-//        }
-//        return null;
-//    }
+    public Wall horizontalWallCollision() {
+        for (Wall wall : Controller.walls) {
+            if (wall.getWidth() == 50 && wall.getHeight() == 5) {
+                if ((getBounds(locX, locY).intersects(new Rectangle((int) wall.getX(), (int) wall.getY(), 50, 5)))) {
+                    return wall;
+                }
+            }
+        }
+        return null;
+    }

    public boolean isMoveAllowed(int px) {

@@ -154,17 +154,17 @@ public class GameState {
            }

        }
-//        if (horizontalWallCollision() != null) {
-//            if (horizontalWallCollision().getY() > locY && px > 0 && ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360)))
-//                return false;
-//            if (horizontalWallCollision().getY() < locY && px < 0 && ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360)))
-//                return false;
-//            if (horizontalWallCollision().getY() < locY && px > 0 && ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360)))
-//                return false;
-//            if (horizontalWallCollision().getY() > locY && px < 0 && ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360)))
-//                return false;
-//
-//        }
+        if (horizontalWallCollision() != null) {
+            if (horizontalWallCollision().getY() > locY && px > 0 && ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360)))
+                return false;
+            if (horizontalWallCollision().getY() < locY && px < 0 && ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360)))
+                return false;
+            if (horizontalWallCollision().getY() < locY && px > 0 && ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360)))
+                return false;
+            if (horizontalWallCollision().getY() > locY && px < 0 && ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360)))
+                return false;
+
+        }
        return true;
    }