X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fmisc%2FAssets.java;h=9d74b0ead879b09390d9b1c134389a34ef21f4a3;hp=23d3ea30c2eea01cd928a0bd08177e66cc3add48;hb=bea2a3c5b967bcd90ccd83e08e833d58449e963a;hpb=a2d04a40dddc471fef220ef38b2f5e2229b9d250

diff --git a/core/src/ru/deadsoftware/cavecraft/misc/Assets.java b/core/src/ru/deadsoftware/cavecraft/misc/Assets.java
index 23d3ea3..9d74b0e 100644
--- a/core/src/ru/deadsoftware/cavecraft/misc/Assets.java
+++ b/core/src/ru/deadsoftware/cavecraft/misc/Assets.java
@@ -10,7 +10,8 @@ import ru.deadsoftware.cavecraft.CaveGame;
 
 public class Assets {
 
-    public static final int BLOCK_TEXTURES = 59;
+    public static final int BLOCK_TEXTURES = 66;
+    public static final int ITEM_TEXTURES = 10;
 
     private static GlyphLayout layout;
 
@@ -30,13 +31,19 @@ public class Assets {
     public static Sprite shade;
 
     public static Texture terrain;
-    public static TextureRegion[] blockTextures = new TextureRegion[BLOCK_TEXTURES];
+    public static Sprite[] blockTextures = new Sprite[BLOCK_TEXTURES];
+
+    public static Texture items;
+    public static Sprite[] itemTextures = new Sprite[ITEM_TEXTURES];
 
     public static Texture gui;
     public static TextureRegion invBar;
     public static TextureRegion invBarCur;
     public static TextureRegion guiCur;
 
+    public static Texture wreckTexture;
+    public static TextureRegion[] wreck = new TextureRegion[10];
+
     public static Texture creativeTexture;
     public static TextureRegion creativeInv;
     public static TextureRegion creativeScroll;
@@ -51,42 +58,42 @@ public class Assets {
         playerTexture = new Texture(Gdx.files.internal("mobs/char.png"));
         //LOOK TO LEFT
         //head
-        playerSprite[0][0] = new Sprite(new TextureRegion(playerTexture, 0,0,12,12));
-        playerSprite[0][0].flip(false,true);
+        playerSprite[0][0] = new Sprite(new TextureRegion(playerTexture, 0, 0, 12, 12));
+        playerSprite[0][0].flip(false, true);
         //body
-        playerSprite[0][1] = new Sprite(new TextureRegion(playerTexture, 0,13,12,12));
-        playerSprite[0][1].flip(false,true);
+        playerSprite[0][1] = new Sprite(new TextureRegion(playerTexture, 0, 13, 12, 12));
+        playerSprite[0][1].flip(false, true);
         //hand
-        playerSprite[0][2] = new Sprite(new TextureRegion(playerTexture, 25,5,20,20));
-        playerSprite[0][2].flip(false,true);
+        playerSprite[0][2] = new Sprite(new TextureRegion(playerTexture, 25, 5, 20, 20));
+        playerSprite[0][2].flip(false, true);
         //leg
-        playerSprite[0][3] = new Sprite(new TextureRegion(playerTexture, 25,27,20,20));
-        playerSprite[0][3].flip(false,true);
+        playerSprite[0][3] = new Sprite(new TextureRegion(playerTexture, 25, 27, 20, 20));
+        playerSprite[0][3].flip(false, true);
         //LOOK TO RIGHT
         //head
-        playerSprite[1][0] = new Sprite(new TextureRegion(playerTexture, 13,0,12,12));
-        playerSprite[1][0].flip(false,true);
+        playerSprite[1][0] = new Sprite(new TextureRegion(playerTexture, 13, 0, 12, 12));
+        playerSprite[1][0].flip(false, true);
         //body
-        playerSprite[1][1] = new Sprite(new TextureRegion(playerTexture, 13,13,12,12));
-        playerSprite[1][1].flip(false,true);
+        playerSprite[1][1] = new Sprite(new TextureRegion(playerTexture, 13, 13, 12, 12));
+        playerSprite[1][1].flip(false, true);
         //hand
-        playerSprite[1][2] = new Sprite(new TextureRegion(playerTexture, 37,5,20,20));
-        playerSprite[1][2].flip(false,true);
+        playerSprite[1][2] = new Sprite(new TextureRegion(playerTexture, 37, 5, 20, 20));
+        playerSprite[1][2].flip(false, true);
         //leg
-        playerSprite[1][3] = new Sprite(new TextureRegion(playerTexture, 37,27,20,20));
-        playerSprite[1][3].flip(false,true);
+        playerSprite[1][3] = new Sprite(new TextureRegion(playerTexture, 37, 27, 20, 20));
+        playerSprite[1][3].flip(false, true);
     }
 
     private static void loadPig() {
         pigTexture = new Texture(Gdx.files.internal("mobs/pig.png"));
         pigSprite[0][0] = new Sprite(new TextureRegion(pigTexture, 0, 0, 25, 12));
-        pigSprite[0][0].flip(false,true);
+        pigSprite[0][0].flip(false, true);
         pigSprite[1][0] = new Sprite(new TextureRegion(pigTexture, 0, 12, 25, 12));
-        pigSprite[1][0].flip(false,true);
+        pigSprite[1][0].flip(false, true);
         pigSprite[0][1] = new Sprite(new TextureRegion(pigTexture, 4, 26, 12, 12));
-        pigSprite[0][1].flip(false,true);
+        pigSprite[0][1].flip(false, true);
         pigSprite[1][1] = new Sprite(new TextureRegion(pigTexture, 16, 26, 12, 12));
-        pigSprite[1][1].flip(false,true);
+        pigSprite[1][1].flip(false, true);
     }
 
     public static void load() {
@@ -99,8 +106,8 @@ public class Assets {
         gameLogo.flip(false, true);
 
         menuButtonTexture = new Texture(Gdx.files.internal("buttons.png"));
-        for (int i=0; i<3; i++) {
-            menuButton[i] = new TextureRegion(menuButtonTexture, 0, 20*i, 200, 20);
+        for (int i = 0; i < 3; i++) {
+            menuButton[i] = new TextureRegion(menuButtonTexture, 0, 20 * i, 200, 20);
             menuButton[i].flip(false, true);
         }
 
@@ -110,16 +117,21 @@ public class Assets {
         shade = new Sprite(new Texture(Gdx.files.internal("shade.png")));
 
         gui = new Texture(Gdx.files.internal("gui.png"));
-        guiCur = new TextureRegion(gui,0,0,16,16);
-        invBar = new TextureRegion(gui,0,16,182,22);
-        invBarCur = new TextureRegion(gui,0,38,24,24);
+        guiCur = new TextureRegion(gui, 0, 0, 16, 16);
+        invBar = new TextureRegion(gui, 0, 16, 182, 22);
+        invBarCur = new TextureRegion(gui, 0, 38, 24, 24);
 
         creativeTexture = new Texture(Gdx.files.internal("allitems.png"));
         creativeInv = new TextureRegion(creativeTexture, 0, 0, 176, 136);
-        creativeInv.flip(false,true);
+        creativeInv.flip(false, true);
         creativeScroll = new TextureRegion(creativeTexture, 3, 137, 12, 15);
         creativeScroll.flip(false, true);
 
+        wreckTexture = new Texture(Gdx.files.internal("break.png"));
+        for (int i = 0; i < 10; i++) {
+            wreck[i] = new TextureRegion(wreckTexture, 16 * i, 0, 16, 16);
+        }
+
         if (CaveGame.TOUCH) {
             touchGui = new Texture(Gdx.files.internal("touch_gui.png"));
             for (int i = 0; i < 4; i++) {
@@ -137,21 +149,32 @@ public class Assets {
         }
 
         terrain = new Texture(Gdx.files.internal("terrain.png"));
-        for (int i=0; i<BLOCK_TEXTURES; i++) {
-            blockTextures[i] = new TextureRegion(terrain,
-                    (i%16)*16, (i/16)*16, 16,16);
-            blockTextures[i].flip(false,true);
+        for (int i = 0; i < BLOCK_TEXTURES; i++) {
+            blockTextures[i] = new Sprite(terrain,
+                    (i % 16) * 16, (i / 16) * 16, 16, 16);
+            blockTextures[i].flip(false, true);
+            blockTextures[i].setSize(8, 8);
+        }
+        terrain = null;
+
+        items = new Texture(Gdx.files.internal("items.png"));
+        for (int i = 0; i < ITEM_TEXTURES; i++) {
+            itemTextures[i] = new Sprite(items,
+                    (i % 16) * 16, (i / 16) * 16, 16, 16);
+            itemTextures[i].flip(false, true);
+            //itemTextures[i].setSize(8,8);
         }
+        items = null;
     }
 
-    public static int getStringWidth(String s){
-        layout.setText(minecraftFont,s);
-        return (int)layout.width;
+    public static int getStringWidth(String s) {
+        layout.setText(minecraftFont, s);
+        return (int) layout.width;
     }
 
-    public static int getStringHeight(String s){
-        layout.setText(minecraftFont,s);
-        return (int)layout.height;
+    public static int getStringHeight(String s) {
+        layout.setText(minecraftFont, s);
+        return (int) layout.height;
     }
 
 }