X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameItems.java;h=5ae4f19a92e70b96ede2cfcecf01c40fac27d8e5;hb=e5d141fd4e7426c0e3e8fed59a2b0e153dcd8939;hp=7a619b30748da834cdd003dcf4a7da2362b94979;hpb=213d66fcddbc54faf262c3136be61fad9c35ffb0;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 7a619b3..5ae4f19 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -3,6 +3,7 @@ package ru.deadsoftware.cavedroid.game;
 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;
@@ -10,6 +11,7 @@ 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;
 
@@ -89,6 +91,10 @@ public class GameItems {
         return getBlockId(items.getKeyAt(id));
     }
 
+    public static int getItemIdByBlockId(int id) {
+        return getItemId(blocks.getKeyAt(id));
+    }
+
     public static int getBlocksSize() {
         return blocks.size;
     }
@@ -131,8 +137,11 @@ public class GameItems {
                         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,
@@ -153,8 +162,6 @@ public class GameItems {
                         clipWidth,
                         clipHeight
                 );
-
-                blocksIds.put(key, blocks.size);
                 blocks.put(key, newBlock);
             } catch (GdxRuntimeException e) {
                 Gdx.app.error(TAG, e.getMessage());
@@ -168,8 +175,16 @@ public class GameItems {
                 String texture = Assets.getStringFromJson(item, "texture", key);
                 Sprite sprite = type.equals("block") ? null :
                         new Sprite(new Texture(assetLoader.getAssetHandle("textures/items/" + texture + ".png")));
-                itemsIds.put(key, items.size);
-                items.put(key, new Item(name, type, sprite));
+
+                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());
             }