diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java index 84fad2c..733ad49 100644 --- a/core/src/controller/Controller.java +++ b/core/src/controller/Controller.java @@ -21,7 +21,6 @@ import view.Gamescreen; import view.Levelscreen; import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.viewport.FitViewport; -import com.sun.prism.image.ViewPort; import view.Titlescreen; import view.Winscreen; @@ -40,8 +39,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ Timer stepTimer; Level level; - OrthographicCamera camera; - FitViewport fitViewport; @Override public void create(){ @@ -54,11 +51,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ batch = new SpriteBatch(); Gdx.input.setInputProcessor(this); - camera = new OrthographicCamera(); - fitViewport = new FitViewport(1600,900, camera); - fitViewport.setScreenBounds(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); - level = new Level(new Goal(1300,700,200,80), new Projectile(0,0,0),400,400); + level = new Level(new Goal(800,500,200,80), new Projectile(0,0,0),200,200); stepTimer = new Timer(); stepTimer.scheduleTask(new Timer.Task() { @@ -67,6 +61,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ if(gs != null){ if(level.getProjectile().getxPos() > Gdx.graphics.getWidth() || level.getProjectile().getxPos() < 0 || level.getProjectile().getyPos() < 0){ level.reset(); + gs.dispose(); gs = null; ws = new Winscreen(); } @@ -81,10 +76,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ @Override public void render(){ - //camera.update(); Gdx.gl.glClearColor(1f, 1f, 1f, 1f); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); - //batch.setProjectionMatrix(camera.combined); batch.begin(); if(ts != null) ts.render(batch); else if(ls != null) ls.render(batch); @@ -177,9 +170,4 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ public boolean scrolled(int i) { return false; } - - @Override - public void resize(int width, int height) { - fitViewport.update(width,height,true); - } } diff --git a/core/src/view/Gamescreen.java b/core/src/view/Gamescreen.java index 34d4090..61ba338 100644 --- a/core/src/view/Gamescreen.java +++ b/core/src/view/Gamescreen.java @@ -5,7 +5,9 @@ */ package view; +import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.math.Vector2; @@ -44,6 +46,7 @@ public class Gamescreen{ shapeRenderer = new ShapeRenderer(); + } diff --git a/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java b/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java index 01ea9bb..b7cffc6 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 = true; - config.height = 900; - config.width = 1600; + config.height = 720; + config.width = 1280; new LwjglApplication(new Controller(), config); } }