Make separate textures for mob limbs #8

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / misc / Assets.java

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
index 944dec0cac70dd82b77d5c9a6d2f782b9e64f81b..335e3c0d2239a450908f325c3b94dbaa38982143 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
@@ -6,26 +6,22 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-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;
 
 public class Assets {
 
     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"))));
+    public static final ArrayMap<String, TouchButton> guiMap = new ArrayMap<>();
+    private static final GlyphLayout glyphLayout = new GlyphLayout();
+    static BitmapFont minecraftFont;
 
     private static TextureRegion flippedRegion(Texture texture, int x, int y, int width, int height) {
         return new TextureRegion(texture, x, y + height, width, -height);
@@ -43,34 +39,14 @@ public class Assets {
         return sprite;
     }
 
-    private static void loadPlayer() {
-        Texture plTex = new Texture(Gdx.files.internal("mobs/char.png"));
-        //LOOK TO LEFT
-        //head
-        playerSprite[0][0] = flippedSprite(new TextureRegion(plTex, 0, 0, 12, 12));
-        //body
-        playerSprite[0][1] = flippedSprite(new TextureRegion(plTex, 0, 13, 12, 12));
-        //hand
-        playerSprite[0][2] = flippedSprite(new TextureRegion(plTex, 25, 5, 20, 20));
-        //leg
-        playerSprite[0][3] = flippedSprite(new TextureRegion(plTex, 25, 27, 20, 20));
-        //LOOK TO RIGHT
-        //head
-        playerSprite[1][0] = flippedSprite(new TextureRegion(plTex, 13, 0, 12, 12));
-        //body
-        playerSprite[1][1] = flippedSprite(new TextureRegion(plTex, 13, 13, 12, 12));
-        //hand
-        playerSprite[1][2] = flippedSprite(new TextureRegion(plTex, 37, 5, 20, 20));
-        //leg
-        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] = 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));
+    private static void loadMob(Sprite[][] sprite, String mob) {
+        for (int i = 0; i < sprite.length; i++) {
+            for (int j = 0; j < sprite[i].length; j++) {
+                sprite[i][j] = flippedSprite(new Texture(
+                        Gdx.files.internal("mobs/" + mob + "/" + i + "_" + j + ".png")));
+                sprite[i][j].setOrigin(sprite[i][j].getWidth() / 2, 0);
+            }
+        }
     }
 
     /**
@@ -82,7 +58,8 @@ public class Assets {
         for (JsonValue file = json.child(); file != null; file = file.next()) {
             Texture texture = new Texture(Gdx.files.internal(file.name() + ".png"));
             if (file.size == 0) {
-                textureRegions.put(file.name(), flippedRegion(texture, 0, 0, texture.getWidth(), texture.getHeight()));
+                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);
@@ -96,10 +73,11 @@ public class Assets {
     }
 
     public static void load() {
-        minecraftFont.getData().setScale(.375f);
-        loadPlayer();
-        loadPig();
+        loadMob(playerSprite, "char");
+        loadMob(pigSprite, "pig");
         loadJSON();
+        minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true);
+        minecraftFont.getData().setScale(.375f);
     }
 
     /**