X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=580665ef8950f1daa3d6ab59faf1776412e7d5ab;hb=e7a1e15a93abaafa8e2e0435336483a198cc697c;hp=fd7101c7dbd0dafbefab5675098e47cb014723f7;hpb=4f652847070576ce21f1f8155d900c9dd4cad9dc;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 fd7101c..580665e 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -1,10 +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 static ru.deadsoftware.cavedroid.GameScreen.GP;
+import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt;
 
 public class Player extends Mob {
 
@@ -12,34 +14,59 @@ public class Player extends Mob {
     public int slot;
     public final int gameMode;
     public boolean swim;
+    public float headRotation = 0f;
 
-    public Player(int gameMode) {
+    public Player() {
         super(0, 0, 4, 30, randomDir(), Type.MOB);
-        this.gameMode = gameMode;
+        this.gameMode = 1;
         inventory = new int[9];
         swim = false;
     }
 
-    public void respawn() {
-        Vector2 pos = getSpawnPoint();
+    public void respawn(GameWorld gameWorld) {
+        Vector2 pos = getSpawnPoint(gameWorld);
         this.x = pos.x;
         this.y = pos.y;
-        move.setZero();
+        mVelocity.setZero();
     }
 
-    private Vector2 getSpawnPoint() {
-        int x = 0, y;
-        for (y = 0; y < GP.world.getHeight(); y++) {
-            if (y == GP.world.getHeight() - 1) {
+    private Vector2 getSpawnPoint(GameWorld gameWorld) {
+        int y;
+        for (y = 0; y < gameWorld.getHeight(); y++) {
+            if (y == gameWorld.getHeight() - 1) {
                 y = 60;
-                GP.world.setForeMap(x, y, 1);
+                gameWorld.setForeMap(0, y, 1);
                 break;
             }
-            if (GP.world.hasForeAt(x, y) && GP.world.getForeMapBlock(x, y).hasCollision()) {
+            if (gameWorld.hasForeAt(0, y) && gameWorld.getForeMapBlock(0, y).hasCollision()) {
                 break;
             }
         }
-        return new Vector2(x * 16 + 8 - getWidth() / 2, (float) y * 16 - getHeight());
+        return new Vector2(8 - getWidth() / 2, (float) y * 16 - getHeight());
+    }
+
+    private boolean isAnimationIncreasing() {
+        return mAnim > 0 && mAnimDelta > 0 || mAnim < 0 && mAnimDelta < 0;
+    }
+
+    private void updateAnimation(float delta) {
+        if (mVelocity.x != 0f || Math.abs(mAnim) > 5f) {
+            mAnim += mAnimDelta * delta;
+        } else {
+            mAnim = 0;
+        }
+
+        if (mAnim > 60f) {
+            mAnim = 60f;
+            mAnimDelta = -ANIMATION_SPEED;
+        } else if (mAnim < -60f) {
+            mAnim = -60f;
+            mAnimDelta = ANIMATION_SPEED;
+        }
+
+        if (mVelocity.x == 0f && isAnimationIncreasing()) {
+            mAnimDelta = -mAnimDelta;
+        }
     }
 
     public void setDir(Direction dir) {
@@ -49,7 +76,7 @@ public class Player extends Mob {
     }
 
     @Override
-    public void ai() {
+    public void ai(GameWorld gameWorld, float delta) {
     }
 
     @Override
@@ -57,38 +84,22 @@ public class Player extends Mob {
     }
 
     @Override
-    public void draw(SpriteBatch spriteBatch, float x, float y) {
-        if (move.x != 0 || Assets.playerSprite[0][2].getRotation() != 0) {
-            Assets.playerSprite[0][2].rotate(animDelta);
-            Assets.playerSprite[1][2].rotate(-animDelta);
-            Assets.playerSprite[0][3].rotate(-animDelta);
-            Assets.playerSprite[1][3].rotate(animDelta);
-        } 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) {
-            animDelta = -animDelta;
-        }
+    public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
+        updateAnimation(delta);
+
+        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);
     }
 
 }