From e9ae01d70e5c75c16384626e61800fabd90c2ee3 Mon Sep 17 00:00:00 2001 From: GammelJan Date: Wed, 3 Jun 2020 21:50:16 +0200 Subject: [PATCH] EHRE --- core/src/controller/Controller.java | 14 ++++++-------- core/src/view/Gamescreen.java | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java index 94138dc..ceef125 100644 --- a/core/src/controller/Controller.java +++ b/core/src/controller/Controller.java @@ -47,11 +47,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ stepTimer.scheduleTask(new Timer.Task() { @Override public void run() { - if(gs != null) { level.step(); - } } }, 0, 0.01f); + stepTimer.stop(); } @Override @@ -105,27 +104,26 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ ls.dispose(); ls = null; gs = new Gamescreen(level); + stepTimer.start(); } } else if(gs != null){ if(!level.released()){ level.projectileReleased(); } - System.out.println(level.getProjectile().getxPos()); - System.out.println(level.getProjectile().getyPos()); - //gs = null; - //ls = new Levelscreen(levelAmount); } return true; } @Override public boolean touchUp(int i, int i1, int i2, int i3) { - return false; + if(gs != null){ + } + return true; } @Override - public boolean touchDragged(int i, int i1, int i2) { + public boolean touchDragged(int i, int i1, int i2){ return false; } diff --git a/core/src/view/Gamescreen.java b/core/src/view/Gamescreen.java index c00d21a..177085a 100644 --- a/core/src/view/Gamescreen.java +++ b/core/src/view/Gamescreen.java @@ -37,7 +37,6 @@ public class Gamescreen{ - public Gamescreen(Level level){ pivotX = level.getPivotX(); pivotY = level.getPivotY(); @@ -58,7 +57,6 @@ public class Gamescreen{ pivotX = level.getPivotX(); pivotY = level.getPivotY(); g = level.getGoal(); - p = level.getProjectile(); shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); shapeRenderer.setColor(Color.BLACK); @@ -70,6 +68,7 @@ public class Gamescreen{ shapeRenderer.circle(pivotX, pivotY, 5); shapeRenderer.end(); + } public void dispose() {