From 104872acbf8b2f5d894230127afe8494a15a2d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 9 Feb 2016 20:57:21 +0100 Subject: add ui/frame.9.png -> game.framePatch --- android/assets/data/ui.atlas | 9 +++++++++ android/assets/data/ui.png | Bin 132823 -> 138143 bytes assets/ui/frame.9.png | Bin 0 -> 4991 bytes core/src/ch/asynk/rustanddust/RustAndDust.java | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 assets/ui/frame.9.png diff --git a/android/assets/data/ui.atlas b/android/assets/data/ui.atlas index 08849b1..140d178 100644 --- a/android/assets/data/ui.atlas +++ b/android/assets/data/ui.atlas @@ -20,6 +20,15 @@ cancel orig: 64, 63 offset: 0, 0 index: -1 +frame + rotate: false + xy: 928, 106 + size: 48, 48 + split: 23, 23, 23, 23 + pad: 11, 11, 12, 12 + orig: 48, 48 + offset: 0, 0 + index: -1 from rotate: false xy: 2, 2 diff --git a/android/assets/data/ui.png b/android/assets/data/ui.png index 515d6b1..9eb3e05 100644 Binary files a/android/assets/data/ui.png and b/android/assets/data/ui.png differ diff --git a/assets/ui/frame.9.png b/assets/ui/frame.9.png new file mode 100644 index 0000000..855c3b3 Binary files /dev/null and b/assets/ui/frame.9.png differ diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java index 161ba81..a02974b 100644 --- a/core/src/ch/asynk/rustanddust/RustAndDust.java +++ b/core/src/ch/asynk/rustanddust/RustAndDust.java @@ -24,6 +24,7 @@ import ch.asynk.rustanddust.ui.Bg; public class RustAndDust extends Game { public static final String BG_PATCH = "bg"; + public static final String FRAME_PATCH = "frame"; public static final String TTF_FONT = "skin/veteran-typewriter.ttf"; public static final String ATLAS_UI = "data/ui.atlas"; public static final String ATLAS_HUD = "data/hud.atlas"; @@ -71,6 +72,7 @@ public class RustAndDust extends Game public TextureAtlas uiAtlas; public BitmapFont font; public NinePatch bgPatch; + public NinePatch framePatch; public enum State { @@ -215,6 +217,7 @@ public class RustAndDust extends Game parameter.color = Color.BLACK; font = generator.generateFont(parameter); bgPatch = uiAtlas.createPatch(BG_PATCH); + framePatch = uiAtlas.createPatch(FRAME_PATCH); } private void unloadUiAssets() -- cgit v1.1-2-g2b99