X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fmisc%2FAssets.java;h=93a5f86ea4a9509bfcd40f09f240db06a05ccb64;hb=0ed259db50b9cab761cd5dca5cb229e69886854b;hp=30c346b32e7d9fe835e557370cb9e9fa5b51b9c5;hpb=59d07dd8a43cfb159045e6313cca4d519f67a6fc;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
index 30c346b..93a5f86 100644
--- a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
@@ -15,58 +15,62 @@ import java.util.HashMap;
 
 public class Assets {
 
-    public static JsonReader jsonReader = new JsonReader();
-    public static Sprite[][] playerSprite = new Sprite[2][4];
-    public static HashMap<String, TextureRegion> textureRegions = new HashMap<>();
-    public static ArrayMap<String, Rectangle> guiMap = new ArrayMap<>();
-    public static Sprite[][] pigSprite = new Sprite[2][2];
-    static BitmapFont minecraftFont;
-    private static GlyphLayout glyphLayout = new GlyphLayout();
+    public static final JsonReader jsonReader = new JsonReader();
+
+    private static final GlyphLayout glyphLayout = new GlyphLayout();
+    static final BitmapFont minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true);
+
+    public static final Sprite[][] playerSprite = new Sprite[2][4];
+    public static final Sprite[][] pigSprite = new Sprite[2][2];
+    public static final HashMap<String, TextureRegion> textureRegions = new HashMap<>();
+    public static final ArrayMap<String, Rectangle> guiMap = new ArrayMap<>();
+    public static final Sprite sandSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/sand.png"))));
+    public static final Sprite gravelSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/gravel.png"))));
 
     private static TextureRegion flippedRegion(Texture texture, int x, int y, int width, int height) {
         return new TextureRegion(texture, x, y + height, width, -height);
     }
 
+    private static Sprite flippedSprite(Texture texture) {
+        Sprite sprite = new Sprite(texture);
+        sprite.flip(false, true);
+        return sprite;
+    }
+
+    private static Sprite flippedSprite(TextureRegion texture) {
+        Sprite sprite = new Sprite(texture);
+        sprite.flip(false, true);
+        return sprite;
+    }
+
     private static void loadPlayer() {
         Texture plTex = new Texture(Gdx.files.internal("mobs/char.png"));
         //LOOK TO LEFT
         //head
-        playerSprite[0][0] = new Sprite(new TextureRegion(plTex, 0, 0, 12, 12));
-        playerSprite[0][0].flip(false, true);
+        playerSprite[0][0] = flippedSprite(new TextureRegion(plTex, 0, 0, 12, 12));
         //body
-        playerSprite[0][1] = new Sprite(new TextureRegion(plTex, 0, 13, 12, 12));
-        playerSprite[0][1].flip(false, true);
+        playerSprite[0][1] = flippedSprite(new TextureRegion(plTex, 0, 13, 12, 12));
         //hand
-        playerSprite[0][2] = new Sprite(new TextureRegion(plTex, 25, 5, 20, 20));
-        playerSprite[0][2].flip(false, true);
+        playerSprite[0][2] = flippedSprite(new TextureRegion(plTex, 25, 5, 20, 20));
         //leg
-        playerSprite[0][3] = new Sprite(new TextureRegion(plTex, 25, 27, 20, 20));
-        playerSprite[0][3].flip(false, true);
+        playerSprite[0][3] = flippedSprite(new TextureRegion(plTex, 25, 27, 20, 20));
         //LOOK TO RIGHT
         //head
-        playerSprite[1][0] = new Sprite(new TextureRegion(plTex, 13, 0, 12, 12));
-        playerSprite[1][0].flip(false, true);
+        playerSprite[1][0] = flippedSprite(new TextureRegion(plTex, 13, 0, 12, 12));
         //body
-        playerSprite[1][1] = new Sprite(new TextureRegion(plTex, 13, 13, 12, 12));
-        playerSprite[1][1].flip(false, true);
+        playerSprite[1][1] = flippedSprite(new TextureRegion(plTex, 13, 13, 12, 12));
         //hand
-        playerSprite[1][2] = new Sprite(new TextureRegion(plTex, 37, 5, 20, 20));
-        playerSprite[1][2].flip(false, true);
+        playerSprite[1][2] = flippedSprite(new TextureRegion(plTex, 37, 5, 20, 20));
         //leg
-        playerSprite[1][3] = new Sprite(new TextureRegion(plTex, 37, 27, 20, 20));
-        playerSprite[1][3].flip(false, true);
+        playerSprite[1][3] = flippedSprite(new TextureRegion(plTex, 37, 27, 20, 20));
     }
 
     private static void loadPig() {
         Texture pigTex = new Texture(Gdx.files.internal("mobs/pig.png"));
-        pigSprite[0][0] = new Sprite(new TextureRegion(pigTex, 0, 0, 25, 12));
-        pigSprite[0][0].flip(false, true);
-        pigSprite[1][0] = new Sprite(new TextureRegion(pigTex, 0, 12, 25, 12));
-        pigSprite[1][0].flip(false, true);
-        pigSprite[0][1] = new Sprite(new TextureRegion(pigTex, 4, 26, 12, 12));
-        pigSprite[0][1].flip(false, true);
-        pigSprite[1][1] = new Sprite(new TextureRegion(pigTex, 16, 26, 12, 12));
-        pigSprite[1][1].flip(false, true);
+        pigSprite[0][0] = flippedSprite(new TextureRegion(pigTex, 0, 0, 25, 12));
+        pigSprite[1][0] = flippedSprite(new TextureRegion(pigTex, 0, 12, 25, 12));
+        pigSprite[0][1] = flippedSprite(new TextureRegion(pigTex, 4, 26, 12, 12));
+        pigSprite[1][1] = flippedSprite(new TextureRegion(pigTex, 16, 26, 12, 12));
     }
 
     /**
@@ -74,21 +78,24 @@ public class Assets {
      * and puts to {@link #textureRegions} HashMap
      */
     private static void loadJSON() {
-        JsonValue json = Assets.jsonReader.parse(Gdx.files.internal("json/texture_regions.json"));
+        JsonValue json = jsonReader.parse(Gdx.files.internal("json/texture_regions.json"));
         for (JsonValue file = json.child(); file != null; file = file.next()) {
             Texture texture = new Texture(Gdx.files.internal(file.name() + ".png"));
-            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();
-                textureRegions.put(key.name(), flippedRegion(texture, x, y, w, h));
+            if (file.size == 0) {
+                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 = 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));
+                }
             }
         }
     }
 
     public static void load() {
-        minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true);
         minecraftFont.getData().setScale(.375f);
         loadPlayer();
         loadPig();
@@ -113,4 +120,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;
+    }
+
 }