diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index f373dc3ad598785e1d8430229c10a87f3f2c24d9..3335b7f5ebc69322478b8e1eeb7cf82f043b2baa 100644 (file)
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 {
return new Vector2(8 - getWidth() / 2, (float) y * 16 - getHeight());
}
+ private boolean isAnimationIncreasing() {
+ return mAnim > 0 && mAnimDelta > 0 || mAnim < 0 && mAnimDelta < 0;
+ }
+
public void setDir(Direction dir) {
if (dir != getDirection()) {
switchDir();
}
@Override
- public void ai(GameWorld gameWorld) {
+ public void ai(GameWorld gameWorld, float delta) {
}
@Override
}
@Override
- public void draw(SpriteBatch spriteBatch, float x, float y) {
- if (mVelocity.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) {
+ if (mVelocity.x != 0f || Math.abs(mAnim) > 5f) {
+ mAnim += mAnimDelta * delta;
} 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);
+ mAnim = 0;
+ }
+
+ Assets.playerSprite[0][2].setRotation(mAnim);
+ Assets.playerSprite[1][2].setRotation(-mAnim);
+ Assets.playerSprite[0][3].setRotation(-mAnim);
+ Assets.playerSprite[1][3].setRotation(mAnim);
+
+ if (mAnim > 60f) {
+ mAnim = 60f;
+ mAnimDelta = -ANIMATION_SPEED;
+ } else if (mAnim < -60f) {
+ mAnim = -60f;
+ mAnimDelta = ANIMATION_SPEED;
}
- if (Assets.playerSprite[0][2].getRotation() >= 60 || Assets.playerSprite[0][2].getRotation() <= -60) {
+
+ if (mVelocity.x == 0f && isAnimationIncreasing()) {
mAnimDelta = -mAnimDelta;
}