MapImage->MapNode, PawnImage->PawnNode, add Layer

1 files changed, 0 insertions, 167 deletions

diff --git a/core/src/ch/asynk/tankontank/engine/MapImage.java b/core/src/ch/asynk/tankontank/engine/MapImage.java
deleted file mode 100644
index 2b80974..0000000
--- a/core/src/ch/asynk/tankontank/engine/MapImage.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package ch.asynk.tankontank.engine;
-
-import com.badlogic.gdx.Gdx;
-
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.scenes.scene2d.ui.Image;
-
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.math.Vector3;
-import com.badlogic.gdx.math.GridPoint2;
-
-public class MapImage extends Image implements Map
-{
-    private Map.Config cfg;
-    private int cols;
-    private int rows;
-    private Tile[][] board;
-
-    @SuppressWarnings("unchecked")
-    public MapImage(Map.Config cfg, Tile[][] board, Texture texture)
-    {
-        super(texture);
-        this.cfg = cfg;
-        this.board = board;
-        this.cols = cfg.cols - 1;
-        this.rows = cfg.rows - 1;
-    }
-
-    public Pawn getTopPawnAt(GridPoint2 cell)
-    {
-        return getTopPawnAt(cell.x, cell.y);
-    }
-
-    private Pawn getTopPawnAt(int col, int row)
-    {
-        // if ((col < 0) || (row < 0)) throw new ();
-        return board[row][col].getTop();
-    }
-
-    private int pushPawnAt(Pawn pawn, int col, int row)
-    {
-        // if ((col < 0) || (row < 0)) throw new ();
-        return board[row][col].push(pawn);
-    }
-
-    private void removePawnFrom(Pawn pawn, int col, int row)
-    {
-        // if ((col < 0) || (row < 0)) throw new ();
-        board[row][col].remove(pawn);
-    }
-
-    public Vector2 getHexCenterAt(GridPoint2 cell)
-    {
-        float x = cfg.x0 + ((cell.x * cfg.w) + (cfg.w / 2));
-        float y = cfg.y0 + ((cell.y * cfg.h) + (cfg.s / 2));
-        if ((cell.y % 2) == 1) x += cfg.dw;
-        return new Vector2(x, y);
-    }
-
-    public Vector2 getPawnPosAt(Pawn pawn, GridPoint2 cell)
-    {
-        return getPawnPosAt(pawn, cell.x, cell.y);
-    }
-
-    private Vector2 getPawnPosAt(Pawn pawn, int col, int row)
-    {
-        float x = cfg.x0 + ((col * cfg.w) + ((cfg.w - pawn.getHeight()) / 2));
-        float y = cfg.y0 + ((row * cfg.h) + ((cfg.s - pawn.getWidth()) / 2));
-        if ((row % 2) == 1) x += cfg.dw;
-        return new Vector2(x, y);
-    }
-
-    public void movePawnTo(Pawn pawn, Vector3 coords)
-    {
-        GridPoint2 p = getHexAt(null, coords.x, coords.y);
-        movePawnTo(pawn, p.x, p.y, Pawn.Orientation.KEEP);
-    }
-
-    public void setPawnAt(final Pawn pawn, final int col, final int row, Pawn.Orientation o)
-    {
-        int z = pushPawnAt(pawn, col, row);
-        Vector2 pos = getPawnPosAt(pawn, col, row);
-        pawn.pushMove(pos.x, pos.y, z, o);
-    }
-
-    public void movePawnTo(final Pawn pawn, final int col, final int row, Pawn.Orientation o)
-    {
-        GridPoint2 prev = getHexAt(pawn.getLastPosition());
-        // if (prev == null) throw new ();
-        removePawnFrom(pawn, prev.x, prev.y);
-
-        if ((col < 0) || (row < 0)) {
-            pawn.resetMoves(new Runnable() {
-                @Override
-                public void run() {
-                    GridPoint2 hex = getHexAt(pawn.getLastPosition());
-                    pawn.setZIndex(pushPawnAt(pawn, hex.x, hex.y));
-                }
-            });
-            return;
-        } else {
-            int z = pushPawnAt(pawn, col, row);
-            Vector2 pos = getPawnPosAt(pawn, col, row);
-            pawn.pushMove(pos.x, pos.y, z, o);
-        }
-    }
-
-    private GridPoint2 getHexAt(Vector3 v)
-    {
-        if (v == null) return null;
-        return getHexAt(null, v.x, v.y);
-    }
-
-    public GridPoint2 getHexAt(GridPoint2 hex, float cx, float cy)
-    {
-        if (hex == null) hex = new GridPoint2();
-
-        // compute row
-        int row;
-        boolean oddRow = true;
-        float y = (cy - cfg.y0);
-        if (y < 0.f) {
-            row = -1;
-        } else {
-            row = (int) (y / cfg.h);
-            oddRow = ((row % 2) == 1);
-        }
-
-        // compute col
-        int col;
-        float x = (cx - cfg.x0);
-        if (oddRow) x -= cfg.dw;
-        if (x < 0.f) {
-            col = -1;
-        } else {
-            col = (int) (x / cfg.w);
-        }
-
-        // check upper boundaries
-        float dy = (y - (row * cfg.h));
-        if (dy > cfg.s) {
-            dy -= cfg.s;
-            float dx = (x - (col * cfg.w));
-            if (dx < cfg.dw) {
-                if ((dx * cfg.slope) < dy) {
-                    row += 1;
-                    if (!oddRow) col -= 1;
-                    oddRow = !oddRow;
-                }
-            } else {
-                if (((cfg.w - dx) * cfg.slope) < dy) {
-                    row += 1;
-                    if (oddRow) col += 1;
-                    oddRow = !oddRow;
-                }
-            }
-        }
-
-        // validate hex
-        if ((col < 0) || (row < 0) || (row > rows) || (col > cols) || (oddRow && ((col +1)> cols)))
-            hex.set(-1, -1);
-        else
-            hex.set(col, row);
-
-        return hex;
-    }
-}