summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2018-09-11 20:02:44 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2018-09-11 20:02:44 +0200
commit5b89e9ad75e72016a4ec5c7d7c59e5ed557e60e7 (patch)
treedd076e372c1cefe92630791c5d014a45db7c8572
parentde8b651b8d3b8f22d8bbad1a968d2e2a2ca14f36 (diff)
downloadgdx-boardgame-5b89e9ad75e72016a4ec5c7d7c59e5ed557e60e7.zip
gdx-boardgame-5b89e9ad75e72016a4ec5c7d7c59e5ed557e60e7.tar.gz
Hud -> GameHud, Board -> GameBoard
-rw-r--r--core/src/ch/asynk/zproject/GameBoard.java (renamed from core/src/ch/asynk/zproject/Board.java)6
-rw-r--r--core/src/ch/asynk/zproject/GameHud.java (renamed from core/src/ch/asynk/zproject/Hud.java)6
-rw-r--r--core/src/ch/asynk/zproject/screens/GameScreen.java12
3 files changed, 12 insertions, 12 deletions
diff --git a/core/src/ch/asynk/zproject/Board.java b/core/src/ch/asynk/zproject/GameBoard.java
index b7e20b8..d1181ad 100644
--- a/core/src/ch/asynk/zproject/Board.java
+++ b/core/src/ch/asynk/zproject/GameBoard.java
@@ -6,11 +6,11 @@ import com.badlogic.gdx.utils.Disposable;
import ch.asynk.zproject.engine.Touchable;
-public class Board implements Disposable, Touchable
+public class GameBoard implements Disposable, Touchable
{
private final Texture map;
- public Board(final Assets assets)
+ public GameBoard(final Assets assets)
{
this.map = assets.getTexture(assets.MAP_00);
}
@@ -22,7 +22,7 @@ public class Board implements Disposable, Touchable
@Override public boolean touch(float x, float y)
{
- ZProject.debug("Board", String.format("touchDown : %f %f", x, y));
+ ZProject.debug("GameBoard", String.format("touchDown : %f %f", x, y));
return true;
}
diff --git a/core/src/ch/asynk/zproject/Hud.java b/core/src/ch/asynk/zproject/GameHud.java
index fd74ade..25b349b 100644
--- a/core/src/ch/asynk/zproject/Hud.java
+++ b/core/src/ch/asynk/zproject/GameHud.java
@@ -13,7 +13,7 @@ import ch.asynk.zproject.engine.ui.Alignment;
import ch.asynk.zproject.engine.ui.Root;
import ch.asynk.zproject.engine.Touchable;
-public class Hud implements Disposable, Touchable
+public class GameHud implements Disposable, Touchable
{
private final Rectangle rect;
private final Sprite corner;
@@ -21,7 +21,7 @@ public class Hud implements Disposable, Touchable
private final Button hello;
private final Button next;
- public Hud(final Assets assets)
+ public GameHud(final Assets assets)
{
this.corner = new Sprite(assets.getTexture(assets.CORNER));
this.rect = new Rectangle(0, 0, 0 ,0);
@@ -48,7 +48,7 @@ public class Hud implements Disposable, Touchable
{
if (rect.contains(x, y)) {
if (root.touch(x, y)) {
- ZProject.debug("Hud", String.format("touchDown : %f %f", x, y));
+ ZProject.debug("GameHud", String.format("touchDown : %f %f", x, y));
return true;
}
}
diff --git a/core/src/ch/asynk/zproject/screens/GameScreen.java b/core/src/ch/asynk/zproject/screens/GameScreen.java
index 0fe6318..30e6b67 100644
--- a/core/src/ch/asynk/zproject/screens/GameScreen.java
+++ b/core/src/ch/asynk/zproject/screens/GameScreen.java
@@ -15,8 +15,8 @@ import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.Vector3;
import ch.asynk.zproject.ZProject;
-import ch.asynk.zproject.Hud;
-import ch.asynk.zproject.Board;
+import ch.asynk.zproject.GameHud;
+import ch.asynk.zproject.GameBoard;
public class GameScreen implements Screen
{
@@ -27,8 +27,8 @@ public class GameScreen implements Screen
private static final boolean DEBUG = true;
private final ZProject zproject;
- private final Hud hud;
- private final Board board;
+ private final GameHud hud;
+ private final GameBoard board;
private final GameCamera camera;
private final SpriteBatch batch;
private ShapeRenderer debugShapes = null;
@@ -44,8 +44,8 @@ public class GameScreen implements Screen
public GameScreen(final ZProject zproject)
{
this.zproject = zproject;
- this.hud = new Hud(zproject.assets);
- this.board = new Board(zproject.assets);
+ 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);
Gdx.input.setInputProcessor(getMultiplexer(this));