summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-09-24 23:55:28 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-09-24 23:55:28 +0200
commitb918156a9760a440b7eb2721a2ec43e854edce51 (patch)
tree4b2a4f85a28a634aae44311a52316391800acb8d
parente8a50d3fda9132df94b988494d0153ba5f17a9b1 (diff)
downloadRustAndDust-b918156a9760a440b7eb2721a2ec43e854edce51.zip
RustAndDust-b918156a9760a440b7eb2721a2ec43e854edce51.tar.gz
draw(Batch batch, float parentAlpha) -> draw(batch)
-rw-r--r--core/src/ch/asynk/tankontank/engine/Board.java8
-rw-r--r--core/src/ch/asynk/tankontank/engine/Pawn.java6
-rw-r--r--core/src/ch/asynk/tankontank/engine/Tile.java6
-rw-r--r--core/src/ch/asynk/tankontank/engine/gfx/BasicDrawable.java2
-rw-r--r--core/src/ch/asynk/tankontank/engine/gfx/StackedImages.java4
5 files changed, 13 insertions, 13 deletions
diff --git a/core/src/ch/asynk/tankontank/engine/Board.java b/core/src/ch/asynk/tankontank/engine/Board.java
index b5b993e..2cee905 100644
--- a/core/src/ch/asynk/tankontank/engine/Board.java
+++ b/core/src/ch/asynk/tankontank/engine/Board.java
@@ -171,9 +171,9 @@ public abstract class Board extends Image implements Disposable
}
@Override
- public void draw(Batch batch, float parentAlpha)
+ public void draw(Batch batch)
{
- super.draw(batch, parentAlpha);
+ super.draw(batch);
if (transform) {
prevTransform.set(batch.getTransformMatrix());
@@ -182,12 +182,12 @@ public abstract class Board extends Image implements Disposable
Iterator<Tile> tileIter = tilesToDraw.iterator();
while (tileIter.hasNext()) {
- tileIter.next().draw(batch, parentAlpha);
+ tileIter.next().draw(batch);
}
Iterator<Pawn> pawnIter = pawnsToDraw.iterator();
while (pawnIter.hasNext()) {
- pawnIter.next().draw(batch, parentAlpha);
+ pawnIter.next().draw(batch);
}
if (transform)
diff --git a/core/src/ch/asynk/tankontank/engine/Pawn.java b/core/src/ch/asynk/tankontank/engine/Pawn.java
index 695cadd..b0730f1 100644
--- a/core/src/ch/asynk/tankontank/engine/Pawn.java
+++ b/core/src/ch/asynk/tankontank/engine/Pawn.java
@@ -106,10 +106,10 @@ public abstract class Pawn extends Image implements Disposable
}
@Override
- public void draw(Batch batch, float parentAlpha)
+ public void draw(Batch batch)
{
- super.draw(batch, parentAlpha);
- if (overlays != null) overlays.draw(batch, parentAlpha);
+ super.draw(batch);
+ if (overlays != null) overlays.draw(batch);
}
@Override
diff --git a/core/src/ch/asynk/tankontank/engine/Tile.java b/core/src/ch/asynk/tankontank/engine/Tile.java
index 483dc62..9db279f 100644
--- a/core/src/ch/asynk/tankontank/engine/Tile.java
+++ b/core/src/ch/asynk/tankontank/engine/Tile.java
@@ -88,12 +88,12 @@ public abstract class Tile implements BasicDrawable
}
@Override
- public void draw(Batch batch, float parentAlpha)
+ public void draw(Batch batch)
{
- overlays.draw(batch, parentAlpha);
+ overlays.draw(batch);
Pawn pawn = getTopPawn();
if (pawn != null)
- pawn.draw(batch, parentAlpha);
+ pawn.draw(batch);
}
@Override
diff --git a/core/src/ch/asynk/tankontank/engine/gfx/BasicDrawable.java b/core/src/ch/asynk/tankontank/engine/gfx/BasicDrawable.java
index 776ac22..2e9b3a4 100644
--- a/core/src/ch/asynk/tankontank/engine/gfx/BasicDrawable.java
+++ b/core/src/ch/asynk/tankontank/engine/gfx/BasicDrawable.java
@@ -9,7 +9,7 @@ public interface BasicDrawable
public void setPosition(float x, float y, float r);
- public void draw(Batch batch, float parentAlpha);
+ public void draw(Batch batch);
public void drawDebug(ShapeRenderer debugShapes);
}
diff --git a/core/src/ch/asynk/tankontank/engine/gfx/StackedImages.java b/core/src/ch/asynk/tankontank/engine/gfx/StackedImages.java
index dc4e517..528786e 100644
--- a/core/src/ch/asynk/tankontank/engine/gfx/StackedImages.java
+++ b/core/src/ch/asynk/tankontank/engine/gfx/StackedImages.java
@@ -53,11 +53,11 @@ public class StackedImages implements BasicDrawable
}
@Override
- public void draw(Batch batch, float parentAlpha)
+ public void draw(Batch batch)
{
for (int i = 0; i < sprites.size; i++) {
if (enabled[i])
- sprites.get(i).draw(batch, parentAlpha);
+ sprites.get(i).draw(batch);
}
}