X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=b45b942697356a3b23450a355e8b5b5178dc9b09;hb=462f97f8da742fe35f516fec00ca9a581d688e7a;hp=3335b7f5ebc69322478b8e1eeb7cf82f043b2baa;hpb=7bd07c5544488066e1d940305f1da53138859545;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 3335b7f..b45b942 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java @@ -1,16 +1,29 @@ 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.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 { + private static final float SPEED = 69.072f; + private static final float JUMP_VELOCITY = -133.332f; + public final int[] inventory; public int slot; public final int gameMode; public boolean swim; + public float headRotation = 0f; public Player() { super(0, 0, 4, 30, randomDir(), Type.MOB); @@ -24,6 +37,17 @@ public class Player extends Mob { this.x = pos.x; this.y = pos.y; mVelocity.setZero(); + mDead = false; + } + + public void pickUpDrop(Drop drop) { + for (int i = 0; i < inventory.length; i++) { + if (inventory[i] == 0 || inventory[i] == drop.getId()) { + inventory[i] = drop.getId(); + drop.setPickedUp(true); + break; + } + } } private Vector2 getSpawnPoint(GameWorld gameWorld) { @@ -41,16 +65,22 @@ 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 float getSpeed() { + return SPEED; + } + + @Override + public void jump() { + mVelocity.y = JUMP_VELOCITY; + } + @Override public void ai(GameWorld gameWorld, float delta) { } @@ -59,47 +89,77 @@ public class Player extends Mob { public void changeDir() { } - @Override - public void draw(SpriteBatch spriteBatch, float x, float y, float delta) { - if (mVelocity.x != 0f || Math.abs(mAnim) > 5f) { - mAnim += mAnimDelta * delta; + 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 = -getDirection().getBasis(); + final float xOffset = (-1 + getDirection().getIndex()) * 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 { - mAnim = 0; + sprite.setFlip(false, sprite.isFlipY()); + SpriteUtilsKt.applyOrigin(sprite, spriteOrigin); } - 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; + SpriteUtilsKt.drawSprite(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); + + 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[getDirection().getIndex()][0]; + final Sprite body = Assets.playerSprite[getDirection().getIndex()][1]; + final Sprite frontHand = Assets.playerSprite[0][2]; + + SpriteUtilsKt.drawSprite(spriteBatch, backHand, x + 2, y + 8, -mAnim); + + if (looksLeft()) { + drawItem(spriteBatch, x, y); } - if (mVelocity.x == 0f && isAnimationIncreasing()) { - mAnimDelta = -mAnimDelta; + SpriteUtilsKt.drawSprite(spriteBatch, backLeg, x + 2, y + 20, mAnim); + SpriteUtilsKt.drawSprite(spriteBatch, frontLeg, x + 2, y + 20, -mAnim); + SpriteUtilsKt.drawSprite(spriteBatch, head, x, y, headRotation); + SpriteUtilsKt.drawSprite(spriteBatch, body, x + 2, y + 8); + + if (looksRight()) { + drawItem(spriteBatch, x, y); } - //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.drawSprite(spriteBatch, frontHand, x + 2, y + 8, mAnim); } }