diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java index 1adea0a..c3476c6 100644 --- a/core/src/controller/Controller.java +++ b/core/src/controller/Controller.java @@ -12,7 +12,9 @@ import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import model.Goal; import model.Level; +import model.Projectile; import view.Gamescreen; import view.Levelscreen; @@ -71,7 +73,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ level = new Level[10]; currentLevel = 0; - level[0] = new Level(new Goal(500,200,150,50, 0.2f), new Projectile(0,0,0),200,200); + level[0] = new Level(new Goal(500,200,450,100, 0.2f), new Projectile(0,0,0),200,200); stepTimer = new Timer(); stepTimer.scheduleTask(new Timer.Task() { diff --git a/core/src/view/Gamescreen.java b/core/src/view/Gamescreen.java index 40ffc12..fc74896 100644 --- a/core/src/view/Gamescreen.java +++ b/core/src/view/Gamescreen.java @@ -116,13 +116,13 @@ public class Gamescreen{ shapeRenderer.circle((float) p.getxPos(), (float) p.getyPos(), p.getRadius()); shapeRenderer.setColor(Color.RED); - /* + //goal hitboxes for(int i = 0; i < goalRects.length; i++){ shapeRenderer.rect(goalRects[i].getX(), goalRects[i].getY(), goalRects[i].getWidth(), goalRects[i].getHeight()); } // projectile hitbox - shapeRenderer.circle(projectileCirc.x, projectileCirc.y, projectileCirc.radius);*/ + shapeRenderer.circle(projectileCirc.x, projectileCirc.y, projectileCirc.radius); // goal hitbox shapeRenderer.setColor(Color.GREEN); shapeRenderer.rect(goalRect.getX(), goalRect.getY(), goalRect.getWidth(), goalRect.getHeight());/*