From 79b7e6a4d7f6053e799931c9236a3d70d4d2b3aa Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Sun, 21 Jun 2020 11:21:40 +0200
Subject: [PATCH] lol

---
 core/src/save/GameData.java    | 26 ---------------
 core/src/view/Levelscreen.java | 61 +++++++++++++++++++++-------------
 2 files changed, 38 insertions(+), 49 deletions(-)
 delete mode 100644 core/src/save/GameData.java

diff --git a/core/src/save/GameData.java b/core/src/save/GameData.java
deleted file mode 100644
index b105471..0000000
--- a/core/src/save/GameData.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package save;
-
-/**
- *
- * @author Jan
- */
-public class GameData {
-    
-    private int beatenLevel;
-    
-    public int getBeatenLevel(){
-        return beatenLevel;
-    }
-    public void setBeatenLevel(int beatenLevel){
-        this.beatenLevel = beatenLevel;
-    }
-    
-    
-
-}
-
diff --git a/core/src/view/Levelscreen.java b/core/src/view/Levelscreen.java
index e1c01a4..8f6a9f5 100644
--- a/core/src/view/Levelscreen.java
+++ b/core/src/view/Levelscreen.java
@@ -41,10 +41,6 @@ public class Levelscreen{
     float GAME_WORLD_WIDTH;
     float GAME_WORLD_HEIGHT;
     ShapeRenderer shapeRenderer;
-    Sprite clicktostart;
-    boolean movementStart;
-    float clicktostartX;
-    float clicktostartY;
     
     
     public Levelscreen(int levelAmount, float width, float height, Matrix4 matrix){
@@ -69,13 +65,8 @@ public class Levelscreen{
         parameter.size = 21;
         font = generator.generateFont(parameter);
         generator.dispose();
-        
         font.setColor(Color.BLACK);
         
-        movementStart = true;
-        clicktostartX = GAME_WORLD_WIDTH / 2 - getTextWidth("click to start ...") / 2;
-        clicktostartY = GAME_WORLD_HEIGHT / 2;
-        
         t = new Timer();
         
         t.scheduleTask(new Timer.Task() {
@@ -95,14 +86,6 @@ public class Levelscreen{
                     buttonRight.setX(buttonRight.getX() + 2);
                     buttonLeft.setX(buttonLeft.getX() - 2);
                 }
-                if(clicktostartY < GAME_WORLD_HEIGHT * 0.4)
-                    movementStart = true;
-                else if(clicktostartY > GAME_WORLD_HEIGHT * 0.5)
-                    movementStart = false;
-                if(movementStart)
-                    clicktostartY = clicktostartY + 3;
-                else
-                    clicktostartY = clicktostartY - 3;
             }
         },0 , 0.035f);
     }
@@ -115,14 +98,46 @@ public class Levelscreen{
         if(selectedLevel < levelAmount){
             buttonRight.draw(batch);
         }
-        
-        
         font.getData().setScale(6);
         font.draw(batch,"LEVEL: "+ (selectedLevel + 1), GAME_WORLD_WIDTH / 2 - getTextWidth("LEVEL: "+ selectedLevel) / 2, GAME_WORLD_HEIGHT * 0.95f);
         
         font.getData().setScale(2);
-        clicktostartX = GAME_WORLD_WIDTH / 2 - getTextWidth("click to start ...") / 2;
-        font.draw(batch, "click to start ...", clicktostartX,  clicktostartY);
+        font.draw(batch, "click to start ...", GAME_WORLD_WIDTH / 2 - getTextWidth("click to start ...") / 2, GAME_WORLD_HEIGHT * 0.1f);
+        
+        batch.end();
+        shapeRenderer.begin(ShapeRenderer.ShapeType.Filled);
+        shapeRenderer.setColor(Color.BLACK);
+        shapeRenderer.rectLine(0.15f * GAME_WORLD_WIDTH, 0.15f * GAME_WORLD_HEIGHT, 0.85f * GAME_WORLD_WIDTH, 0.15f * GAME_WORLD_HEIGHT, 3);
+        shapeRenderer.rectLine(0.15f * GAME_WORLD_WIDTH, 0.15f * GAME_WORLD_HEIGHT, 0.15f * GAME_WORLD_WIDTH, 0.85f * GAME_WORLD_HEIGHT, 3);
+        shapeRenderer.rectLine(0.85f * GAME_WORLD_WIDTH, 0.15f * GAME_WORLD_HEIGHT, 0.85f * GAME_WORLD_WIDTH, 0.85f * GAME_WORLD_HEIGHT, 3);
+        shapeRenderer.rectLine(0.15f * GAME_WORLD_WIDTH, 0.85f * GAME_WORLD_HEIGHT, 0.85f * GAME_WORLD_WIDTH, 0.85f * GAME_WORLD_HEIGHT, 3);
+        
+        float previewX = 0.15f * GAME_WORLD_WIDTH;
+        float previewY = 0.15f * GAME_WORLD_HEIGHT;
+        float previewWidth = 0.7f * GAME_WORLD_WIDTH;
+        float previewHeight = 0.7f * GAME_WORLD_HEIGHT;
+        
+        
+        shapeRenderer.rectLine(previewX + level.getPivotX() * 0.7f, previewY + level.getPivotY() * 0.7f, previewX + (float)level.getProjectile().getxPos() * 0.7f, previewY + (float)level.getProjectile().getyPos()* 0.7f, 3);
+        shapeRenderer.setColor(Color.GRAY);
+        shapeRenderer.circle(previewX + level.getPivotX() * 0.7f, previewY + level.getPivotY() * 0.7f, 5);
+        shapeRenderer.setColor(Color.BLACK);
+        shapeRenderer.circle(previewX + (float)level.getProjectile().getxPos() * 0.7f, previewY + (float)level.getProjectile().getyPos()* 0.7f, 8);
+        
+        float x = level.getGoal().getxPos();
+        float y = level.getGoal().getyPos();
+        float th = level.getGoal().getThickness();
+        float w = level.getGoal().getSizeX();
+        float h = level.getGoal().getSizeY();
+       
+        shapeRenderer.rect(previewX + x * 0.7f, previewY + y * 0.7f, (th * w) * 0.7f  ,h * 0.7f);
+        shapeRenderer.rect(previewX + (x + th * w) * 0.7f, previewY + y * 0.7f, (th*3 * w) * 0.7f,(th * h)*0.7f);
+        shapeRenderer.rect(previewX + (x + th *w + th*3 * w) * 0.7f, previewY + y * 0.7f, (th * w) * 0.7f  ,h * 0.7f);
+        
+        shapeRenderer.end();
+        batch.begin();
+        
+        
        
     }
     
@@ -138,9 +153,9 @@ public class Levelscreen{
     }
     public float getTextWidth(String text){
         GlyphLayout glyphLayout = new GlyphLayout();
-        String item = text;
-        glyphLayout.setText(font,item);
+        glyphLayout.setText(font,text);
         return glyphLayout.width;
     }
+    
 
 }