diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
index b7fd03e132063167fe37cc0ee2d97ac5f2b6090e..71cad7a2d69eac9226114ef607735d099bd579ca 100644 (file)
public static Map<String, Texture> blockTextures = new HashMap<>();
public static Map<String, Texture> 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);
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")));
+ assetLoader.getAssetHandle("pp/mobs/" + mob + "/" + i + "_" + j + ".png")));
sprite[i][j].setOrigin(sprite[i][j].getWidth() / 2, 0);
}
}
}
private static void loadBlockDamage(AssetLoader assetLoader) {
- final Texture blockDamageTexture = loadTexture(assetLoader.getAssetHandle("break.png"));
+ final Texture blockDamageTexture = loadTexture(assetLoader.getAssetHandle("pp/break.png"));
for (int i = 0; i < BLOCK_DAMAGE_STAGES; i++) {
blockDamageSprites[i] = new Sprite(flippedRegion(blockDamageTexture, i * 16, 0, 16, 16));
}
JsonValue json = jsonReader.parse(assetLoader.getAssetHandle("json/texture_regions.json"));
for (JsonValue file = json.child(); file != null; file = file.next()) {
Texture texture = loadTexture(assetLoader.getAssetHandle(file.name() + ".png"));
+ final String[] pathSegments = file.name().split("/");
+ final String name = pathSegments[pathSegments.length - 1];
if (file.size == 0) {
- textureRegions.put(file.name(),
- flippedRegion(texture, 0, 0, texture.getWidth(), texture.getHeight()));
+ textureRegions.put(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);
}
public static Texture resolveItemTexture(AssetLoader assetLoader, String textureName) {
- return resolveTexture(assetLoader, textureName, "textures/items", itemTextures);
+ return resolveTexture(assetLoader, textureName, "pp/textures/items", itemTextures);
}
public static Texture resolveBlockTexture(AssetLoader assetLoader, String textureName) {
- return resolveTexture(assetLoader, textureName, "textures/blocks", blockTextures);
+ return resolveTexture(assetLoader, textureName, "pp/textures/blocks", blockTextures);
}
private static void loadAllPngsFromDirInto(FileHandle dir, Map<String, Texture> loadInto) {
}
private static void loadItems(AssetLoader assetLoader) {
- final FileHandle itemsDir = assetLoader.getAssetHandle("textures/items");
+ final FileHandle itemsDir = assetLoader.getAssetHandle("pp/textures/items");
loadAllPngsFromDirInto(itemsDir, itemTextures);
}
private static void loadBlocks(AssetLoader assetLoader) {
- final FileHandle blocksDir = assetLoader.getAssetHandle("textures/blocks");
+ final FileHandle blocksDir = assetLoader.getAssetHandle("pp/textures/blocks");
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");
loadBlocks(assetLoader);
loadItems(assetLoader);
loadTouchButtonsFromJSON(assetLoader);
+ loadJoystick(assetLoader);
+ loadFurnace(assetLoader);
setPlayerHeadOrigin();
minecraftFont = new BitmapFont(assetLoader.getAssetHandle("font.fnt"), true);
minecraftFont.getData().setScale(.375f);
+ minecraftFont.setUseIntegerPositions(false);
}
/**