JonathanHager
/
OrbitalThrow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lol

Browse Source
master
Jonathan Hager 6 years ago
parent b1a8ee5522
commit cb40fc4937
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File

35
core/src/controller/Controller.java
Unescape View File

@ -158,19 +158,19 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
gs.step(level.get(currentChapter).get(currentLevel)); gs.step(level.get(currentChapter).get(currentLevel));
boolean collision = false; boolean collision = false;
double tempX = level.get(currentChapter).get(currentLevel).getProjectile().getxPos();
double tempY = level.get(currentChapter).get(currentLevel).getProjectile().getyPos();
for(Rectangle rect : gs.getGoalRects()){ for(Rectangle rect : gs.getGoalRects()){
if(Intersector.overlaps(gs.getProjectileCirc(), rect)) { if(Intersector.overlaps(gs.getProjectileCirc(), rect)) {
collision = true; collision = true;
if (!isColliding) { if (rect.getHeight() == 1) {
if (rect.getHeight() == 1) { level.get(currentChapter).get(currentLevel).horizontalCollision();
level.get(currentChapter).get(currentLevel).horizontalCollision(); } else if (rect.getWidth() == 1) {
} else if (rect.getWidth() == 1) { level.get(currentChapter).get(currentLevel).verticalCollision();
level.get(currentChapter).get(currentLevel).verticalCollision();
}
isColliding = true;
break;
} }
break;
} }
} }
if(gs.getObjectRects() != null) { if(gs.getObjectRects() != null) {
@ -178,21 +178,20 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if (Intersector.overlaps(gs.getProjectileCirc(), rect)) { if (Intersector.overlaps(gs.getProjectileCirc(), rect)) {
collision = true; collision = true;
if (!isColliding) { if (rect.getHeight() == 1) {
if (rect.getHeight() == 1) { level.get(currentChapter).get(currentLevel).horizontalCollision();
level.get(currentChapter).get(currentLevel).horizontalCollision(); } else if (rect.getWidth() == 1) {
} else if (rect.getWidth() == 1) { level.get(currentChapter).get(currentLevel).verticalCollision();
level.get(currentChapter).get(currentLevel).verticalCollision();
}
isColliding = true;
break;
} }
break;
} }
} }
} }
if(!collision){ if(collision){
isColliding = false; level.get(currentChapter).get(currentLevel).getProjectile().setxPos(tempX);
level.get(currentChapter).get(currentLevel).getProjectile().setyPos(tempY);
} }
} }

Write Preview
Loading…
Cancel
Save