X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=72686d11e6484a83a5091f09776f499965236267;hp=5560bf6853b799b14af11656dcb0e57407507ef6;hb=99a56427db13dd0ecd025e433a438b77245cb739;hpb=e31e819b4fc6afdc3612e0ada5066dab638e89ac diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index 5560bf6..72686d1 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -2,12 +2,10 @@ package ru.deadsoftware.cavecraft.game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.math.MathUtils; import ru.deadsoftware.cavecraft.CaveGame; import ru.deadsoftware.cavecraft.GameScreen; import ru.deadsoftware.cavecraft.game.mobs.Mob; import ru.deadsoftware.cavecraft.game.objects.Drop; -import ru.deadsoftware.cavecraft.game.objects.Player; import ru.deadsoftware.cavecraft.misc.Assets; import ru.deadsoftware.cavecraft.misc.Renderer; @@ -15,7 +13,7 @@ public class GameRenderer extends Renderer { private GameProc gp; - public GameRenderer(GameProc gp, float width, float heigth) { + GameRenderer(GameProc gp, float width, float heigth) { super(width, heigth); Gdx.gl.glClearColor(0f, .6f, .6f, 1f); this.gp = gp; @@ -39,37 +37,29 @@ public class GameRenderer extends Renderer { } } - private void drawWorldBackground() { - int minX = (int) (getCamX() / 16) - 1; - int minY = (int) (getCamY() / 16) - 1; - 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(); - 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)).tp) - && gp.world.getBackMap(x, y) > 0) { - spriter.draw( - 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)); - Assets.shade.setPosition(drawX(x), drawY(y)); - Assets.shade.draw(spriter); - } - if (gp.world.getForeMap(x, y) > 0 && GameItems.getBlock(gp.world.getForeMap(x, y)).bg) { - spriter.draw( - 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)); - } + 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) { + spriter.draw( + 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)); + Assets.shade.setPosition(drawX(x), drawY(y)); + Assets.shade.draw(spriter); } } + 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)); + if (x == gp.curX && y == gp.curY) + drawWreck(gp.world.getForeMap(gp.curX, gp.curY)); + } } - private void drawWorldForeground() { + private void drawWorld(boolean bg) { int minX = (int) (getCamX() / 16) - 1; int minY = (int) (getCamY() / 16) - 1; int maxX = (int) ((getCamX() + getWidth()) / 16) + 1; @@ -78,31 +68,30 @@ public class GameRenderer extends Renderer { if (maxY > gp.world.getHeight()) maxY = gp.world.getHeight(); 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)).bg) { - spriter.draw( - 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)); - } + drawBlock(x, y, bg); } } } private void drawMob(Mob mob) { - mob.draw(spriter, - mob.pos.x - getCamX() - gp.world.getWidth() * 16, mob.pos.y - getCamY()); - mob.draw(spriter, - mob.pos.x - getCamX(), mob.pos.y - getCamY()); - mob.draw(spriter, - mob.pos.x - getCamX() + gp.world.getWidth() * 16, mob.pos.y - getCamY()); + 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() >= 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); } 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.getWidth() * 16, + 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( @@ -110,84 +99,19 @@ 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.getWidth() * 16, + drop.pos.x - getCamX() + gp.world.getWidthPx(), drop.pos.y - getCamY()); Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter); } } - private void drawPlayer(Player pl) { - if (pl.move.x != 0 || Assets.plSprite[0][2].getRotation() != 0) { - Assets.plSprite[0][2].rotate(Player.ANIM_SPEED); - Assets.plSprite[1][2].rotate(-Player.ANIM_SPEED); - Assets.plSprite[0][3].rotate(-Player.ANIM_SPEED); - Assets.plSprite[1][3].rotate(Player.ANIM_SPEED); - } else { - Assets.plSprite[0][2].setRotation(0); - Assets.plSprite[1][2].setRotation(0); - Assets.plSprite[0][3].setRotation(0); - Assets.plSprite[1][3].setRotation(0); - } - if (Assets.plSprite[0][2].getRotation() >= 60 || Assets.plSprite[0][2].getRotation() <= -60) - Player.ANIM_SPEED = -Player.ANIM_SPEED; - - //back hand - Assets.plSprite[1][2].setPosition( - pl.pos.x - getCamX() - 6, - pl.pos.y - getCamY()); - Assets.plSprite[1][2].draw(spriter); - //back leg - Assets.plSprite[1][3].setPosition( - pl.pos.x - getCamX() - 6, - pl.pos.y - getCamY() + 10); - Assets.plSprite[1][3].draw(spriter); - //front leg - Assets.plSprite[0][3].setPosition( - pl.pos.x - getCamX() - 6, - pl.pos.y - getCamY() + 10); - Assets.plSprite[0][3].draw(spriter); - //head - spriter.draw(Assets.plSprite[pl.dir][0], - pl.pos.x - getCamX() - 2, - pl.pos.y - getCamY() - 2); - //body - spriter.draw(Assets.plSprite[pl.dir][1], - pl.pos.x - getCamX() - 2, pl.pos.y - getCamY() + 8); - //item in hand - if (pl.inv[gp.slot] > 0) { - float handRotation = MathUtils.degRad * Assets.plSprite[0][2].getRotation(); - switch (GameItems.getItem(pl.inv[gp.slot]).getType()) { - case 0: - Assets.blockTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setPosition( - pl.pos.x - getCamX() - 8 * MathUtils.sin(handRotation), - pl.pos.y - getCamY() + 6 + 8 * MathUtils.cos(handRotation)); - Assets.blockTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].draw(spriter); - break; - default: - Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].flip((pl.dir == 0), false); - Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setRotation( - -45 + pl.dir * 90 + Assets.plSprite[0][2].getRotation()); - Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setPosition( - pl.pos.x - getCamX() - 10 + (12 * pl.dir) - 8 * MathUtils.sin(handRotation), - pl.pos.y - getCamY() + 2 + 8 * MathUtils.cos(handRotation)); - Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].draw(spriter); - Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].flip((pl.dir == 0), false); - break; - } - } - //front hand - Assets.plSprite[0][2].setPosition( - pl.pos.x - getCamX() - 6, - pl.pos.y - getCamY()); - Assets.plSprite[0][2].draw(spriter); - } - + @SuppressWarnings("IntegerDivisionInFloatingPointContext") private void drawCreative() { - float x = getWidth() / 2 - Assets.creativeInv.getRegionWidth() / 2; - float y = getHeight() / 2 - Assets.creativeInv.getRegionHeight() / 2; + float x = getWidth() / 2 - (float) Assets.creativeInv.getRegionWidth() / 2; + 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 * (72 / gp.maxCreativeScroll))); + 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()) { @@ -244,7 +168,7 @@ public class GameRenderer extends Renderer { } } spriter.draw(Assets.invBarCur, - getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 - 1 + 20 * gp.slot, + getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 - 1 + 20 * gp.player.invSlot, -1); } @@ -263,11 +187,11 @@ public class GameRenderer extends Renderer { } private void drawGamePlay() { - drawWorldBackground(); - drawPlayer(gp.player); + 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); - drawWorldForeground(); + drawWorld(false); drawGUI(); } @@ -292,10 +216,12 @@ public class GameRenderer extends Renderer { 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("Mobs: " + gp.mobs.size(), 0, 30); - drawString("Drops: " + gp.drops.size(), 0, 40); - drawString("Block: " + GameItems.getBlockKey(gp.world.getForeMap(gp.curX, gp.curY)), 0, 50); - drawString("Game mode: " + gp.player.gameMode, 0, 60); + 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(); }