X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fmisc%2FAssets.java;h=ffc253f1df71e831864fd784fd3244c2062faddb;hb=9606fce8cc7c9b264abd7cb38583faaebb610540;hp=029c59f362407e74cdd0c138a9ac03ca2880fc10;hpb=13157246344c2b94d24354040f0f2d2fb5beb7ea;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java index 029c59f..ffc253f 100644 --- a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java +++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java @@ -41,6 +41,12 @@ public class Assets { public static Map blockTextures = new HashMap<>(); public static Map itemTextures = new HashMap<>(); + public static Sprite joyBackground; + public static Sprite joyStick; + + public static Sprite furnaceBurn; + public static Sprite furnaceProgress; + public static void dispose() { minecraftFont.dispose(); loadedTextures.forEach(Texture::dispose); @@ -188,6 +194,16 @@ public class Assets { loadAllPngsFromDirInto(blocksDir, blockTextures); } + private static void loadJoystick(AssetLoader assetLoader) { + joyStick = new Sprite(loadTexture(assetLoader.getAssetHandle("joy_stick.png"))); + joyBackground = new Sprite(loadTexture(assetLoader.getAssetHandle("joy_background.png"))); + } + + private static void loadFurnace(AssetLoader assetLoader) { + furnaceBurn = new Sprite(textureRegions.get("furnace_burn")); + furnaceProgress = new Sprite(textureRegions.get("furnace_progress")); + } + public static void load(final AssetLoader assetLoader) { loadMob(assetLoader, playerSprite, "char"); loadMob(assetLoader, pigSprite, "pig"); @@ -196,6 +212,8 @@ public class Assets { loadBlocks(assetLoader); loadItems(assetLoader); loadTouchButtonsFromJSON(assetLoader); + loadJoystick(assetLoader); + loadFurnace(assetLoader); setPlayerHeadOrigin(); minecraftFont = new BitmapFont(assetLoader.getAssetHandle("font.fnt"), true); minecraftFont.getData().setScale(.375f);