X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameRenderer.java;h=252e77fe144ae79670dd014e9d1b217755692214;hb=7646ac0833becd8f9424908ee8bc142b7b3999f8;hp=1229fcb1e04ad68973c76726774598fc553e1313;hpb=0f0a00cc4c8b1d80006682491179c41a285ef846;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java index 1229fcb..252e77f 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java @@ -1,6 +1,7 @@ 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.glutils.ShapeRenderer; import ru.deadsoftware.cavedroid.CaveGame; @@ -41,17 +42,13 @@ public class GameRenderer extends Renderer { if (drawBG) { if ((GP.world.getForeMap(x, y) == 0 || GameItems.getBlock(GP.world.getForeMap(x, y)).isTransparent()) && GP.world.getBackMap(x, y) > 0) { - spriter.draw( - Assets.blockTex[GameItems.getBlock(GP.world.getBackMap(x, y)).getTex()], - drawX(x), drawY(y)); + spriter.draw(GameItems.getBlock(GP.world.getBackMap(x, y)).getTex(), drawX(x), drawY(y)); if (GP.world.getForeMap(x, y) == 0 && x == GP.curX && y == GP.curY) drawWreck(GP.world.getBackMap(GP.curX, GP.curY)); } } if (GP.world.getForeMap(x, y) > 0 && GameItems.getBlock(GP.world.getForeMap(x, y)).isBackground() == drawBG) { - spriter.draw( - Assets.blockTex[GameItems.getBlock(GP.world.getForeMap(x, y)).getTex()], - drawX(x), drawY(y)); + spriter.draw(GameItems.getBlock(GP.world.getForeMap(x, y)).getTex(), drawX(x), drawY(y)); if (x == GP.curX && y == GP.curY) drawWreck(GP.world.getForeMap(GP.curX, GP.curY)); } @@ -78,7 +75,8 @@ public class GameRenderer extends Renderer { for (int y = minY; y < maxY; y++) { for (int x = minX; x < maxX; x++) { if ((GP.world.getForeMap(x, y) == 0 || GameItems.getBlock(GP.world.getForeMap(x, y)).isTransparent()) - && GP.world.getBackMap(x, y) > 0) shaper.rect(drawX(x), drawY(y), 16, 16); + && GP.world.getBackMap(x, y) > 0) + shaper.rect(drawX(x), drawY(y), 16, 16); } } shaper.end(); @@ -102,21 +100,6 @@ public class GameRenderer extends Renderer { } private void drawDrop(Drop drop) { - switch (GameItems.getItem(drop.getId()).getType()) { - case 0: - Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition( - drop.pos.x - getCamX() - GP.world.getWidthPx(), - drop.pos.y - getCamY()); - Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter); - Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition( - drop.pos.x - getCamX(), - drop.pos.y - getCamY()); - Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter); - Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition( - drop.pos.x - getCamX() + GP.world.getWidthPx(), - drop.pos.y - getCamY()); - Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter); - } } @SuppressWarnings("IntegerDivisionInFloatingPointContext") @@ -128,34 +111,27 @@ public class GameRenderer extends Renderer { y + 18 + (GP.creativeScroll * (72f / GP.maxCreativeScroll))); for (int i = GP.creativeScroll * 8; i < GP.creativeScroll * 8 + 40; i++) { if (i > 0 && i < GameItems.getItemsSize()) - switch (GameItems.getItem(i).getType()) { - case 0: - spriter.draw(Assets.blockTex[GameItems.getItem(i).getTex()], - x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18, - y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18); - break; - case 1: - case 2: - spriter.draw(Assets.itemTex[GameItems.getItem(i).getTex()], - x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18, - y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18); - break; + if (GameItems.getItem(i).isBlock()) { + spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(i)).getTex(), + x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18, + y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18); + } else { + spriter.draw(GameItems.getItem(i).getTex(), + x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18, + y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18); } } for (int i = 0; i < 9; i++) { if (GP.player.inv[i] > 0) - switch (GameItems.getItem(GP.player.inv[i]).getType()) { - case 0: - spriter.draw(Assets.blockTex[GameItems.getItem(GP.player.inv[i]).getTex()], - x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24); - break; - case 1: - case 2: - spriter.draw(Assets.itemTex[GameItems.getItem(GP.player.inv[i]).getTex()], - x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24); - break; + if (GameItems.getItem(GP.player.inv[i]).isBlock()) { + spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(GP.player.inv[i])).getTex(), + x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24); + } else { + spriter.draw(GameItems.getItem(GP.player.inv[i]).getTex(), + x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24); } } + } private void drawGUI() { @@ -169,18 +145,14 @@ public class GameRenderer extends Renderer { spriter.draw(Assets.invBar, getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2, 0); for (int i = 0; i < 9; i++) { if (GP.player.inv[i] > 0) { - switch (GameItems.getItem(GP.player.inv[i]).getType()) { - case 0: - spriter.draw(Assets.blockTex[GameItems.getItem(GP.player.inv[i]).getTex()], - getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20, - 3); - break; - case 1: - case 2: - spriter.draw(Assets.itemTex[GameItems.getItem(GP.player.inv[i]).getTex()], - getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20, - 3); - break; + if (GameItems.getItem(GP.player.inv[i]).isBlock()) { + spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(GP.player.inv[i])).getTex(), + getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20, + 3); + } else { + spriter.draw(GameItems.getItem(GP.player.inv[i]).getTex(), + getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20, + 3); } } } @@ -198,8 +170,7 @@ public class GameRenderer extends Renderer { spriter.draw(Assets.touchRMB, getWidth() - 26, getHeight() - 26); spriter.draw(Assets.touchMode, 78, getHeight() - 26); if (GP.ctrlMode == 1) { - Assets.shade.setPosition(83, getHeight() - 21); - Assets.shade.draw(spriter); + spriter.draw(Assets.shade, 83, getHeight() - 21); } } @@ -229,6 +200,38 @@ public class GameRenderer extends Renderer { if (CaveGame.TOUCH) drawTouchGui(); + spriter.end(); + + if(GameScreen.SHOW_MAP) { + //DRAW MAP + shaper.begin(ShapeRenderer.ShapeType.Filled); + shaper.setColor(Color.LIGHT_GRAY); + shaper.rect(0, 0, GP.world.getWidth(), 128); + for (int y = 128; y < 256; y++) { + for (int x = 0; x < getWidth(); x++) { + if (GP.world.getForeMap(x, y) > 0 || GP.world.getBackMap(x, y) > 0) { + if (GameItems.isWater(GP.world.getForeMap(x, y))) { + shaper.setColor(Color.BLUE); + } else if (GameItems.isLava(GP.world.getForeMap(x, y))) { + shaper.setColor(Color.RED); + } else { + if (GP.world.getForeMap(x, y) > 0) { + shaper.setColor(Color.BLACK); + } else { + shaper.setColor(Color.DARK_GRAY); + } + } + shaper.rect(x, y - 128, 1, 1); + } + } + } + shaper.setColor(Color.OLIVE); + shaper.rect(GP.player.pos.x / 16, GP.player.pos.y / 16 - 128, 1, 2); + shaper.end(); + //================= + } + spriter.begin(); + if (GameScreen.SHOW_DEBUG) { drawString("FPS: " + GameScreen.FPS, 0, 0); drawString("X: " + (int) (GP.player.pos.x / 16), 0, 10); @@ -238,9 +241,12 @@ public class GameRenderer extends Renderer { drawString("Mobs: " + GP.mobs.size(), 0, 50); drawString("Drops: " + GP.drops.size(), 0, 60); drawString("Block: " + GameItems.getBlockKey(GP.world.getForeMap(GP.curX, GP.curY)), 0, 70); - drawString("Game mode: " + GP.player.gameMode, 0, 80); + drawString("Hand: " + GameItems.getItemKey(GP.player.inv[GP.player.invSlot]), 0, 80); + drawString("Game mode: " + GP.player.gameMode, 0, 90); } spriter.end(); + + } }