From efc6f03ea830e2664699ef0e7ada86f2b4f7ff71 Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Tue, 2 Jun 2020 11:43:27 +0200 Subject: [PATCH] lol --- android/src/com/throwgame/main/AndroidLauncher.java | 4 +++- core/src/controller/Controller.java | 13 ++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/android/src/com/throwgame/main/AndroidLauncher.java b/android/src/com/throwgame/main/AndroidLauncher.java index f129a52..4051a8c 100644 --- a/android/src/com/throwgame/main/AndroidLauncher.java +++ b/android/src/com/throwgame/main/AndroidLauncher.java @@ -6,11 +6,13 @@ import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; import com.throwgame.main.Main; +import controller.Controller; + public class AndroidLauncher extends AndroidApplication { @Override protected void onCreate (Bundle savedInstanceState) { super.onCreate(savedInstanceState); AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); - initialize(new Main(), config); + initialize(new Controller(), config); } } diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java index f9abb83..80c3896 100644 --- a/core/src/controller/Controller.java +++ b/core/src/controller/Controller.java @@ -30,6 +30,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ int levelAmount; SpriteBatch batch; Timer stepTimer; + Level level; @Override public void create(){ @@ -40,11 +41,15 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ batch = new SpriteBatch(); Gdx.input.setInputProcessor(this); + level = new Level(new Goal(500,500,200,150), new Projectile(100,100,0),400,400); + stepTimer = new Timer(); stepTimer.scheduleTask(new Timer.Task() { @Override public void run() { - + if(ls != null) { + level.step(); + } } }, 0, 0.1f); } @@ -56,7 +61,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ batch.begin(); if(ts != null) ts.render(batch); else if(ls != null) ls.render(batch); - else if(gs != null) gs.render(batch, new Level(new Goal(500,500,200,150), new Projectile(100,100,0),50,50)); + else if(gs != null) gs.render(batch, level); batch.end(); } @@ -99,12 +104,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ else{ ls.dispose(); ls = null; - gs = new Gamescreen(new Level(new Goal(500,500,200,150), new Projectile(100,100,0),50,50)); + gs = new Gamescreen(level); } } else if(gs != null){ - gs = null; - ls = new Levelscreen(levelAmount); } return true; }