X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fmisc%2FAssets.java;h=335e3c0d2239a450908f325c3b94dbaa38982143;hb=9512f90f754ac74780592783b1e241eeca21a249;hp=778a44d78fcae10d20957c173edd5946a28d8a6a;hpb=44bd000cd15bf9713453a279840e133416fea998;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java index 778a44d..335e3c0 100644 --- a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java +++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java @@ -6,28 +6,23 @@ 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 JsonReader jsonReader = new JsonReader(); - - private static GlyphLayout glyphLayout = new GlyphLayout(); - + public static final JsonReader jsonReader = new JsonReader(); + public static final Sprite[][] playerSprite = new Sprite[2][4]; + public static final Sprite[][] pigSprite = new Sprite[2][2]; + public static final HashMap textureRegions = new HashMap<>(); + public static final ArrayMap guiMap = new ArrayMap<>(); + private static final GlyphLayout glyphLayout = new GlyphLayout(); static BitmapFont minecraftFont; - public static Sprite[][] playerSprite = new Sprite[2][4]; - public static Sprite[][] pigSprite = new Sprite[2][2]; - public static Sprite fallingSandSprite; - public static Sprite fallingGravelSprite; - public static HashMap textureRegions = new HashMap<>(); - public static ArrayMap guiMap = new ArrayMap<>(); - private static TextureRegion flippedRegion(Texture texture, int x, int y, int width, int height) { return new TextureRegion(texture, x, y + height, width, -height); } @@ -44,39 +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 loadFallingBlocks() { - fallingSandSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/sand.png")))); - fallingGravelSprite = flippedSprite(new Texture((Gdx.files.internal("textures/blocks/gravel.png")))); + 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); + } + } } /** @@ -88,13 +58,14 @@ 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 = 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 +73,11 @@ public class Assets { } public static void load() { + loadMob(playerSprite, "char"); + loadMob(pigSprite, "pig"); + loadJSON(); minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true); minecraftFont.getData().setScale(.375f); - loadPlayer(); - loadPig(); - loadFallingBlocks(); - loadJSON(); } /** @@ -128,4 +98,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; + } + }