From c22cddf8820764e33fb64ffa30a3a1754814f285 Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Tue, 2 Jun 2020 10:34:34 +0200
Subject: [PATCH] ALLA

---
 android/assets/projectile.png         | Bin 737 -> 0 bytes
 core/src/com/throwgame/main/Main.java |  10 +++++--
 core/src/controller/Controller.java   |  18 ++++++++++-
 core/src/view/Gamescreen.java         |  41 ++++++++++++++++----------
 core/src/view/Levelscreen.java        |   8 +++--
 core/src/view/Titlescreen.java        |   3 +-
 6 files changed, 56 insertions(+), 24 deletions(-)
 delete mode 100644 android/assets/projectile.png

diff --git a/android/assets/projectile.png b/android/assets/projectile.png
deleted file mode 100644
index 2d47e38a34a032f3c7acfeb7baa6a26acaf59ed2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004oX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ?()$1v`icW~fdUL`4J_sbUc<l(s^v4kj=C5t=k4
zDK3tJYr(;v#j1mgv#t)Vf*|+<;^gS0=prTFmlRsWc;WFr&b#OE-hF^jD>2n<8v|6$
zGLo^Vn8~h)fmd|Ehh7X}Mq;KOPc5Y3Szq_mOLZ6FS>AnrR=1Kf8Q>F%XPItT#OuUU
zo0iUbpE$&dl0tk=JZjJdi66NxyZpwv;IP0mLq<9|M;sy+3oR_SFe@4=@g#9rQ8mgJ
zGA=8ew>Yb%3Txbxzc857mQ!4(HHa7%5k~?dWK^($5-db$*GMsur1PkUf57o4$R(3&
z1B@K=C_{zh_`(0+_iWAl#JHOji~{X1w*4^-1a^UX)waKnZM%K~_@99*t?4h<fay=t
zt4%F@1oUhJ7uQWq-UBXofc__4G9*Xx(-QJ|;QfrgDGT)70$r=_+#2UNeE`xltEC&@
z;1C!oQ1+U~yE|Lw_HR#Pem|rUa=XbzVv7I(00v@9M??Vs0RI60puMM)00009a7bBm
z001r{001r{0eGc9b^rhX2XskIMF->t0TT)n7R=R*0000PbVXQnLvL+uWo~o;Lvm$d
zbY)~9cWHEJAV*0}P*;Ht7XSbNw@E}nRA}Dqnp+ZpAPfVE_rEh9z*mJr8wlSz?3y|Q
z6cpc4jnBbrLQI4n!hj%XHy$JbZ{|Wm_+M;D3UB5^QgAaT2;g5?k3v2`^7S8iK?Hxx
z3^Mo&_fr2rWn`yMV3`uCto$mW3?)>RfCMBU0SQPz0$R*zF{dr1wv^kK5K|dp*#sC;
zz?VQ~3De<jR*Aj(1KCnQt3b3!catwt!nMshTVhC~dxpsHs|F)v5cYD1jN7~?^}HKJ
T)%P{N00000NkvXXu0mjfnCUO5

diff --git a/core/src/com/throwgame/main/Main.java b/core/src/com/throwgame/main/Main.java
index 1e1e181..b20c489 100644
--- a/core/src/com/throwgame/main/Main.java
+++ b/core/src/com/throwgame/main/Main.java
@@ -12,7 +12,7 @@ import model.Level;
 import view.Levelscreen;
 import view.Titlescreen;
 
-public class Main  extends Game implements InputProcessor{
+public class Main  extends ApplicationAdapter implements InputProcessor{
 	
         int screenId;
         Controller c;
@@ -21,13 +21,17 @@ public class Main  extends Game implements InputProcessor{
 	@Override
 	public void create () {
 		c = new Controller();
+                c.create();
                 screenId = 0;
-                setScreen(new Titlescreen(this));
+                
 	}
 
 	@Override
 	public void render () {
-            screen.render(0);
+            Gdx.gl.glClearColor(1f, 1f, 1f, 1f);
+            Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);  
+            
+            c.getScreen().render(0);
 	}
 	
 	@Override
diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java
index 803e49b..c451998 100644
--- a/core/src/controller/Controller.java
+++ b/core/src/controller/Controller.java
@@ -7,13 +7,29 @@ package controller;
 
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.InputProcessor;
+import com.badlogic.gdx.Screen;
+import view.AbstractScreen;
 import view.Titlescreen;
 
 /**
  *
  * @author Jan
  */
-public class Controller{
+public class Controller extends Game{
+
+    @Override
+    public void create() {
+        setScreen(new Titlescreen(this));
+    }
+    
+    @Override
+    public void render(){
+        
+    }
+    
+    public Screen getScreen(){
+        return screen;
+    }
 
    
 
diff --git a/core/src/view/Gamescreen.java b/core/src/view/Gamescreen.java
index d450759..9c62ba8 100644
--- a/core/src/view/Gamescreen.java
+++ b/core/src/view/Gamescreen.java
@@ -13,8 +13,10 @@ import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.math.Rectangle;
 import model.Goal;
+import model.Level;
 import model.Projectile;
 
 /**
@@ -27,24 +29,24 @@ public class Gamescreen extends AbstractScreen{
     Projectile p;
     SpriteBatch batch;
     
-    Sprite projectile;
-    Rectangle goalLeft;
-    Rectangle goalRight;
-    Rectangle goalBottom;
+    //Rectangle goalLeft;
+    //Rectangle goalRight;
+    //Rectangle goalBottom;
+    ShapeRenderer shapeRenderer;
     
     
     
     
-    public Gamescreen(Game game){
+    public Gamescreen(Game game, Level level){
         super(game);
-        g = new Goal(800,400,200,150);
-        p = new Projectile(250, 250, 0);
-        projectile = new Sprite(new Texture("projectile.png"));
-        projectile.setPosition(p.getxPos(), p.getyPos());
-        goalLeft = new Rectangle(g.getxPos(), g.getyPos(), 0.1f * g.getSizeX(), g.getSizeY());
-        goalBottom = new Rectangle(g.getxPos() + goalLeft.getWidth(), g.getyPos(), 0.8f * g.getSizeX(),0.2f * g.getSizeY());
-        goalRight = new Rectangle(g.getxPos() + goalLeft.getWidth() + goalBottom.getWidth(), g.getyPos(), 0.1f * g.getSizeX(),g.getSizeY());
+        g = level.getGoal();
+        p = level.getProjectile();
+        // Goal rectangles
+        //goalLeft = new Rectangle(g.getxPos(), g.getyPos(), 0.1f * g.getSizeX(), g.getSizeY());
+        //goalBottom = new Rectangle(g.getxPos() + 0.1f * g.getSizeX(), g.getyPos(), 0.8f * g.getSizeX(),0.2f * g.getSizeY());
+        //goalRight = new Rectangle(g.getxPos() + 0.1f * g.getSizeX() + 0.8f * g.getSizeX(), g.getyPos(), 0.1f * g.getSizeX(),g.getSizeY());
         batch = new SpriteBatch();
+        shapeRenderer = new ShapeRenderer();
         
     }
     
@@ -54,10 +56,15 @@ public class Gamescreen extends AbstractScreen{
 
     @Override
     public void render(float f) {
-        Gdx.gl.glClearColor(1f, 1f, 1f, 1f);
-        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+        
         batch.begin();
-        projectile.draw(batch);
+        shapeRenderer.begin(ShapeRenderer.ShapeType.Filled);
+        shapeRenderer.setColor(Color.BLACK);
+        shapeRenderer.rect(g.getxPos(), g.getyPos(), 0.2f * g.getSizeX(), g.getSizeY());
+        shapeRenderer.rect(g.getxPos() + 0.2f * g.getSizeX(), g.getyPos(), 0.6f * g.getSizeX(),0.2f * g.getSizeY());
+        shapeRenderer.rect(g.getxPos() + 0.2f * g.getSizeX() + 0.6f * g.getSizeX(), g.getyPos(), 0.2f * g.getSizeX(),g.getSizeY());
+        shapeRenderer.circle(p.getxPos(), p.getyPos(), p.getRadius());
+        shapeRenderer.end();
         batch.end();
         
         if(Gdx.input.justTouched()){
@@ -84,4 +91,8 @@ public class Gamescreen extends AbstractScreen{
     @Override
     public void dispose() {
     }
+    
+    public void update(){
+    
+    }
 }
diff --git a/core/src/view/Levelscreen.java b/core/src/view/Levelscreen.java
index 39faa0a..3dd4aba 100644
--- a/core/src/view/Levelscreen.java
+++ b/core/src/view/Levelscreen.java
@@ -15,6 +15,9 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.utils.Timer;
+import model.Goal;
+import model.Level;
+import model.Projectile;
 
 /**
  *
@@ -74,8 +77,7 @@ public class Levelscreen extends AbstractScreen{
 
     @Override
     public void render(float f) {
-        Gdx.gl.glClearColor(1f, 1f, 1f, 1f);
-        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+        
         
         SpriteBatch batch = new SpriteBatch();
         
@@ -101,7 +103,7 @@ public class Levelscreen extends AbstractScreen{
             }
             else{
                 dispose();
-                game.setScreen(new Gamescreen(game));
+                game.setScreen(new Gamescreen(game, new Level(new Goal(400,400,200,100), new Projectile(160,160,0))));
             }
         }
     }
diff --git a/core/src/view/Titlescreen.java b/core/src/view/Titlescreen.java
index 643e2e6..46c9eaf 100644
--- a/core/src/view/Titlescreen.java
+++ b/core/src/view/Titlescreen.java
@@ -60,8 +60,7 @@ public class Titlescreen extends AbstractScreen{
 
     @Override
     public void render(float f) {
-        Gdx.gl.glClearColor(1f, 1f, 1f, 1f);
-        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+        
         
         batch.begin();
         clicktostart.draw(batch);