summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/src/ch/asynk/gdx/boardgame/test/AnimationsScreen.java8
-rw-r--r--test/src/ch/asynk/gdx/boardgame/test/Assets.java6
-rw-r--r--test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java2
-rw-r--r--test/src/ch/asynk/gdx/boardgame/test/Panzer.java13
-rw-r--r--test/src/ch/asynk/gdx/boardgame/test/Sherman.java13
5 files changed, 21 insertions, 21 deletions
diff --git a/test/src/ch/asynk/gdx/boardgame/test/AnimationsScreen.java b/test/src/ch/asynk/gdx/boardgame/test/AnimationsScreen.java
index 7c79058..9871b35 100644
--- a/test/src/ch/asynk/gdx/boardgame/test/AnimationsScreen.java
+++ b/test/src/ch/asynk/gdx/boardgame/test/AnimationsScreen.java
@@ -31,7 +31,7 @@ public class AnimationsScreen extends AbstractScreen
private State state;
private final Texture map;
- private final Sherman sherman;
+ private final Panzer panzer;
private final Camera cam;
private final Board board;
private Animation animation;
@@ -44,10 +44,10 @@ public class AnimationsScreen extends AbstractScreen
this.board = BoardFactory.getBoard(BoardFactory.BoardType.HEX, 110, 50, 103, BoardFactory.BoardOrientation.VERTICAL);
this.camera = this.cam = new Camera(10, map.getWidth(), map.getHeight(), 1.0f, 0.3f, false);
- this.sherman = new Sherman(app);
+ this.panzer = new Panzer(app);
Vector2 v = new Vector2();
this.board.centerOf(7, 4, v);
- this.sherman.setPosition(v.x - (sherman.getWidth() / 2), v.y - (sherman.getHeight() / 2));
+ this.panzer.setPosition(v.x - (panzer.getWidth() / 2), v.y - (panzer.getHeight() / 2));
cam.zoom(-0.3f);
cam.centerOnWorld();
@@ -58,7 +58,7 @@ public class AnimationsScreen extends AbstractScreen
{
switch (state) {
case BOUNCE:
- animation = BounceAnimation.get(sherman, 2f, 3f);
+ animation = BounceAnimation.get(panzer, 2f, 3f);
case DONE:
app.switchToMenu();
}
diff --git a/test/src/ch/asynk/gdx/boardgame/test/Assets.java b/test/src/ch/asynk/gdx/boardgame/test/Assets.java
index 0c8ba5c..c976006 100644
--- a/test/src/ch/asynk/gdx/boardgame/test/Assets.java
+++ b/test/src/ch/asynk/gdx/boardgame/test/Assets.java
@@ -22,7 +22,7 @@ public class Assets extends ch.asynk.gdx.boardgame.Assets
public static final String FONT_20 = "size20.ttf";
public static final String FONT_25 = "size25.ttf";
public static final String PATCH = "ui-patch.png";
- public static final String SHERMAN = "sherman.png";
+ public static final String PANZER = "panzer.png";
private final FreeTypeFontLoaderParameter params20;
private final FreeTypeFontLoaderParameter params25;
@@ -65,7 +65,7 @@ public class Assets extends ch.asynk.gdx.boardgame.Assets
load(TRI, Texture.class);
load(CORNER, Texture.class);
load(PATCH, Texture.class);
- load(SHERMAN, Texture.class);
+ load(PANZER, Texture.class);
load(FONT_20, BitmapFont.class, params20);
load(FONT_25, BitmapFont.class, params25);
}
@@ -77,7 +77,7 @@ public class Assets extends ch.asynk.gdx.boardgame.Assets
unload(TRI);
unload(CORNER);
unload(PATCH);
- unload(SHERMAN);
+ unload(PANZER);
unload(FONT_20);
unload(FONT_25);
}
diff --git a/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java b/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java
index afa6b45..017cd44 100644
--- a/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java
+++ b/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java
@@ -31,7 +31,7 @@ public class BoardScreen extends AbstractScreen
public MyBoard(final Assets assets)
{
this.assets = assets;
- this.sherman = assets.getTexture(assets.SHERMAN);
+ this.sherman = assets.getTexture(assets.PANZER);
this.v = new Vector2();
}
diff --git a/test/src/ch/asynk/gdx/boardgame/test/Panzer.java b/test/src/ch/asynk/gdx/boardgame/test/Panzer.java
new file mode 100644
index 0000000..b24a942
--- /dev/null
+++ b/test/src/ch/asynk/gdx/boardgame/test/Panzer.java
@@ -0,0 +1,13 @@
+package ch.asynk.gdx.boardgame.test;
+
+import com.badlogic.gdx.graphics.g2d.Sprite;
+
+import ch.asynk.gdx.boardgame.Scalable;
+
+public class Panzer extends Sprite implements Scalable
+{
+ public Panzer(final GdxBoardTest app)
+ {
+ super(app.assets.getTexture(app.assets.PANZER));
+ }
+}
diff --git a/test/src/ch/asynk/gdx/boardgame/test/Sherman.java b/test/src/ch/asynk/gdx/boardgame/test/Sherman.java
deleted file mode 100644
index 2600f9d..0000000
--- a/test/src/ch/asynk/gdx/boardgame/test/Sherman.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ch.asynk.gdx.boardgame.test;
-
-import com.badlogic.gdx.graphics.g2d.Sprite;
-
-import ch.asynk.gdx.boardgame.Scalable;
-
-public class Sherman extends Sprite implements Scalable
-{
- public Sherman(final GdxBoardTest app)
- {
- super(app.assets.getTexture(app.assets.SHERMAN));
- }
-}