X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fmisc%2FAssets.java;h=0dd1cf7673063a33a8f89af113f6f460c9a48fb4;hb=32861e6c418fda80f5f0063ba235ed6e1c80ba27;hp=e2abcdfd61ceb82dfe547dfeffe9a23243f396d0;hpb=ef32f2e88b9c0daa411d0c304ce62b1235541fb1;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
index e2abcdf..0dd1cf7 100644
--- a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
@@ -10,6 +10,7 @@ import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.utils.ArrayMap;
 import com.badlogic.gdx.utils.JsonReader;
 import com.badlogic.gdx.utils.JsonValue;
+import ru.deadsoftware.cavedroid.game.objects.TouchButton;
 
 import java.util.HashMap;
 
@@ -18,15 +19,14 @@ public class Assets {
     public static final JsonReader jsonReader = new JsonReader();
 
     private static final GlyphLayout glyphLayout = new GlyphLayout();
-
     static BitmapFont minecraftFont;
 
     public static final Sprite[][] playerSprite = new Sprite[2][4];
     public static final Sprite[][] pigSprite = new Sprite[2][2];
-    public static Sprite fallingSandSprite;
-    public static Sprite fallingGravelSprite;
     public static final HashMap<String, TextureRegion> textureRegions = new HashMap<>();
-    public static final ArrayMap<String, Rectangle> guiMap = new ArrayMap<>();
+    public static final ArrayMap<String, TouchButton> guiMap = new ArrayMap<>();
+    public static Sprite sandSprite;
+    public static Sprite gravelSprite;
 
     private static TextureRegion flippedRegion(Texture texture, int x, int y, int width, int height) {
         return new TextureRegion(texture, x, y + height, width, -height);
@@ -74,11 +74,6 @@ public class Assets {
         pigSprite[1][1] = flippedSprite(new TextureRegion(pigTex, 16, 26, 12, 12));
     }
 
-    private static void loadFallingBlocks() {
-        fallingSandSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/sand.png"))));
-        fallingGravelSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/gravel.png"))));
-    }
-
     /**
      * Loads texture names and sizes from <b>json/texture_regions.json</b>, cuts them to TextureRegions
      * and puts to {@link #textureRegions} HashMap
@@ -91,10 +86,10 @@ public class Assets {
                 textureRegions.put(file.name(), flippedRegion(texture, 0, 0, texture.getWidth(), texture.getHeight()));
             } else {
                 for (JsonValue key = file.child(); key != null; key = key.next()) {
-                    int x = key.has("x") ? key.getInt("x") : 0;
-                    int y = key.has("y") ? key.getInt("y") : 0;
-                    int w = key.has("w") ? key.getInt("w") : texture.getWidth();
-                    int h = key.has("h") ? key.getInt("h") : texture.getHeight();
+                    int x = getIntFromJson(key, "x", 0);
+                    int y = getIntFromJson(key, "y", 0);
+                    int w = getIntFromJson(key, "w", texture.getWidth());
+                    int h = getIntFromJson(key, "h", texture.getHeight());
                     textureRegions.put(key.name(), flippedRegion(texture, x, y, w, h));
                 }
             }
@@ -102,12 +97,13 @@ public class Assets {
     }
 
     public static void load() {
-        minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true);
-        minecraftFont.getData().setScale(.375f);
         loadPlayer();
         loadPig();
-        loadFallingBlocks();
         loadJSON();
+        minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true);
+        minecraftFont.getData().setScale(.375f);
+        sandSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/sand.png"))));
+        gravelSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/gravel.png"))));
     }
 
     /**
@@ -128,4 +124,16 @@ public class Assets {
         return (int) glyphLayout.height;
     }
 
+    public static int getIntFromJson(JsonValue json, String name, int defaultValue) {
+        return json.has(name) ? json.getInt(name) : defaultValue;
+    }
+
+    public static String getStringFromJson(JsonValue json, String name, String defaultValue) {
+        return json.has(name) ? json.getString(name) : defaultValue;
+    }
+
+    public static boolean getBooleanFromJson(JsonValue json, String name, boolean defaultValue) {
+        return json.has(name) ? json.getBoolean(name) : defaultValue;
+    }
+
 }