X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameRenderer.java;h=06e9b624fae8fd2570fae96e342eeb8fe0e2e646;hb=6a71a9abc5bc34547c0e4bea7ab19a6bee628a3c;hp=66058c4a2c3dfa53e457ba4fd2a83e88c2bb96bd;hpb=522264a26a60feed15929afd6fd2cb0a334386b2;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java index 66058c4..06e9b62 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java @@ -3,8 +3,11 @@ package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; +import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; +import com.badlogic.gdx.math.Intersector; +import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack; @@ -12,22 +15,26 @@ import ru.deadsoftware.cavedroid.MainConfig; import ru.deadsoftware.cavedroid.game.mobs.Mob; import ru.deadsoftware.cavedroid.game.mobs.MobsController; import ru.deadsoftware.cavedroid.game.mobs.Player; -import ru.deadsoftware.cavedroid.game.objects.Block; +import ru.deadsoftware.cavedroid.game.model.block.Block; import ru.deadsoftware.cavedroid.game.objects.Drop; import ru.deadsoftware.cavedroid.game.objects.DropController; +import ru.deadsoftware.cavedroid.game.objects.Item; import ru.deadsoftware.cavedroid.game.world.GameWorld; import ru.deadsoftware.cavedroid.misc.ControlMode; import ru.deadsoftware.cavedroid.misc.Renderer; +import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt; +import javax.annotation.CheckForNull; import javax.annotation.Nullable; import javax.inject.Inject; -import static ru.deadsoftware.cavedroid.misc.Assets.guiMap; -import static ru.deadsoftware.cavedroid.misc.Assets.textureRegions; +import static ru.deadsoftware.cavedroid.misc.Assets.*; @GameScope public class GameRenderer extends Renderer { + private static final String TAG = "GameRenderer"; + private final MainConfig mMainConfig; private final GameInput mGameInput; private final GameWorld mGameWorld; @@ -63,6 +70,11 @@ public class GameRenderer extends Renderer { if (mGameInput.getBlockDamage() > 0) { int index = 10 * mGameInput.getBlockDamage() / GameItems.getBlock(bl).getHp(); String key = "break_" + index; + + if (index > 10 || index < 0) { + return; + } + spriter.draw(textureRegions.get(key), mGameInput.getCurX() * 16 - getCamX(), mGameInput.getCurY() * 16 - getCamY()); } @@ -122,6 +134,32 @@ public class GameRenderer extends Renderer { } } + private Rectangle getShiftedRectRespectfulToViewPort(final Rectangle rect, final float shift) { + return new Rectangle(rect.x + shift - getCamX(), rect.y - getCamY(), rect.width, rect.height); + } + + @CheckForNull + private Rectangle getDrawingRectIfInsideViewport(final Rectangle rectangle) { + final Rectangle viewportRect = new Rectangle(0, 0, getWidth(), getHeight()); + + final Rectangle notShifted = getShiftedRectRespectfulToViewPort(rectangle, 0); + if (Intersector.overlaps(viewportRect, notShifted)) { + return notShifted; + } + + final Rectangle shiftedLeft = getShiftedRectRespectfulToViewPort(rectangle, -mGameWorld.getWidthPx()); + if (Intersector.overlaps(viewportRect, shiftedLeft)) { + return shiftedLeft; + } + + final Rectangle shiftedRight = getShiftedRectRespectfulToViewPort(rectangle, mGameWorld.getWidthPx()); + if (Intersector.overlaps(viewportRect, shiftedRight)) { + return shiftedRight; + } + + return null; + } + private void drawMob(Mob mob, float delta) { float mobDrawX = mob.getX() - getCamX(); float mobDrawY = mob.getY() - getCamY(); @@ -138,6 +176,29 @@ public class GameRenderer extends Renderer { } private void drawDrop(Drop drop) { + if (drop.getId() <= 0) { + return; + } + + @CheckForNull final Rectangle drawingRect = getDrawingRectIfInsideViewport(drop); + + if (drawingRect == null) { + return; + } + + final Item item = GameItems.getItem(drop.getId()); + @CheckForNull final Block block = GameItems.getBlock(GameItems.getItemKey(drop.getId())); + @CheckForNull final Sprite sprite = item.isBlock() + ? block.getTexture() + : item.getSprite(); + + if (sprite == null) { + return; + } + + sprite.setPosition(drawingRect.x, drawingRect.y); + sprite.setSize(drawingRect.width, drawingRect.height); + sprite.draw(spriter); } @SuppressWarnings("IntegerDivisionInFloatingPointContext") @@ -175,6 +236,27 @@ public class GameRenderer extends Renderer { } + private void drawHealth(float x, float y) { + Player player = mMobsController.getPlayer(); + + if (player.gameMode == 1) { + return; + } + + TextureRegion wholeHeart = textureRegions.get("heart_whole"); + TextureRegion halfHeart = textureRegions.get("heart_half"); + + int wholeHearts = player.getHealth() / 2; + + for (int i = 0; i < wholeHearts; i++) { + spriter.draw(wholeHeart, x + i * wholeHeart.getRegionWidth(), y); + } + + if (player.getHealth() % 2 == 1) { + spriter.draw(halfHeart, x + wholeHearts * wholeHeart.getRegionWidth(), y); + } + } + private void drawGUI() { TextureRegion cursor = textureRegions.get("cursor"); TextureRegion hotbar = textureRegions.get("hotbar"); @@ -185,7 +267,11 @@ public class GameRenderer extends Renderer { mGameInput.getControlMode() == ControlMode.CURSOR || mMainConfig.isTouch()) { spriter.draw(cursor, mGameInput.getCurX() * 16 - getCamX(), mGameInput.getCurY() * 16 - getCamY()); } - spriter.draw(hotbar, getWidth() / 2 - (float) hotbar.getRegionWidth() / 2, 0); + + float hotbarX = getWidth() / 2 - (float) hotbar.getRegionWidth() / 2; + spriter.draw(hotbar, hotbarX, 0); + drawHealth(hotbarX, hotbar.getRegionHeight()); + for (int i = 0; i < 9; i++) { if (mMobsController.getPlayer().inventory[i] > 0) { if (GameItems.getItem(mMobsController.getPlayer().inventory[i]).isBlock()) { @@ -220,7 +306,7 @@ public class GameRenderer extends Renderer { drawWorld(true); player.draw(spriter, player.getX() - getCamX() - player.getWidth() / 2, player.getY() - getCamY(), delta); - mMobsController.forEach( (mob) -> { drawMob(mob, delta); }); + mMobsController.getMobs().forEach( (mob) -> { drawMob(mob, delta); }); mDropController.forEach(this::drawDrop); drawWorld(false); drawGUI(); @@ -285,7 +371,7 @@ public class GameRenderer extends Renderer { @Override public void render(float delta) { - int fps = (int) (1 / delta); + int fps = MathUtils.ceil(1 / delta); updateCameraPosition(); mGameInput.moveCursor(this); @@ -323,7 +409,7 @@ public class GameRenderer extends Renderer { drawString("CurY: " + mGameInput.getCurY(), 0, 40); drawString("Velocity: " + player.getVelocity(), 0, 50); drawString("Swim: " + player.swim, 0, 60); - drawString("Mobs: " + mMobsController.getSize(), 0, 70); + drawString("Mobs: " + mMobsController.getMobs().size(), 0, 70); drawString("Drops: " + mDropController.getSize(), 0, 80); drawString("Block: " + GameItems.getBlockKey(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())), 0, 90); drawString("Hand: " + GameItems.getItemKey(mMobsController.getPlayer().inventory[mMobsController.getPlayer().slot]), 0, 100);