X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=93150b6a5d3f4870187251071d4dfabf2bdeff2c;hb=2b0cd1ba5dbf194bd5ed35964c0cb2ea16293be4;hp=1f42039bfec7bd2969ec002bdacc4c9ee8ae4386;hpb=55eff4ac8845da1b2fc92dcadf8b7a440fe122f7;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 1f42039..93150b6 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -4,11 +4,16 @@ import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
+import ru.deadsoftware.cavedroid.game.GameItems;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
+import ru.deadsoftware.cavedroid.game.objects.Item;
 import ru.deadsoftware.cavedroid.game.world.GameWorld;
 import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin;
 import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt;
 
+import javax.annotation.CheckForNull;
+
 public class Player extends Mob {
 
     public final int[] inventory;
@@ -29,6 +34,7 @@ public class Player extends Mob {
         this.x = pos.x;
         this.y = pos.y;
         mVelocity.setZero();
+        mDead = false;
     }
 
     public void pickUpDrop(Drop drop) {
@@ -70,6 +76,50 @@ public class Player extends Mob {
     public void changeDir() {
     }
 
+    private void drawItem(SpriteBatch spriteBatch, float x, float y) {
+        final int itemId = inventory[slot];
+        final Item item = GameItems.getItem(itemId);
+
+        @CheckForNull final Sprite sprite = item.isBlock()
+                ? item.toBlock().getTexture()
+                : item.getSprite();
+
+        if (sprite == null) {
+            return;
+        }
+
+        if (!item.isTool()) {
+            sprite.setSize(Drop.DROP_SIZE, Drop.DROP_SIZE);
+        }
+
+        final float handLength = Assets.playerSprite[0][2].getHeight();
+
+        final SpriteOrigin spriteOrigin = item.getDefaultOrigin();
+        final int handMultiplier = 1 + -2 * dirMultiplier();
+        final float xOffset = (-1 + dirMultiplier()) * sprite.getWidth() + 4 + handMultiplier * (sprite.getWidth() * spriteOrigin.getX());
+        final float yOffset = item.isTool() ? -sprite.getHeight() / 2 : 0;
+
+        float rotate = mAnim + 30;
+
+        final float itemX = x + handLength * MathUtils.sin(handMultiplier * mAnim * MathUtils.degRad) + xOffset;
+        final float itemY = y + handLength * MathUtils.cos(handMultiplier * mAnim * MathUtils.degRad) + yOffset;
+
+        if (looksLeft()) {
+            sprite.setFlip(true, sprite.isFlipY());
+            SpriteUtilsKt.applyOrigin(sprite, spriteOrigin.getFlipped(true, false));
+        } else {
+            sprite.setFlip(false, sprite.isFlipY());
+            SpriteUtilsKt.applyOrigin(sprite, spriteOrigin);
+        }
+
+        SpriteUtilsKt.draw(spriteBatch, sprite, itemX, itemY, -handMultiplier * rotate);
+
+        // dont forget to reset
+        sprite.setFlip(false, sprite.isFlipY());
+        sprite.setRotation(0);
+        sprite.setOriginCenter();
+    }
+
     @Override
     public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
         updateAnimation(delta);
@@ -82,10 +132,20 @@ public class Player extends Mob {
         final Sprite frontHand = Assets.playerSprite[0][2];
 
         SpriteUtilsKt.draw(spriteBatch, backHand, x + 2, y + 8, -mAnim);
+
+        if (looksLeft()) {
+            drawItem(spriteBatch, x, y);
+        }
+
         SpriteUtilsKt.draw(spriteBatch, backLeg, x + 2, y + 20, mAnim);
         SpriteUtilsKt.draw(spriteBatch, frontLeg, x + 2, y + 20, -mAnim);
         SpriteUtilsKt.draw(spriteBatch, head, x, y, headRotation);
         SpriteUtilsKt.draw(spriteBatch, body, x + 2, y + 8);
+
+        if (looksRight()) {
+            drawItem(spriteBatch, x, y);
+        }
+
         SpriteUtilsKt.draw(spriteBatch, frontHand, x + 2, y + 8, mAnim);
     }