X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameRenderer.java;h=a3a9f015fb92b00a2f5fb0019a44af1650e7b3da;hb=289536374d18bb05cde615c04d9fe576d6ac26bc;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..a3a9f01 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java @@ -3,43 +3,52 @@ 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; +import kotlin.collections.CollectionsKt; 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.model.item.Item; import ru.deadsoftware.cavedroid.game.objects.Drop; import ru.deadsoftware.cavedroid.game.objects.DropController; import ru.deadsoftware.cavedroid.game.world.GameWorld; import ru.deadsoftware.cavedroid.misc.ControlMode; import ru.deadsoftware.cavedroid.misc.Renderer; +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 java.util.Collection; + +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; private final MobsController mMobsController; private final DropController mDropController; + private final GameItemsHolder mGameItemsHolder; @Inject GameRenderer(MainConfig mainConfig, GameInput gameInput, GameWorld gameWorld, MobsController mobsController, - DropController dropController) { + DropController dropController, + GameItemsHolder gameItemsHolder) { super(mainConfig.getWidth(), mainConfig.getHeight()); mMainConfig = mainConfig; @@ -47,6 +56,7 @@ public class GameRenderer extends Renderer { mGameWorld = gameWorld; mMobsController = mobsController; mDropController = dropController; + mGameItemsHolder = gameItemsHolder; Gdx.gl.glClearColor(0f, .6f, .6f, 1f); } @@ -59,10 +69,15 @@ public class GameRenderer extends Renderer { return y * 16 - getCamY(); } - private void drawWreck(int bl) { + private void drawWreck(Block bl) { if (mGameInput.getBlockDamage() > 0) { - int index = 10 * mGameInput.getBlockDamage() / GameItems.getBlock(bl).getHp(); + int index = 10 * mGameInput.getBlockDamage() / 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()); } @@ -70,16 +85,16 @@ public class GameRenderer extends Renderer { private void drawBlock(int x, int y, boolean drawBG) { if (drawBG) { - if ((!mGameWorld.hasForeAt(x, y) || mGameWorld.getForeMapBlock(x, y).isTransparent()) + if ((!mGameWorld.hasForeAt(x, y) || mGameWorld.getForeMap(x, y).isTransparent()) && mGameWorld.hasBackAt(x, y)) { - mGameWorld.getBackMapBlock(x, y).draw(spriter, drawX(x), drawY(y)); + mGameWorld.getBackMap(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) { - mGameWorld.getForeMapBlock(x, y).draw(spriter, drawX(x), drawY(y)); + if (mGameWorld.hasForeAt(x, y) && mGameWorld.getForeMap(x, y).isBackground() == drawBG) { + mGameWorld.getForeMap(x, y).draw(spriter, drawX(x), drawY(y)); if (x == mGameInput.getCurX() && y == mGameInput.getCurY()) { drawWreck(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())); } @@ -110,7 +125,7 @@ public class GameRenderer extends Renderer { shaper.setColor(0f, 0f, 0f, .5f); for (int y = minY; y < maxY; y++) { for (int x = minX; x < maxX; x++) { - if ((!mGameWorld.hasForeAt(x, y) || mGameWorld.getForeMapBlock(x, y).isTransparent()) + if ((!mGameWorld.hasForeAt(x, y) || mGameWorld.getForeMap(x, y).isTransparent()) && mGameWorld.hasBackAt(x, y)) { shaper.rect(drawX(x), drawY(y), 16, 16); } @@ -122,6 +137,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 +179,17 @@ public class GameRenderer extends Renderer { } private void drawDrop(Drop drop) { + @CheckForNull final Rectangle drawingRect = getDrawingRectIfInsideViewport(drop); + + if (drawingRect == null) { + return; + } + + final Sprite sprite = drop.getItem().getSprite(); + + sprite.setPosition(drawingRect.x, drawingRect.y); + sprite.setSize(drawingRect.width, drawingRect.height); + sprite.draw(spriter); } @SuppressWarnings("IntegerDivisionInFloatingPointContext") @@ -147,34 +199,48 @@ public class GameRenderer extends Renderer { float y = getHeight() / 2 - (float) creative.getRegionHeight() / 2; spriter.draw(creative, x, y); spriter.draw(textureRegions.get("handle"), x + 156, - y + 18 + (mGameInput.getCreativeScroll() * (72f / GameProc.MAX_CREATIVE_SCROLL))); + y + 18 + (mGameInput.getCreativeScroll() * (72f / mGameItemsHolder.getCreativeScrollAmount()))); + final Collection items = mGameItemsHolder.getAllItems(); for (int i = mGameInput.getCreativeScroll() * 8; i < mGameInput.getCreativeScroll() * 8 + 40; i++) { - if (i > 0 && i < GameItems.getItemsSize()) { - if (GameItems.getItem(i).isBlock()) { - spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(i)).getTexture(), - x + 8 + ((i - mGameInput.getCreativeScroll() * 8) % 8) * 18, - y + 18 + ((i - mGameInput.getCreativeScroll() * 8) / 8) * 18); - } else { - spriter.draw(GameItems.getItem(i).getTexture(), + if (i > 0 && i < items.size()) { + Item item = CollectionsKt.elementAt(items, i); + if (item != mGameItemsHolder.getFallbackItem()) { + spriter.draw(CollectionsKt.elementAt(items, i).getSprite(), x + 8 + ((i - mGameInput.getCreativeScroll() * 8) % 8) * 18, y + 18 + ((i - mGameInput.getCreativeScroll() * 8) / 8) * 18); } } } for (int i = 0; i < 9; i++) { - if (mMobsController.getPlayer().inventory[i] > 0) { - if (GameItems.getItem(mMobsController.getPlayer().inventory[i]).isBlock()) { - spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(mMobsController.getPlayer().inventory[i])).getTexture(), - x + 8 + i * 18, y + creative.getRegionHeight() - 24); - } else { - spriter.draw(GameItems.getItem(mMobsController.getPlayer().inventory[i]).getTexture(), - x + 8 + i * 18, y + creative.getRegionHeight() - 24); - } + if (mMobsController.getPlayer().inventory[i] != null && mMobsController.getPlayer().inventory[i].getItem() != mGameItemsHolder.getFallbackItem()) { + spriter.draw(mMobsController.getPlayer().inventory[i].getItem().getSprite(), + x + 8 + i * 18, y + creative.getRegionHeight() - 24); } } } + 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,18 +251,16 @@ 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()) { - spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(mMobsController.getPlayer().inventory[i])).getTexture(), - getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20, - 3); - } else { - spriter.draw(GameItems.getItem(mMobsController.getPlayer().inventory[i]).getTexture(), - getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20, - 3); - } + if (mMobsController.getPlayer().inventory[i] != null && mMobsController.getPlayer().inventory[i].getItem() != mGameItemsHolder.getFallbackItem()) { + spriter.draw(mMobsController.getPlayer().inventory[i].getItem().getSprite(), + getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20, + 3); } } spriter.draw(hotbarSelector, @@ -220,7 +284,9 @@ 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(); @@ -240,11 +306,11 @@ public class GameRenderer extends Renderer { final boolean hasBackMap = mGameWorld.hasBackAt(x, y); if (hasForeMap) { - final Block block = mGameWorld.getForeMapBlock(x, y); + final Block block = mGameWorld.getForeMap(x, y); - if (GameItems.isWater(block)) { + if (block.isWater()) { result = Color.BLUE; - } else if (GameItems.isLava(block)) { + } else if (block.isLava()) { result = Color.RED; } else { result = Color.BLACK; @@ -268,8 +334,7 @@ public class GameRenderer extends Renderer { 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); + @Nullable final Color color = getMinimapColor(worldX, worldY); if (color != null) { shaper.setColor(color); @@ -285,7 +350,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,12 +388,11 @@ 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); + drawString("Block: " + mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY()).getParams().getKey(), 0, 90); + drawString("Hand: " + mMobsController.getPlayer().inventory[mMobsController.getPlayer().slot].getItem().getParams().getKey(), 0, 100); drawString("Game mode: " + player.gameMode, 0, 110); - drawString("Check swim: " + GameItems.isFluid(mGameWorld.getForeMap(player.getMapX(), player.getLowerMapY())), 0, 120); spriter.end(); }