X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2FAssets.java;h=acdebdffafdba033f4d3f887fcf8f8ec62a9a097;hb=ae127044500e62f503403562d2b80c7d59235831;hp=e1fd5c94a1c44923c39ad4fb0ff97462453ad1d4;hpb=e5f474791112f95004f7e8f8ec96661884d7373f;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/Assets.java b/core/src/ru/deadsoftware/cavecraft/Assets.java
index e1fd5c9..acdebdf 100644
--- a/core/src/ru/deadsoftware/cavecraft/Assets.java
+++ b/core/src/ru/deadsoftware/cavecraft/Assets.java
@@ -2,7 +2,6 @@ package ru.deadsoftware.cavecraft;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.Animation;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -14,7 +13,10 @@ public class Assets {
     public static BitmapFont minecraftFont;
 
     public static Texture charTexture;
-    public static Sprite[][] playerSkin = new Sprite[2][4];
+    public static Sprite[][] playerSprite = new Sprite[2][4];
+
+    public static Texture pigTexture;
+    public static Sprite[][] pigSprite = new Sprite[2][2];
 
     public static Sprite shade;
 
@@ -23,7 +25,8 @@ public class Assets {
 
     public static Texture gui;
     public static TextureRegion invBar;
-    public static TextureRegion invCur;
+    public static TextureRegion invBarCur;
+    public static TextureRegion guiCur;
 
     public static Texture creativeTexture;
     public static TextureRegion creativeInv;
@@ -35,47 +38,65 @@ public class Assets {
     public static TextureRegion touchToggleMode;
     public static TextureRegion touchSpace;
 
-    public static void load() {
-        minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true);
+    private static void loadPlayer() {
         charTexture = new Texture(Gdx.files.internal("mobs/char.png"));
         //LOOK TO LEFT
         //head
-        playerSkin[0][0] = new Sprite(new TextureRegion(charTexture, 0,0,12,12));
-        playerSkin[0][0].flip(false,true);
+        playerSprite[0][0] = new Sprite(new TextureRegion(charTexture, 0,0,12,12));
+        playerSprite[0][0].flip(false,true);
         //body
-        playerSkin[0][1] = new Sprite(new TextureRegion(charTexture, 0,13,12,12));
-        playerSkin[0][1].flip(false,true);
+        playerSprite[0][1] = new Sprite(new TextureRegion(charTexture, 0,13,12,12));
+        playerSprite[0][1].flip(false,true);
         //hand
-        playerSkin[0][2] = new Sprite(new TextureRegion(charTexture, 25,5,20,20));
-        playerSkin[0][2].flip(false,true);
+        playerSprite[0][2] = new Sprite(new TextureRegion(charTexture, 25,5,20,20));
+        playerSprite[0][2].flip(false,true);
         //leg
-        playerSkin[0][3] = new Sprite(new TextureRegion(charTexture, 25,27,20,20));
-        playerSkin[0][3].flip(false,true);
+        playerSprite[0][3] = new Sprite(new TextureRegion(charTexture, 25,27,20,20));
+        playerSprite[0][3].flip(false,true);
         //LOOK TO RIGHT
         //head
-        playerSkin[1][0] = new Sprite(new TextureRegion(charTexture, 13,0,12,12));
-        playerSkin[1][0].flip(false,true);
+        playerSprite[1][0] = new Sprite(new TextureRegion(charTexture, 13,0,12,12));
+        playerSprite[1][0].flip(false,true);
         //body
-        playerSkin[1][1] = new Sprite(new TextureRegion(charTexture, 13,13,12,12));
-        playerSkin[1][1].flip(false,true);
+        playerSprite[1][1] = new Sprite(new TextureRegion(charTexture, 13,13,12,12));
+        playerSprite[1][1].flip(false,true);
         //hand
-        playerSkin[1][2] = new Sprite(new TextureRegion(charTexture, 37,5,20,20));
-        playerSkin[1][2].flip(false,true);
+        playerSprite[1][2] = new Sprite(new TextureRegion(charTexture, 37,5,20,20));
+        playerSprite[1][2].flip(false,true);
         //leg
-        playerSkin[1][3] = new Sprite(new TextureRegion(charTexture, 37,27,20,20));
-        playerSkin[1][3].flip(false,true);
+        playerSprite[1][3] = new Sprite(new TextureRegion(charTexture, 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[1][0] = new Sprite(new TextureRegion(pigTexture, 0, 12, 25, 12));
+        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[1][1] = new Sprite(new TextureRegion(pigTexture, 16, 26, 12, 12));
+        pigSprite[1][1].flip(false,true);
+    }
+
+    public static void load() {
+        minecraftFont = new BitmapFont(Gdx.files.internal("font.fnt"), true);
 
+        loadPlayer();
+        loadPig();
 
         shade = new Sprite(new Texture(Gdx.files.internal("shade.png")));
 
         gui = new Texture(Gdx.files.internal("gui.png"));
-        invBar = new TextureRegion(gui,0,0,182,22);
-        invCur = new TextureRegion(gui,0,22,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, 208);
+        creativeInv = new TextureRegion(creativeTexture, 0, 0, 176, 136);
         creativeInv.flip(false,true);
-        creativeScroll = new TextureRegion(creativeTexture, 2, 209, 12, 15);
+        creativeScroll = new TextureRegion(creativeTexture, 3, 137, 12, 15);
         creativeScroll.flip(false, true);
 
         touchGui = new Texture(Gdx.files.internal("touch_gui.png"));