From 2850bbff24c435eb133e6b8d68a391db97e6a9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Sun, 21 Sep 2014 02:06:28 +0200
Subject: SpriteNode -> Image does not implements Node anymore

---
 core/src/ch/asynk/tankontank/engine/PawnNode.java  |  4 +-
 core/src/ch/asynk/tankontank/engine/gfx/Image.java | 43 ++++++++++++++++++++++
 .../ch/asynk/tankontank/engine/gfx/SpriteNode.java | 42 ---------------------
 3 files changed, 45 insertions(+), 44 deletions(-)
 create mode 100644 core/src/ch/asynk/tankontank/engine/gfx/Image.java
 delete mode 100644 core/src/ch/asynk/tankontank/engine/gfx/SpriteNode.java

diff --git a/core/src/ch/asynk/tankontank/engine/PawnNode.java b/core/src/ch/asynk/tankontank/engine/PawnNode.java
index 600c6dd..e095042 100644
--- a/core/src/ch/asynk/tankontank/engine/PawnNode.java
+++ b/core/src/ch/asynk/tankontank/engine/PawnNode.java
@@ -6,12 +6,12 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
 
 import com.badlogic.gdx.math.Vector3;
 
-import ch.asynk.tankontank.engine.gfx.SpriteNode;
+import ch.asynk.tankontank.engine.gfx.Image;
 import ch.asynk.tankontank.engine.gfx.animations.MoveToAnimation;
 import ch.asynk.tankontank.engine.gfx.animations.RunnableAnimation;
 import ch.asynk.tankontank.engine.gfx.animations.AnimationSequence;
 
-public class PawnNode extends SpriteNode implements Pawn
+public class PawnNode extends Image implements Pawn
 {
     private static final float MOVE_TIME = 0.3f;
 
diff --git a/core/src/ch/asynk/tankontank/engine/gfx/Image.java b/core/src/ch/asynk/tankontank/engine/gfx/Image.java
new file mode 100644
index 0000000..00a7927
--- /dev/null
+++ b/core/src/ch/asynk/tankontank/engine/gfx/Image.java
@@ -0,0 +1,43 @@
+package ch.asynk.tankontank.engine.gfx;
+
+import com.badlogic.gdx.utils.Disposable;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.graphics.g2d.Sprite;
+import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
+
+public abstract class Image extends Sprite implements Drawable, Disposable
+{
+    private Texture texture;
+
+    public Image(Texture texture)
+    {
+        super(texture);
+        this.texture = texture;
+    }
+
+    public Image(TextureRegion region)
+    {
+        super(region);
+        this.texture = null;
+    }
+
+    @Override
+    public void dispose()
+    {
+        if (texture != null) texture.dispose();
+    }
+
+    @Override
+    public void setPosition(float x, float y, float r)
+    {
+        setPosition(x, y);
+        setRotation(r);
+    }
+
+    @Override
+    public void drawDebug(ShapeRenderer shapes)
+    {
+        shapes.rect(getX(), getY(), (getWidth() / 2f), (getHeight() / 2f), getWidth(), getHeight(), getScaleX(), getScaleY(), getRotation());
+    }
+}
diff --git a/core/src/ch/asynk/tankontank/engine/gfx/SpriteNode.java b/core/src/ch/asynk/tankontank/engine/gfx/SpriteNode.java
deleted file mode 100644
index dd1c648..0000000
--- a/core/src/ch/asynk/tankontank/engine/gfx/SpriteNode.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package ch.asynk.tankontank.engine.gfx;
-
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.graphics.g2d.Sprite;
-import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-
-public abstract class SpriteNode extends Sprite implements Node
-{
-    private Texture texture;
-
-    public SpriteNode(Texture texture)
-    {
-        super(texture);
-        this.texture = texture;
-    }
-
-    public SpriteNode(TextureRegion region)
-    {
-        super(region);
-        this.texture = null;
-    }
-
-    @Override
-    public void dispose()
-    {
-        if (texture != null) texture.dispose();
-    }
-
-    @Override
-    public void setPosition(float x, float y, float r)
-    {
-        setPosition(x, y);
-        setRotation(r);
-    }
-
-    @Override
-    public void drawDebug(ShapeRenderer shapes)
-    {
-        shapes.rect(getX(), getY(), (getWidth() / 2f), (getHeight() / 2f), getWidth(), getHeight(), getScaleX(), getScaleY(), getRotation());
-    }
-}
-- 
cgit v1.1-2-g2b99