X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameRenderer.java;h=c18ee5393ce9482fa245a2e246585b268c2cb054;hb=3fdc2291218f6d3903ce923563d1e12051690c37;hp=864938d83b35db74a152d17f90ef4480a30897d4;hpb=97fa700baa58d95bd4b655366a35bcdac4bcaac9;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java index 864938d..c18ee53 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java @@ -3,22 +3,31 @@ 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.Rectangle; +import com.badlogic.gdx.math.Vector2; +import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack; 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.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 { @@ -67,14 +76,14 @@ public class GameRenderer extends Renderer { if (drawBG) { if ((!mGameWorld.hasForeAt(x, y) || mGameWorld.getForeMapBlock(x, y).isTransparent()) && mGameWorld.hasBackAt(x, y)) { - spriter.draw(mGameWorld.getBackMapBlock(x, y).getTexture(), drawX(x), drawY(y)); + mGameWorld.getBackMapBlock(x, y).draw(spriter, drawX(x), drawY(y)); if (!mGameWorld.hasForeAt(x, y) && x == mGameInput.getCurX() && y == mGameInput.getCurY()) { drawWreck(mGameWorld.getBackMap(mGameInput.getCurX(), mGameInput.getCurY())); } } } if (mGameWorld.hasForeAt(x, y) && mGameWorld.getForeMapBlock(x, y).isBackground() == drawBG) { - spriter.draw(mGameWorld.getForeMapBlock(x, y).getTexture(), drawX(x), drawY(y)); + mGameWorld.getForeMapBlock(x, y).draw(spriter, drawX(x), drawY(y)); if (x == mGameInput.getCurX() && y == mGameInput.getCurY()) { drawWreck(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())); } @@ -117,7 +126,33 @@ public class GameRenderer extends Renderer { } } - private void drawMob(Mob mob) { + 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(); @@ -129,10 +164,33 @@ public class GameRenderer extends Renderer { return; } - mob.draw(spriter, mobDrawX, mobDrawY); + mob.draw(spriter, mobDrawX, mobDrawY, delta); } 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") @@ -210,12 +268,12 @@ public class GameRenderer extends Renderer { } } - private void drawGamePlay() { + private void drawGamePlay(float delta) { Player player = mMobsController.getPlayer(); drawWorld(true); - player.draw(spriter, player.getX() - getCamX() - player.getWidth() / 2, player.getY() - getCamY()); - mMobsController.forEach(this::drawMob); + player.draw(spriter, player.getX() - getCamX() - player.getWidth() / 2, player.getY() - getCamY(), delta); + mMobsController.forEach( (mob) -> { drawMob(mob, delta); }); mDropController.forEach(this::drawDrop); drawWorld(false); drawGUI(); @@ -227,6 +285,57 @@ public class GameRenderer extends Renderer { player.getY() + player.getHeight() / 2 - getHeight() / 2); } + @Nullable + private Color getMinimapColor(int x, int y) { + @Nullable Color result = null; + + final boolean hasForeMap = mGameWorld.hasForeAt(x, y); + final boolean hasBackMap = mGameWorld.hasBackAt(x, y); + + if (hasForeMap) { + final Block block = mGameWorld.getForeMapBlock(x, y); + + if (GameItems.isWater(block)) { + result = Color.BLUE; + } else if (GameItems.isLava(block)) { + result = Color.RED; + } else { + result = Color.BLACK; + } + } else if (hasBackMap) { + result = Color.DARK_GRAY; + } + + return result; + } + + private void drawMiniMap(float miniMapX, float miniMapY, float size) { + shaper.begin(ShapeRenderer.ShapeType.Filled); + + shaper.setColor(Color.LIGHT_GRAY); + shaper.rect(miniMapX, miniMapY, size, size); + + for (int x = 0; x < size; x++) { + for (int y = 0; y < size; y++) { + + final int worldX = (int) (mMobsController.getPlayer().getMapX() - size / 2 + x); + final int worldY = (int) (mMobsController.getPlayer().getUpperMapY() - size / 2 + y); + + @Nullable + final Color color = getMinimapColor(worldX, worldY); + + if (color != null) { + shaper.setColor(color); + shaper.rect(miniMapX + x, miniMapY + y, 1, 1); + } + } + } + + shaper.setColor(Color.OLIVE); + shaper.rect(miniMapX + size / 2, miniMapY + size / 2, 1, 2); + shaper.end(); + } + @Override public void render(float delta) { int fps = (int) (1 / delta); @@ -237,7 +346,7 @@ public class GameRenderer extends Renderer { spriter.begin(); - drawGamePlay(); + drawGamePlay(delta); switch (mMainConfig.getGameUiWindow()) { case CREATIVE_INVENTORY: @@ -254,32 +363,7 @@ public class GameRenderer extends Renderer { spriter.end(); if (mMainConfig.isShowMap()) { - //DRAW MAP - shaper.begin(ShapeRenderer.ShapeType.Filled); - shaper.setColor(Color.LIGHT_GRAY); - shaper.rect(0, 0, mGameWorld.getWidth(), 128); - for (int y = 128; y < 256; y++) { - for (int x = 0; x < getWidth(); x++) { - if (mGameWorld.hasForeAt(x, y) || mGameWorld.hasBackAt(x, y)) { - if (GameItems.isWater(mGameWorld.getForeMap(x, y))) { - shaper.setColor(Color.BLUE); - } else if (GameItems.isLava(mGameWorld.getForeMap(x, y))) { - shaper.setColor(Color.RED); - } else { - if (mGameWorld.hasForeAt(x, y)) { - shaper.setColor(Color.BLACK); - } else { - shaper.setColor(Color.DARK_GRAY); - } - } - shaper.rect(x, y - 128, 1, 1); - } - } - } - shaper.setColor(Color.OLIVE); - shaper.rect(mMobsController.getPlayer().getMapX(), mMobsController.getPlayer().getUpperMapY() - 128, 1, 2); - shaper.end(); - //================= + drawMiniMap(getWidth() - 64f - 24f, 24f, 64f); } if (mMainConfig.isShowInfo()) { @@ -290,11 +374,14 @@ public class GameRenderer extends Renderer { drawString("Y: " + player.getUpperMapY(), 0, 20); drawString("CurX: " + mGameInput.getCurX(), 0, 30); drawString("CurY: " + mGameInput.getCurY(), 0, 40); - drawString("Mobs: " + mMobsController.getSize(), 0, 50); - drawString("Drops: " + mDropController.getSize(), 0, 60); - drawString("Block: " + GameItems.getBlockKey(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())), 0, 70); - drawString("Hand: " + GameItems.getItemKey(mMobsController.getPlayer().inventory[mMobsController.getPlayer().slot]), 0, 80); - drawString("Game mode: " + player.gameMode, 0, 90); + drawString("Velocity: " + player.getVelocity(), 0, 50); + drawString("Swim: " + player.swim, 0, 60); + drawString("Mobs: " + mMobsController.getSize(), 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); + drawString("Game mode: " + player.gameMode, 0, 110); + drawString("Check swim: " + GameItems.isFluid(mGameWorld.getForeMap(player.getMapX(), player.getLowerMapY())), 0, 120); spriter.end(); }