X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fmisc%2FAssets.java;h=a6318d71e75cb86c5788be83b1937a5f89c90cbf;hb=6da6f8b40b6945e0b4e8376f506c43e548918df4;hp=b01153a4c6f697c9d3251b921ea494977e0ef3f2;hpb=1373d2f790f33688565537b5780ab59faff163ab;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java index b01153a..a6318d7 100644 --- a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java +++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java @@ -1,32 +1,49 @@ package ru.deadsoftware.cavedroid.misc; -import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Texture; 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 ru.deadsoftware.cavedroid.misc.utils.AssetLoader; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; 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); + private static final List loadedTextures = new LinkedList<>(); 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<>(); - 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 final GlyphLayout glyphLayout = new GlyphLayout(); + public static BitmapFont minecraftFont; + + public static Map blockTextures = new HashMap<>(); + public static Map itemTextures = new HashMap<>(); + + public static void dispose() { + minecraftFont.dispose(); + loadedTextures.forEach(Texture::dispose); + loadedTextures.clear(); + } + + private static Texture loadTexture(FileHandle fileHandle) { + Texture texture = new Texture(fileHandle); + loadedTextures.add(texture); + return texture; + } private static TextureRegion flippedRegion(Texture texture, int x, int y, int width, int height) { return new TextureRegion(texture, x, y + height, width, -height); @@ -44,46 +61,33 @@ 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(AssetLoader assetLoader, 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(loadTexture( + assetLoader.getAssetHandle("mobs/" + mob + "/" + i + "_" + j + ".png"))); + sprite[i][j].setOrigin(sprite[i][j].getWidth() / 2, 0); + } + } + } + + private static void setPlayerHeadOrigin() { + for (Sprite[] sprites : playerSprite) { + sprites[0].setOrigin(sprites[0].getWidth() / 2, sprites[0].getHeight()); + } } /** * Loads texture names and sizes from json/texture_regions.json, cuts them to TextureRegions * and puts to {@link #textureRegions} HashMap */ - private static void loadJSON() { - JsonValue json = jsonReader.parse(Gdx.files.internal("json/texture_regions.json")); + private static void loadJSON(AssetLoader assetLoader) { + JsonValue json = jsonReader.parse(assetLoader.getAssetHandle("json/texture_regions.json")); for (JsonValue file = json.child(); file != null; file = file.next()) { - Texture texture = new Texture(Gdx.files.internal(file.name() + ".png")); + Texture texture = loadTexture(assetLoader.getAssetHandle(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,11 +100,31 @@ public class Assets { } } - public static void load() { + private static void loadAllPngsFromDirInto(FileHandle dir, Map loadInto) { + for (FileHandle handle : dir.list((d, name) -> name.endsWith(".png"))) { + loadInto.put(handle.nameWithoutExtension(), loadTexture(handle)); + } + } + + private static void loadItems(AssetLoader assetLoader) { + final FileHandle itemsDir = assetLoader.getAssetHandle("textures/items"); + loadAllPngsFromDirInto(itemsDir, itemTextures); + } + + private static void loadBlocks(AssetLoader assetLoader) { + final FileHandle blocksDir = assetLoader.getAssetHandle("textures/blocks"); + loadAllPngsFromDirInto(blocksDir, blockTextures); + } + + public static void load(final AssetLoader assetLoader) { + loadMob(assetLoader, playerSprite, "char"); + loadMob(assetLoader, pigSprite, "pig"); + loadJSON(assetLoader); + loadBlocks(assetLoader); + loadItems(assetLoader); + setPlayerHeadOrigin(); + minecraftFont = new BitmapFont(assetLoader.getAssetHandle("font.fnt"), true); minecraftFont.getData().setScale(.375f); - loadPlayer(); - loadPig(); - loadJSON(); } /** @@ -125,6 +149,10 @@ public class Assets { return json.has(name) ? json.getInt(name) : defaultValue; } + public static float getFloatFromJson(JsonValue json, String name, float defaultValue) { + return json.has(name) ? json.getFloat(name) : defaultValue; + } + public static String getStringFromJson(JsonValue json, String name, String defaultValue) { return json.has(name) ? json.getString(name) : defaultValue; }