X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=c5ec8df7aa5a7c842b9df33c2fa6916282226336;hp=3d65ddc68faf2db0ed563a673991698b3ace6b8e;hb=22eccb137bf9642700f762dd39cf02ea144bdca3;hpb=1c798d88e9c23d438e7fa770c9670b02a761f866 diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index 3d65ddc..c5ec8df 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -10,14 +10,13 @@ import ru.deadsoftware.cavecraft.game.objects.Drop; import ru.deadsoftware.cavecraft.misc.Assets; import ru.deadsoftware.cavecraft.misc.Renderer; -public class GameRenderer extends Renderer { +import static ru.deadsoftware.cavecraft.GameScreen.GP; - private GameProc gp; +public class GameRenderer extends Renderer { - GameRenderer(GameProc gp, float width, float heigth) { - super(width, heigth); + GameRenderer(float width, float height) { + super(width, height); Gdx.gl.glClearColor(0f, .6f, .6f, 1f); - this.gp = gp; } private float drawX(int x) { @@ -29,32 +28,32 @@ public class GameRenderer extends Renderer { } private void drawWreck(int bl) { - if (gp.blockDmg > 0) { + if (GP.blockDmg > 0) { spriter.draw(Assets.wreck[ - 10 * gp.blockDmg / + 10 * GP.blockDmg / GameItems.getBlock(bl).getHp()], - gp.curX * 16 - getCamX(), - gp.curY * 16 - getCamY()); + GP.curX * 16 - getCamX(), + GP.curY * 16 - getCamY()); } } private void drawBlock(int x, int y, boolean drawBG) { if (drawBG) { - if ((gp.world.getForeMap(x, y) == 0 || GameItems.getBlock(gp.world.getForeMap(x, y)).isTransparent()) - && gp.world.getBackMap(x, y) > 0) { + 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()], + Assets.blockTex[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 && 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) { + 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()], + Assets.blockTex[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)); + if (x == GP.curX && y == GP.curY) + drawWreck(GP.world.getForeMap(GP.curX, GP.curY)); } } @@ -64,7 +63,7 @@ public class GameRenderer extends Renderer { int maxX = (int) ((getCamX() + getWidth()) / 16) + 1; int maxY = (int) ((getCamY() + getHeight()) / 16) + 1; if (minY < 0) minY = 0; - if (maxY > gp.world.getHeight()) maxY = gp.world.getHeight(); + if (maxY > GP.world.getHeight()) maxY = GP.world.getHeight(); for (int y = minY; y < maxY; y++) { for (int x = minX; x < maxX; x++) { drawBlock(x, y, bg); @@ -78,8 +77,8 @@ 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 ((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); + 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); } } shaper.end(); @@ -92,21 +91,21 @@ public class GameRenderer extends Renderer { float mobDrawX = mob.pos.x - getCamX(); float mobDrawY = mob.pos.y - getCamY(); - if (mobDrawX + mob.getWidth() - gp.world.getWidthPx() >= 0 && mobDrawX - gp.world.getWidthPx() <= getWidth()) - mob.draw(spriter, mobDrawX - gp.world.getWidthPx(), mobDrawY); + if (mobDrawX + mob.getWidth() - GP.world.getWidthPx() >= 0 && mobDrawX - GP.world.getWidthPx() <= getWidth()) + mob.draw(spriter, mobDrawX - GP.world.getWidthPx(), mobDrawY); if (mobDrawX + mob.getWidth() >= 0 && mobDrawX <= getWidth()) mob.draw(spriter, mobDrawX, mobDrawY); - if (mobDrawX + mob.getWidth() + gp.world.getWidthPx() >= 0 && mobDrawX + gp.world.getWidthPx() <= getWidth()) - mob.draw(spriter, mobDrawX + gp.world.getWidthPx(), mobDrawY); + if (mobDrawX + mob.getWidth() + GP.world.getWidthPx() >= 0 && mobDrawX + GP.world.getWidthPx() <= getWidth()) + mob.draw(spriter, mobDrawX + GP.world.getWidthPx(), mobDrawY); } 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.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( @@ -114,7 +113,7 @@ public class GameRenderer extends Renderer { 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.x - getCamX() + GP.world.getWidthPx(), drop.pos.y - getCamY()); Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter); } @@ -126,31 +125,31 @@ public class GameRenderer extends Renderer { float y = getHeight() / 2 - (float) Assets.creativeInv.getRegionHeight() / 2; spriter.draw(Assets.creativeInv, x, y); spriter.draw(Assets.creativeScr, x + 156, - y + 18 + (gp.creativeScroll * (72f / gp.maxCreativeScroll))); - for (int i = gp.creativeScroll * 8; i < gp.creativeScroll * 8 + 40; i++) { + 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); + x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18, + y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18); break; case 1: spriter.draw(Assets.itemTex[GameItems.getItem(i).getTex()], - x + 8 + ((i - gp.creativeScroll * 8) % 8) * 18, - y + 18 + ((i - gp.creativeScroll * 8) / 8) * 18); + x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18, + y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18); break; } } for (int i = 0; i < 9; i++) { - if (gp.player.inv[i] > 0) - switch (GameItems.getItem(gp.player.inv[i]).getType()) { + 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()], + spriter.draw(Assets.blockTex[GameItems.getItem(GP.player.inv[i]).getTex()], x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24); break; case 1: - spriter.draw(Assets.itemTex[GameItems.getItem(gp.player.inv[i]).getTex()], + spriter.draw(Assets.itemTex[GameItems.getItem(GP.player.inv[i]).getTex()], x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24); break; } @@ -158,24 +157,24 @@ public class GameRenderer extends Renderer { } private void drawGUI() { - if (gp.world.getForeMap(gp.curX, gp.curY) > 0 || - gp.world.getBackMap(gp.curX, gp.curY) > 0 || - gp.ctrlMode == 1 || + if (GP.world.getForeMap(GP.curX, GP.curY) > 0 || + GP.world.getBackMap(GP.curX, GP.curY) > 0 || + GP.ctrlMode == 1 || !CaveGame.TOUCH) spriter.draw(Assets.guiCur, - gp.curX * 16 - getCamX(), - gp.curY * 16 - getCamY()); + GP.curX * 16 - getCamX(), + GP.curY * 16 - getCamY()); 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()) { + 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()], + 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: - spriter.draw(Assets.itemTex[GameItems.getItem(gp.player.inv[i]).getTex()], + spriter.draw(Assets.itemTex[GameItems.getItem(GP.player.inv[i]).getTex()], getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20, 3); break; @@ -183,7 +182,7 @@ public class GameRenderer extends Renderer { } } spriter.draw(Assets.invBarCur, - getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 - 1 + 20 * gp.player.invSlot, + getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 - 1 + 20 * GP.player.invSlot, -1); } @@ -195,7 +194,7 @@ public class GameRenderer extends Renderer { spriter.draw(Assets.touchLMB, getWidth() - 52, getHeight() - 26); spriter.draw(Assets.touchRMB, getWidth() - 26, getHeight() - 26); spriter.draw(Assets.touchMode, 78, getHeight() - 26); - if (gp.ctrlMode == 1) { + if (GP.ctrlMode == 1) { Assets.shade.setPosition(83, getHeight() - 21); Assets.shade.draw(spriter); } @@ -203,9 +202,9 @@ public class GameRenderer extends Renderer { private void drawGamePlay() { drawWorld(true); - gp.player.draw(spriter, gp.player.pos.x - getCamX() - 2, gp.player.pos.y - getCamY()); - for (Mob mob : gp.mobs) drawMob(mob); - for (Drop drop : gp.drops) drawDrop(drop); + GP.player.draw(spriter, GP.player.pos.x - getCamX() - 2, GP.player.pos.y - getCamY()); + for (Mob mob : GP.mobs) drawMob(mob); + for (Drop drop : GP.drops) drawDrop(drop); drawWorld(false); drawGUI(); } @@ -229,14 +228,14 @@ public class GameRenderer extends Renderer { if (GameScreen.SHOW_DEBUG) { drawString("FPS: " + GameScreen.FPS, 0, 0); - drawString("X: " + (int) (gp.player.pos.x / 16), 0, 10); - drawString("Y: " + (int) (gp.player.pos.y / 16), 0, 20); - drawString("CurX: " + gp.curX, 0, 30); - drawString("CurY: " + gp.curY, 0, 40); - 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("X: " + (int) (GP.player.pos.x / 16), 0, 10); + drawString("Y: " + (int) (GP.player.pos.y / 16), 0, 20); + drawString("CurX: " + GP.curX, 0, 30); + drawString("CurY: " + GP.curY, 0, 40); + 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); } spriter.end(); }