diff options
-rw-r--r-- | android/assets/images/1.png | bin | 1679 -> 0 bytes | |||
-rw-r--r-- | android/assets/images/2.png | bin | 1705 -> 0 bytes | |||
-rw-r--r-- | android/assets/images/3.png | bin | 2028 -> 0 bytes | |||
-rw-r--r-- | android/assets/images/4.png | bin | 2180 -> 0 bytes | |||
-rw-r--r-- | android/assets/images/5.png | bin | 2273 -> 0 bytes | |||
-rw-r--r-- | android/assets/images/6.png | bin | 2310 -> 0 bytes | |||
-rw-r--r-- | android/assets/images/dice.pack | 46 | ||||
-rw-r--r-- | android/assets/images/dice.png | bin | 0 -> 10986 bytes | |||
-rw-r--r-- | core/src/ch/asynk/tankontank/TankOnTank.java | 15 |
9 files changed, 49 insertions, 12 deletions
diff --git a/android/assets/images/1.png b/android/assets/images/1.png Binary files differdeleted file mode 100644 index 07f6ef5..0000000 --- a/android/assets/images/1.png +++ /dev/null diff --git a/android/assets/images/2.png b/android/assets/images/2.png Binary files differdeleted file mode 100644 index 6c44855..0000000 --- a/android/assets/images/2.png +++ /dev/null diff --git a/android/assets/images/3.png b/android/assets/images/3.png Binary files differdeleted file mode 100644 index ff18b63..0000000 --- a/android/assets/images/3.png +++ /dev/null diff --git a/android/assets/images/4.png b/android/assets/images/4.png Binary files differdeleted file mode 100644 index 6bb7562..0000000 --- a/android/assets/images/4.png +++ /dev/null diff --git a/android/assets/images/5.png b/android/assets/images/5.png Binary files differdeleted file mode 100644 index a4d7431..0000000 --- a/android/assets/images/5.png +++ /dev/null diff --git a/android/assets/images/6.png b/android/assets/images/6.png Binary files differdeleted file mode 100644 index 6da0dcd..0000000 --- a/android/assets/images/6.png +++ /dev/null diff --git a/android/assets/images/dice.pack b/android/assets/images/dice.pack new file mode 100644 index 0000000..0e8385a --- /dev/null +++ b/android/assets/images/dice.pack @@ -0,0 +1,46 @@ +dice.png +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +d1 + rotate: false + xy: 1, 1 + size: 30, 30 + orig: 30, 30 + offset: 0, 0 + index: 1 +d2 + rotate: false + xy: 31, 1 + size: 30, 30 + orig: 30, 30 + offset: 0, 0 + index: 2 +d3 + rotate: false + xy: 61, 1 + size: 30, 30 + orig: 30, 30 + offset: 0, 0 + index: 3 +d4 + rotate: false + xy: 1, 31 + size: 30, 30 + orig: 30, 30 + offset: 0, 0 + index: 4 +d5 + rotate: false + xy: 31, 31 + size: 30, 30 + orig: 30, 30 + offset: 0, 0 + index: 5 +d6 + rotate: false + xy: 61, 31 + size: 30, 30 + orig: 30, 30 + offset: 0, 0 + index: 6 diff --git a/android/assets/images/dice.png b/android/assets/images/dice.png Binary files differnew file mode 100644 index 0000000..0ce9454 --- /dev/null +++ b/android/assets/images/dice.png diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java index 18f2e16..f1958ce 100644 --- a/core/src/ch/asynk/tankontank/TankOnTank.java +++ b/core/src/ch/asynk/tankontank/TankOnTank.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Game; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.TextureAtlas; import ch.asynk.tankontank.screens.LoadScreen; @@ -27,15 +28,10 @@ public class TankOnTank extends Game Gdx.app.debug("TankOnTank", " load assets : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); manager.load("images/map_a.png", Texture.class); manager.load("images/map_b.png", Texture.class); + manager.load("images/dice.pack", TextureAtlas.class); manager.load("images/cup.jpg", Texture.class); manager.load("images/back.png", Texture.class); manager.load("images/small.png", Texture.class); - manager.load("images/1.png", Texture.class); - manager.load("images/2.png", Texture.class); - manager.load("images/3.png", Texture.class); - manager.load("images/4.png", Texture.class); - manager.load("images/5.png", Texture.class); - manager.load("images/6.png", Texture.class); manager.load("images/turn_back.png", Texture.class); manager.load("images/turn_front.png", Texture.class); manager.load("images/ace.png", Texture.class); @@ -65,15 +61,10 @@ public class TankOnTank extends Game Gdx.app.debug("TankOnTank", "unload assets : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); manager.unload("images/map_a.png"); manager.unload("images/map_b.png"); + manager.unload("images/dice.pack"); manager.unload("images/cup.jpg"); manager.unload("images/back.png"); manager.unload("images/small.png"); - manager.unload("images/1.png"); - manager.unload("images/2.png"); - manager.unload("images/3.png"); - manager.unload("images/4.png"); - manager.unload("images/5.png"); - manager.unload("images/6.png"); manager.unload("images/turn_back.png"); manager.unload("images/turn_front.png"); manager.unload("images/ace.png"); |