Fix mob physics

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / mobs / Player.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index cb3c2a5dfdcdd3e577a910b2a1ca9bfa06a7606d..10a1885681723d5b13c34644dd4535cd55cc26ab 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -1,9 +1,12 @@
 package ru.deadsoftware.cavedroid.game.mobs;
 
+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.world.GameWorld;
 import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt;
 
 public class Player extends Mob {
 
@@ -11,6 +14,7 @@ public class Player extends Mob {
     public int slot;
     public final int gameMode;
     public boolean swim;
+    public float headRotation = 0f;
 
     public Player() {
         super(0, 0, 4, 30, randomDir(), Type.MOB);
@@ -57,39 +61,21 @@ public class Player extends Mob {
 
     @Override
     public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
-        final float correctedAnimationDelta = mAnimDelta * delta;
+        updateAnimation(delta);
 
-        if (mVelocity.x != 0f || Math.abs(Assets.playerSprite[0][2].getRotation()) > Math.abs(correctedAnimationDelta)) {
-            Assets.playerSprite[0][2].rotate(correctedAnimationDelta);
-            Assets.playerSprite[1][2].rotate(-correctedAnimationDelta);
-            Assets.playerSprite[0][3].rotate(-correctedAnimationDelta);
-            Assets.playerSprite[1][3].rotate(correctedAnimationDelta);
-        } else {
-            Assets.playerSprite[0][2].setRotation(0);
-            Assets.playerSprite[1][2].setRotation(0);
-            Assets.playerSprite[0][3].setRotation(0);
-            Assets.playerSprite[1][3].setRotation(0);
-        }
-        if (Assets.playerSprite[0][2].getRotation() >= 60 || Assets.playerSprite[0][2].getRotation() <= -60) {
-            mAnimDelta = -mAnimDelta;
-        }
+        final Sprite backHand = Assets.playerSprite[1][2];
+        final Sprite backLeg = Assets.playerSprite[1][3];
+        final Sprite frontLeg = Assets.playerSprite[0][3];
+        final Sprite head = Assets.playerSprite[dirMultiplier()][0];
+        final Sprite body = Assets.playerSprite[dirMultiplier()][1];
+        final Sprite frontHand = Assets.playerSprite[0][2];
 
-        //back hand
-        Assets.playerSprite[1][2].setPosition(x + 2, y + 8);
-        Assets.playerSprite[1][2].draw(spriteBatch);
-        //back leg
-        Assets.playerSprite[1][3].setPosition(x + 2, y + 20);
-        Assets.playerSprite[1][3].draw(spriteBatch);
-        //front leg
-        Assets.playerSprite[0][3].setPosition(x + 2, y + 20);
-        Assets.playerSprite[0][3].draw(spriteBatch);
-        //head
-        spriteBatch.draw(Assets.playerSprite[dirMultiplier()][0], x, y);
-        //body
-        spriteBatch.draw(Assets.playerSprite[dirMultiplier()][1], x + 2, y + 8);
-        //front hand
-        Assets.playerSprite[0][2].setPosition(x + 2, y + 8);
-        Assets.playerSprite[0][2].draw(spriteBatch);
+        SpriteUtilsKt.draw(spriteBatch, backHand, x + 2, y + 8, -mAnim);
+        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);
+        SpriteUtilsKt.draw(spriteBatch, frontHand, x + 2, y + 8, mAnim);
     }
 
 }