master
GammelJan 6 years ago
parent 07d6c433ce
commit e9ae01d70e

@ -47,11 +47,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
stepTimer.scheduleTask(new Timer.Task() { stepTimer.scheduleTask(new Timer.Task() {
@Override @Override
public void run() { public void run() {
if(gs != null) {
level.step(); level.step();
} }
}
}, 0, 0.01f); }, 0, 0.01f);
stepTimer.stop();
} }
@Override @Override
@ -105,23 +104,22 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
ls.dispose(); ls.dispose();
ls = null; ls = null;
gs = new Gamescreen(level); gs = new Gamescreen(level);
stepTimer.start();
} }
} }
else if(gs != null){ else if(gs != null){
if(!level.released()){ if(!level.released()){
level.projectileReleased(); level.projectileReleased();
} }
System.out.println(level.getProjectile().getxPos());
System.out.println(level.getProjectile().getyPos());
//gs = null;
//ls = new Levelscreen(levelAmount);
} }
return true; return true;
} }
@Override @Override
public boolean touchUp(int i, int i1, int i2, int i3) { public boolean touchUp(int i, int i1, int i2, int i3) {
return false; if(gs != null){
}
return true;
} }
@Override @Override

@ -37,7 +37,6 @@ public class Gamescreen{
public Gamescreen(Level level){ public Gamescreen(Level level){
pivotX = level.getPivotX(); pivotX = level.getPivotX();
pivotY = level.getPivotY(); pivotY = level.getPivotY();
@ -58,7 +57,6 @@ public class Gamescreen{
pivotX = level.getPivotX(); pivotX = level.getPivotX();
pivotY = level.getPivotY(); pivotY = level.getPivotY();
g = level.getGoal(); g = level.getGoal();
p = level.getProjectile();
shapeRenderer.begin(ShapeRenderer.ShapeType.Filled); shapeRenderer.begin(ShapeRenderer.ShapeType.Filled);
shapeRenderer.setColor(Color.BLACK); shapeRenderer.setColor(Color.BLACK);
@ -70,6 +68,7 @@ public class Gamescreen{
shapeRenderer.circle(pivotX, pivotY, 5); shapeRenderer.circle(pivotX, pivotY, 5);
shapeRenderer.end(); shapeRenderer.end();
} }
public void dispose() { public void dispose() {

Loading…
Cancel
Save