Skip to content

J
JTankTrouble
Commit 2b3e1890 authored by 9831111's avatar 9831111 🙂
Browse files
Options

Fix wall collision.

parent d569ab0f
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 12 deletions
src/GameState.java
View file @ 2b3e1890
...@@ -128,41 +128,56 @@ public class GameState { ...@@ -128,41 +128,56 @@ public class GameState {
if (verticalWallCollision() != null) { if (verticalWallCollision() != null) {
if (verticalWallCollision().getX() > locX && px > 0) { if (verticalWallCollision().getX() > locX && px > 0) {
if ((rotateAmount <= 90 && rotateAmount >= -90) || (rotateAmount <= -270 && rotateAmount > -360) || (rotateAmount >= 270 && rotateAmount < 360)) { if ((rotateAmount <= 90 && rotateAmount >= -90) || (rotateAmount <= -270 && rotateAmount > -360) || (rotateAmount >= 270 && rotateAmount < 360)) {
System.out.println("1");
return false; return false;
} else return true; } else return true;
} }
if (verticalWallCollision().getX() < locX && px < 0) { if (verticalWallCollision().getX() < locX && px < 0) {
if ((rotateAmount <= 90 && rotateAmount >= -90) || (rotateAmount <= -270 && rotateAmount > -360) || (rotateAmount >= 270 && rotateAmount < 360)) { if ((rotateAmount <= 90 && rotateAmount >= -90) || (rotateAmount <= -270 && rotateAmount > -360) || (rotateAmount >= 270 && rotateAmount < 360)) {
System.out.println("2");
return false; return false;
} else return true; } else return true;
} }
if (verticalWallCollision().getX() > locX && px < 0) { if (verticalWallCollision().getX() > locX && px < 0) {
if ((rotateAmount >= 90 && rotateAmount <= 270) || (rotateAmount <= -90 && rotateAmount >= -270)) { if ((rotateAmount >= 90 && rotateAmount <= 270) || (rotateAmount <= -90 && rotateAmount >= -270)) {
System.out.println("3");
return false; return false;
} else return true; } else return true;
} }
if (verticalWallCollision().getX() < locX && px > 0) { if (verticalWallCollision().getX() < locX && px > 0) {
if ((rotateAmount >= 90 || rotateAmount <= 270) || (rotateAmount <= -90 && rotateAmount >= -270)) { if ((rotateAmount >= 90 || rotateAmount <= 270) || (rotateAmount <= -90 && rotateAmount >= -270)) {
System.out.println("4");
return false; return false;
} else return true; } else return true;
} }
} }
if (horizontalWallCollision() != null) { if (horizontalWallCollision() != null) {
if (horizontalWallCollision().getY() > locY && px > 0 && ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360))) if (horizontalWallCollision().getY() > locY && px > 0) {
return false; if ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360)) {
if (horizontalWallCollision().getY() < locY && px < 0 && ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360))) System.out.println("1");
return false; return false;
if (horizontalWallCollision().getY() < locY && px > 0 && ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360))) } else return true;
return false; }
if (horizontalWallCollision().getY() > locY && px < 0 && ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360))) if (horizontalWallCollision().getY() < locY && px < 0) {
return false; if ((rotateAmount <= 180 && rotateAmount >= 0) || (rotateAmount <= -180 && rotateAmount > -360)) {
System.out.println("2");
return false;
} else return true;
}
if (horizontalWallCollision().getY() < locY && px > 0) {
if ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360)) {
System.out.println("3");
return false;
} else return true;
}
if (horizontalWallCollision().getY() > locY && px < 0) {
if ((rotateAmount >= -180 && rotateAmount <= 0) || (rotateAmount >= 180 && rotateAmount < 360)) {
System.out.println("4");
return false;
} else return true;
}
} }
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment