From 1393b053f89f15f2f603f84f31eb7459f67d6f6d Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Mon, 8 Jun 2020 11:46:12 +0200
Subject: [PATCH] EHRE ALLA

---
 core/src/com/throwgame/main/Main.java         | 13 +--------
 core/src/controller/Controller.java           | 29 ++++++++++++++++++-
 .../main/desktop/DesktopLauncher.java         |  4 +--
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/core/src/com/throwgame/main/Main.java b/core/src/com/throwgame/main/Main.java
index bc69e36..6c38614 100644
--- a/core/src/com/throwgame/main/Main.java
+++ b/core/src/com/throwgame/main/Main.java
@@ -1,17 +1,6 @@
 package com.throwgame.main;
 
-import com.badlogic.gdx.ApplicationAdapter;
-import com.badlogic.gdx.Game;
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Input;
-import com.badlogic.gdx.InputProcessor;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import controller.Controller;
-import model.Level;
-import view.Levelscreen;
-import view.Titlescreen;
+
 
 public class Main{
 	
diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java
index 733ad49..67d21ea 100644
--- a/core/src/controller/Controller.java
+++ b/core/src/controller/Controller.java
@@ -20,7 +20,10 @@ import model.Projectile;
 import view.Gamescreen;
 import view.Levelscreen;
 import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.viewport.ExtendViewport;
 import com.badlogic.gdx.utils.viewport.FitViewport;
+import com.badlogic.gdx.utils.viewport.ScalingViewport;
+import com.badlogic.gdx.utils.viewport.Viewport;
 import view.Titlescreen;
 import view.Winscreen;
 
@@ -30,6 +33,10 @@ import view.Winscreen;
  */
 public class Controller extends ApplicationAdapter implements InputProcessor{
     
+    final float GAME_WORLD_WIDTH = 1600;
+    final float GAME_WORLD_HEIGHT = 900;
+    
+    
     Titlescreen ts;
     Levelscreen ls;
     Gamescreen gs;
@@ -39,6 +46,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     Timer stepTimer;
     Level level;
     
+    OrthographicCamera camera;
+    Viewport viewport;
+    
+    
     
     @Override
     public void create(){
@@ -50,7 +61,14 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         levelAmount = 10;
         batch = new SpriteBatch();
         Gdx.input.setInputProcessor(this);
-
+        
+        
+        float aspectRatio = (float)Gdx.graphics.getHeight() / (float)Gdx.graphics.getWidth();
+        
+        camera = new OrthographicCamera();
+        viewport = new ExtendViewport(GAME_WORLD_WIDTH, GAME_WORLD_HEIGHT * aspectRatio, camera);
+        viewport.apply();
+        camera.position.set(GAME_WORLD_WIDTH/2, GAME_WORLD_HEIGHT/2, 0);
 
         level = new Level(new Goal(800,500,200,80), new Projectile(0,0,0),200,200);
 
@@ -74,11 +92,19 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         stepTimer.stop();
     }
     
+    @Override
+    public void resize(int width, int height){
+        viewport.update(width, height);
+        camera.position.set(GAME_WORLD_WIDTH/2, GAME_WORLD_HEIGHT/2, 0);
+    }
+    
     @Override
     public void render(){
         Gdx.gl.glClearColor(1f, 1f, 1f, 1f);
         Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+        camera.update();
         batch.begin();
+        batch.setProjectionMatrix(camera.combined);
         if(ts != null) ts.render(batch);
         else if(ls != null) ls.render(batch);
         else if(gs != null) gs.render(batch, level);
@@ -94,6 +120,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     
     @Override
     public boolean keyDown(int keycode) {
+        camera.translate(5f, 5f);
         return false;
     }
 
diff --git a/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java b/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java
index b7cffc6..01ea9bb 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 = 720;
-                config.width = 1280;
+                config.height = 900;
+                config.width = 1600;
 		new LwjglApplication(new Controller(), config);
 	}
 }