summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/gdx/boardgame/Orientation.java2
-rw-r--r--core/src/ch/asynk/gdx/boardgame/Piece.java6
-rw-r--r--core/src/ch/asynk/gdx/boardgame/Tile.java14
3 files changed, 13 insertions, 9 deletions
diff --git a/core/src/ch/asynk/gdx/boardgame/Orientation.java b/core/src/ch/asynk/gdx/boardgame/Orientation.java
index 8450dff..2d24603 100644
--- a/core/src/ch/asynk/gdx/boardgame/Orientation.java
+++ b/core/src/ch/asynk/gdx/boardgame/Orientation.java
@@ -102,6 +102,6 @@ public enum Orientation
public static Orientation fromTiles(Tile from, Tile to)
{
- return fromR(MathUtils.atan2((to.y - from.y), (to.x - from.x)) * MathUtils.radiansToDegrees);
+ return fromR(MathUtils.atan2((to.cy - from.cy), (to.cx - from.cx)) * MathUtils.radiansToDegrees);
}
}
diff --git a/core/src/ch/asynk/gdx/boardgame/Piece.java b/core/src/ch/asynk/gdx/boardgame/Piece.java
index 6d2bf52..b08970c 100644
--- a/core/src/ch/asynk/gdx/boardgame/Piece.java
+++ b/core/src/ch/asynk/gdx/boardgame/Piece.java
@@ -36,7 +36,7 @@ public class Piece implements Drawable, Positionable, Rotable, Scalable
public void getPosOn(Tile tile, Orientation orientation, Vector3 v)
{
- v.set((tile.x - (getWidth() / 2f)), (tile.y - (getHeight() / 2f)), orientation.r());
+ v.set((tile.cx - (getWidth() / 2f)), (tile.cy - (getHeight() / 2f)), orientation.r());
}
public void setPosition(float x, float y, float r)
@@ -55,8 +55,8 @@ public class Piece implements Drawable, Positionable, Rotable, Scalable
public boolean isOn(Tile tile)
{
return (
- (Math.abs(getX() - (tile.x - (getWidth() / 2f))) < 3) &&
- (Math.abs(getY() - (tile.y - (getHeight() / 2f))) < 3)
+ (Math.abs(getX() - (tile.cx - (getWidth() / 2f))) < 3) &&
+ (Math.abs(getY() - (tile.cy - (getHeight() / 2f))) < 3)
);
}
diff --git a/core/src/ch/asynk/gdx/boardgame/Tile.java b/core/src/ch/asynk/gdx/boardgame/Tile.java
index 454f839..504a82d 100644
--- a/core/src/ch/asynk/gdx/boardgame/Tile.java
+++ b/core/src/ch/asynk/gdx/boardgame/Tile.java
@@ -10,14 +10,18 @@ public class Tile implements Drawable
{
public static TextureAtlas defaultOverlay = null;
- public float x;
- public float y;
+ public int x;
+ public int y;
+ public float cx;
+ public float cy;
private Overlays overlays;
- public Tile(float x, float y)
+ public Tile(int x, int y, float cx, float cy)
{
this.x = x;
this.y = y;
+ this.cx = cx;
+ this.cy = cy;
if (defaultOverlay != null) {
setOverlay(defaultOverlay);
}
@@ -34,7 +38,7 @@ public class Tile implements Drawable
public void setOverlay(TextureAtlas textureAtlas)
{
this.overlays = new Overlays(textureAtlas);
- this.overlays.centerOn(x, y);
+ this.overlays.centerOn(cx, cy);
}
public void enableOverlay(int i, boolean enable)
@@ -54,7 +58,7 @@ public class Tile implements Drawable
@Override public String toString()
{
- return "[" + x + ", " + y + "]";
+ return "[" + x + ", " + y + "] => [" + cx + "," + cy + "]";
}
@Override public void draw(Batch batch)