Move game world to new package

[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 0b7ab8bc8148c48a24b02a3d7d266ec43e7cd3de..272992a29973735c1d38c7b6c10bd2c68d225ae4 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -2,7 +2,7 @@ package ru.deadsoftware.cavedroid.game.mobs;
 
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavedroid.game.GameWorld;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
 import ru.deadsoftware.cavedroid.misc.Assets;
 
 public class Player extends Mob {
@@ -23,7 +23,7 @@ public class Player extends Mob {
         Vector2 pos = getSpawnPoint(gameWorld);
         this.x = pos.x;
         this.y = pos.y;
-        mMove.setZero();
+        mVelocity.setZero();
     }
 
     private Vector2 getSpawnPoint(GameWorld gameWorld) {
@@ -48,7 +48,7 @@ public class Player extends Mob {
     }
 
     @Override
-    public void ai(GameWorld gameWorld) {
+    public void ai(GameWorld gameWorld, float delta) {
     }
 
     @Override
@@ -56,12 +56,14 @@ public class Player extends Mob {
     }
 
     @Override
-    public void draw(SpriteBatch spriteBatch, float x, float y) {
-        if (mMove.x != 0 || Assets.playerSprite[0][2].getRotation() != 0) {
-            Assets.playerSprite[0][2].rotate(mAnimDelta);
-            Assets.playerSprite[1][2].rotate(-mAnimDelta);
-            Assets.playerSprite[0][3].rotate(-mAnimDelta);
-            Assets.playerSprite[1][3].rotate(mAnimDelta);
+    public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
+        final float correctedAnimationDelta = mAnimDelta * delta;
+
+        if (mVelocity.x != 0 || 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);