summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/zproject/engine/Camera.java (renamed from core/src/ch/asynk/zproject/screens/GameCamera.java)6
-rw-r--r--core/src/ch/asynk/zproject/screens/GameScreen.java5
2 files changed, 6 insertions, 5 deletions
diff --git a/core/src/ch/asynk/zproject/screens/GameCamera.java b/core/src/ch/asynk/zproject/engine/Camera.java
index 54b1f82..a3e13e1 100644
--- a/core/src/ch/asynk/zproject/screens/GameCamera.java
+++ b/core/src/ch/asynk/zproject/engine/Camera.java
@@ -1,4 +1,4 @@
-package ch.asynk.zproject.screens;
+package ch.asynk.zproject.engine;
import com.badlogic.gdx.graphics.glutils.HdpiUtils;
import com.badlogic.gdx.graphics.OrthographicCamera;
@@ -8,7 +8,7 @@ import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Matrix4;
-public class GameCamera extends OrthographicCamera
+public class Camera extends OrthographicCamera
{
private static final float ZEROF = 0.01f;
@@ -31,7 +31,7 @@ public class GameCamera extends OrthographicCamera
private int hudBottom;
private boolean hudInBoard;
- public GameCamera(int padding, float boardWidth, float boardHeight, float zoomMax, float zoomMin, boolean hudInBoard)
+ public Camera(int padding, float boardWidth, float boardHeight, float zoomMax, float zoomMin, boolean hudInBoard)
{
super(boardWidth, boardHeight);
this.boardWidth = boardWidth;
diff --git a/core/src/ch/asynk/zproject/screens/GameScreen.java b/core/src/ch/asynk/zproject/screens/GameScreen.java
index 30e6b67..a784acc 100644
--- a/core/src/ch/asynk/zproject/screens/GameScreen.java
+++ b/core/src/ch/asynk/zproject/screens/GameScreen.java
@@ -17,6 +17,7 @@ import com.badlogic.gdx.math.Vector3;
import ch.asynk.zproject.ZProject;
import ch.asynk.zproject.GameHud;
import ch.asynk.zproject.GameBoard;
+import ch.asynk.zproject.engine.Camera;
public class GameScreen implements Screen
{
@@ -29,7 +30,7 @@ public class GameScreen implements Screen
private final ZProject zproject;
private final GameHud hud;
private final GameBoard board;
- private final GameCamera camera;
+ private final Camera camera;
private final SpriteBatch batch;
private ShapeRenderer debugShapes = null;
@@ -47,7 +48,7 @@ public class GameScreen implements Screen
this.hud = new GameHud(zproject.assets);
this.board = new GameBoard(zproject.assets);
this.batch = new SpriteBatch();
- this.camera = new GameCamera(10, board.getWidth(), board.getHeight(), 1.0f, 0.3f, false);
+ this.camera = new Camera(10, board.getWidth(), board.getHeight(), 1.0f, 0.3f, false);
Gdx.input.setInputProcessor(getMultiplexer(this));
this.paused = false;
this.inputDelay = 0f;