From c810a30d8d00720e0fa27c424313035a6732ee3e Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Sun, 21 Jun 2020 22:46:02 +0200 Subject: [PATCH] rich5tig lol --- core/src/controller/Controller.java | 40 ++++++++++++++++------------- core/src/model/Goal.java | 3 +++ core/src/model/Level.java | 2 ++ core/src/model/Projectile.java | 4 +++ levels/level0.json | 1 + 5 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 levels/level0.json diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java index cfaa94a..4769841 100644 --- a/core/src/controller/Controller.java +++ b/core/src/controller/Controller.java @@ -8,6 +8,7 @@ package controller; import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputProcessor; +import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.g2d.SpriteBatch; @@ -23,7 +24,9 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.ArrayList; +import model.Goal; import model.Level; +import model.Projectile; import view.Gamescreen; import view.Levelscreen; import view.Titlescreen; @@ -80,8 +83,14 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ isColliding = false; level = new ArrayList<>(); currentLevel = 0; + Json json = new Json(); + + /* + Level lol = new Level(new Goal(1000,200,450,100, 0.2f), new Projectile(0,0,0),200,200); + FileHandle file = Gdx.files.local("levels/level0.json"); + file.writeString(json.toJson(lol), false); + */ /* - level[0] = new Level(new Goal(500,200,450,100, 0.2f), new Projectile(0,0,0),200,200); level[1] = new Level(new Goal(700,200,450,100, 0.2f), new Projectile(0,0,0),200,200); level[2] = new Level(new Goal(560,400,450,100, 0.2f), new Projectile(0,0,0),200,200); level[3] = new Level(new Goal(900,150,450,100, 0.2f), new Projectile(0,0,0),200,200); @@ -92,25 +101,20 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ level[8] = new Level(new Goal(760,460,450,100, 0.2f), new Projectile(0,0,0),200,200); level[9] = new Level(new Goal(1000,580,350,100, 0.2f), new Projectile(0,0,0),200,200); level[9].addRectangle(400, 400, 50,200); - */ + */ - Json json = new Json(); - File levelJson; - for(int i = 0; i < 1000; i++){ - try{ - levelJson = new File(filesDir, "level" + i + ".json"); - if(levelJson == null){ - break; - } - else{ - Level tempLevel = json.fromJson(Level.class, new FileInputStream(levelJson)); - level.add(tempLevel); - } - } - catch(FileNotFoundException e){ - e.printStackTrace(); + + FileHandle levelJson; + for(int i = 0; i < 10; i++){ + //levelJson = Gdx.files.local("levels/level" + i + ".json"); + levelJson = Gdx.files.local("levels/level0.json"); + if(!levelJson.exists()){ break; } + else{ + Level tempLevel = json.fromJson(Level.class, levelJson.readString()); + level.add(tempLevel); + } } stepTimer = new Timer(); @@ -191,7 +195,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ if(ts != null) ts.render(batch); else if(ls != null){ currentLevel = ls.getSelectedLevel(); - ls.render(batch, level.get(currentLevel); + ls.render(batch, level.get(currentLevel)); } else if(gs != null){ gs.render(batch, level.get(currentLevel)); diff --git a/core/src/model/Goal.java b/core/src/model/Goal.java index cdfa0f6..85e3eb9 100644 --- a/core/src/model/Goal.java +++ b/core/src/model/Goal.java @@ -15,6 +15,9 @@ public class Goal { this.sizeY = sizeY; this.thickness = thickness; } + public Goal(){ + + } public int getxPos() { return xPos; diff --git a/core/src/model/Level.java b/core/src/model/Level.java index fd918df..71ccace 100644 --- a/core/src/model/Level.java +++ b/core/src/model/Level.java @@ -56,6 +56,8 @@ public class Level { traces[i] = new Vector2(-10, -10); } } + public Level(){ + } public void projectileReleased(){ this.isReleased = true; diff --git a/core/src/model/Projectile.java b/core/src/model/Projectile.java index e035efd..ad9c7df 100644 --- a/core/src/model/Projectile.java +++ b/core/src/model/Projectile.java @@ -25,6 +25,10 @@ public class Projectile { } } + public Projectile(){ + type = 0; + } + public double getxPos() { return xPos; } diff --git a/levels/level0.json b/levels/level0.json new file mode 100644 index 0000000..b1ef1e7 --- /dev/null +++ b/levels/level0.json @@ -0,0 +1 @@ +{goal:{xPos:1000,yPos:200,sizeX:450,sizeY:100,thickness:0.2},projectile:{xPos:350,yPos:200,mass:5,radius:10},math:{},xPosPivot:200,yPosPivot:200,isTraceInitialised:[false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false],traces:[{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10},{x:-10,y:-10}],objects:[]} \ No newline at end of file