From c04e7e7f36b329b8642c76e94295c8deb073d1c6 Mon Sep 17 00:00:00 2001 From: GammelJan Date: Wed, 24 Jun 2020 19:20:47 +0200 Subject: [PATCH] Lol --- android/assets/levellol.json | 1 + android/assets/levels/level2.json | 2 +- core/src/controller/Controller.java | 18 ++++++++++-------- core/src/model/Level.java | 4 ++-- core/src/view/Gamescreen.java | 10 +++++----- .../main/desktop/DesktopLauncher.java | 4 ++-- 6 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 android/assets/levellol.json diff --git a/android/assets/levellol.json b/android/assets/levellol.json new file mode 100644 index 0000000..fb1b352 --- /dev/null +++ b/android/assets/levellol.json @@ -0,0 +1 @@ +{goal:{xPos:1000,yPos:580,sizeX:350,sizeY:100,thickness:0.2},projectile:{xPos:350,yPos:200,mass:5,radius:10},math:{},xPosPivot:200,yPosPivot:200,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[]} \ No newline at end of file diff --git a/android/assets/levels/level2.json b/android/assets/levels/level2.json index 6df2261..bfcf665 100644 --- a/android/assets/levels/level2.json +++ b/android/assets/levels/level2.json @@ -1 +1 @@ -{goal:{xPos:417,yPos:629,sizeX:300,sizeY:200,thickness:0.2},projectile:{xPos:979,yPos:595,mass:5,radius:10},math:{},xPosPivot:979,yPosPivot:445,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[]} \ No newline at end of file +{goal:{xPos:883,yPos:229,sizeX:250,sizeY:140,thickness:0.2},projectile:{xPos:579,yPos:496,mass:5,radius:10},math:{},xPosPivot:579,yPosPivot:346,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[]} \ No newline at end of file diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java index a3e6647..8875418 100644 --- a/core/src/controller/Controller.java +++ b/core/src/controller/Controller.java @@ -167,11 +167,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ double tempY = level.get(currentChapter).get(currentLevel).getProjectile().getyPos(); for(Rectangle rect : gs.getGoalRects()){ - if(Intersector.overlaps(gs.getProjectileCirc(), rect)) { + if(Intersector.overlaps(gs.getProjectileCirc(), rect) && !collision) { collision = true; - level.get(currentChapter).get(currentLevel).getProjectile().setxPos(tempX); - level.get(currentChapter).get(currentLevel).getProjectile().setyPos(tempY); if (rect.getHeight() == 1) { level.get(currentChapter).get(currentLevel).horizontalCollision(); } else if (rect.getWidth() == 1) { @@ -182,14 +180,13 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ } if(gs.getObjectRects() != null) { for (Rectangle rect : gs.getObjectRects()) { - if (Intersector.overlaps(gs.getProjectileCirc(), rect)) { + if (Intersector.overlaps(gs.getProjectileCirc(), rect) && !collision) { collision = true; - level.get(currentChapter).get(currentLevel).getProjectile().setxPos(tempX); - level.get(currentChapter).get(currentLevel).getProjectile().setyPos(tempY); - if (rect.getHeight() == 5) { + + if (rect.getHeight() == 1) { level.get(currentChapter).get(currentLevel).horizontalCollision(); - } else if (rect.getWidth() == 5) { + } else if (rect.getWidth() == 1) { level.get(currentChapter).get(currentLevel).verticalCollision(); } //break; @@ -197,6 +194,11 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ } } } + + if(collision){ + level.get(currentChapter).get(currentLevel).getProjectile().setxPos(tempX); + level.get(currentChapter).get(currentLevel).getProjectile().setyPos(tempY); + } } } diff --git a/core/src/model/Level.java b/core/src/model/Level.java index c84e48b..9218cff 100644 --- a/core/src/model/Level.java +++ b/core/src/model/Level.java @@ -168,8 +168,8 @@ public class Level { public void setGoal(int x, int y){ goal.setxPos(x); goal.setyPos(y); - goal.setSizeX(300); - goal.setSizeY(200); + goal.setSizeX(250); + goal.setSizeY(140); } public void removeObstacle(Rectangle rect){ objects.remove(rect); diff --git a/core/src/view/Gamescreen.java b/core/src/view/Gamescreen.java index 582d01c..3c15041 100644 --- a/core/src/view/Gamescreen.java +++ b/core/src/view/Gamescreen.java @@ -87,12 +87,12 @@ public class Gamescreen{ goalRects[6] = new Rectangle(x + w-1 ,y ,1 ,h ); goalRects[7] = new Rectangle(x ,y ,w ,1 ); - int hitboxWidth = 5; // CHANGE IN STEP TIMER IN CONTROLLER TOO + int hitboxWidth = 1; // CHANGE IN STEP TIMER IN CONTROLLER TOO for (Rectangle object : objects) { - objectRects.add(new Rectangle(object.getX(), object.getY(), hitboxWidth, object.getHeight())); - objectRects.add(new Rectangle(object.getX(), object.getY() + object.getHeight() - hitboxWidth, object.getWidth(), hitboxWidth)); - objectRects.add(new Rectangle(object.getX() + object.getWidth() - hitboxWidth, object.getY(), hitboxWidth, object.getHeight())); - objectRects.add(new Rectangle(object.getX(), object.getY(), object.getWidth(), hitboxWidth)); + objectRects.add(new Rectangle(object.getX() + 2, object.getY(), object.getWidth() - 4, hitboxWidth)); // UNTEN + objectRects.add(new Rectangle(object.getX() + 2, object.getY() + object.getHeight() - hitboxWidth, object.getWidth() - 4, hitboxWidth)); // OBEN + objectRects.add(new Rectangle(object.getX() + object.getWidth() - hitboxWidth, object.getY() + 2, hitboxWidth, object.getHeight() - 4)); // RECHTS + objectRects.add(new Rectangle(object.getX(), object.getY() + 2, hitboxWidth, object.getHeight() - 4)); // LINKS } goalRect = new Rectangle(x + w*th, y + h*th, w * th * 3, h * 0.1f); diff --git a/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java b/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java index fb17219..adc874a 100644 --- a/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java +++ b/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java @@ -9,8 +9,8 @@ public class DesktopLauncher { public static void main (String[] arg) { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); config.fullscreen = false; - config.height = 480; - config.width = 720; + config.height = 900; + config.width = 1600; new LwjglApplication(new Controller(), config); } }