diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 1cebf860ac5f0be1f9a03c2763969d31c0b43c1a..5ae4f19a92e70b96ede2cfcecf01c40fac27d8e5 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Sprite;
+import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.utils.ArrayMap;
import com.badlogic.gdx.utils.GdxRuntimeException;
import com.badlogic.gdx.utils.JsonValue;
import ru.deadsoftware.cavedroid.game.objects.Block;
import ru.deadsoftware.cavedroid.game.objects.Item;
import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.utils.AssetLoader;
+import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin;
import java.util.HashMap;
return getBlockId(items.getKeyAt(id));
}
+ public static int getItemIdByBlockId(int id) {
+ return getItemId(blocks.getKeyAt(id));
+ }
+
public static int getBlocksSize() {
return blocks.size;
}
return items.getValueAt(id).getType().equals("block") ? getBlockTex(id) : getItem(id).getTexture();
}
- public static void load() {
- JsonValue json = Assets.jsonReader.parse(Gdx.files.internal("json/game_items.json"));
+ public static void load(AssetLoader assetLoader) {
+ JsonValue json = Assets.jsonReader.parse(assetLoader.getAssetHandle("json/game_items.json"));
for (JsonValue block = json.get("blocks").child(); block != null; block = block.next()) {
try {
String key = block.name();
String meta = Assets.getStringFromJson(block, "meta", "");
String tex = Assets.getStringFromJson(block, "texture", key);
Texture texture = tex.equals("none") ? null :
- new Texture(Gdx.files.internal("textures/blocks/" + tex + ".png"));
+ new Texture(assetLoader.getAssetHandle("textures/blocks/" + tex + ".png"));
boolean animated = Assets.getBooleanFromJson(block, "animated", false);
int frames = Assets.getIntFromJson(block, "frames", 0);
+ int id = blocks.size;
+ blocksIds.put(key, id);
Block newBlock = new Block(
+ id,
left,
top,
right,
clipWidth,
clipHeight
);
-
- blocksIds.put(key, blocks.size);
blocks.put(key, newBlock);
} catch (GdxRuntimeException e) {
Gdx.app.error(TAG, e.getMessage());
String type = Assets.getStringFromJson(item, "type", "item");
String texture = Assets.getStringFromJson(item, "texture", key);
Sprite sprite = type.equals("block") ? null :
- new Sprite(new Texture(Gdx.files.internal("textures/items/" + texture + ".png")));
- itemsIds.put(key, items.size);
- items.put(key, new Item(name, type, sprite));
+ new Sprite(new Texture(assetLoader.getAssetHandle("textures/items/" + texture + ".png")));
+
+ float originX = Assets.getFloatFromJson(item, "origin_x", 0f);
+ float originY = Assets.getFloatFromJson(item, "origin_y", 1f);
+ originX = MathUtils.clamp(originX, 0f, 1f);
+ originY = MathUtils.clamp(originY, 0f, 1f);
+ SpriteOrigin origin = new SpriteOrigin(originX, originY);
+
+ int id = items.size;
+ itemsIds.put(key, id);
+ items.put(key, new Item(id, name, type, sprite, origin));
} catch (GdxRuntimeException e) {
Gdx.app.error(TAG, e.getMessage());
}