X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=3d3a8f60b8a67b6999e81a097bdacb5dcf939d44;hb=0b8922bfbb2bbec067b532ecb7912f6afe02c4ef;hp=58564bf3300e5a301c7a3969a83573e81a4abf5b;hpb=c938382b1332c47e7119f742711960c7cc4c75ca;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index 58564bf..3d3a8f6 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -1,11 +1,15 @@ package ru.deadsoftware.cavecraft.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 com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector2; 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; @@ -73,6 +77,18 @@ public class GameRenderer extends Renderer { mob.position.x-camera.position.x+gameProc.world.getWidth()*16, mob.position.y-camera.position.y); } + private void drawDrop(Drop drop) { + switch (Items.ITEMS.get(drop.getId()).getType()) { + case 0: + Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].setPosition(drop.position.x-camera.position.x-gameProc.world.getWidth()*16, drop.position.y-camera.position.y); + Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].draw(spriteBatch); + Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].setPosition(drop.position.x-camera.position.x, drop.position.y-camera.position.y); + Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].draw(spriteBatch); + Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].setPosition(drop.position.x-camera.position.x+gameProc.world.getWidth()*16, drop.position.y-camera.position.y); + Assets.blockTextures[Items.ITEMS.get(drop.getId()).getTexture()].draw(spriteBatch); + } + } + private void drawPlayer(Player pl) { if (!pl.moveX.equals(Vector2.Zero) || Assets.playerSprite[0][2].getRotation()!=0) { Assets.playerSprite[0][2].rotate(Player.ANIM_SPEED); @@ -110,6 +126,26 @@ public class GameRenderer extends Renderer { //body spriteBatch.draw(Assets.playerSprite[pl.dir][1], pl.position.x - camera.position.x - 2, pl.position.y - camera.position.y + 8); + //item in hand + if (pl.inventory[gameProc.invSlot]>0) + switch (Items.ITEMS.get(pl.inventory[gameProc.invSlot]).getType()) { + case 0: + Assets.blockTextures[Items.ITEMS.get(pl.inventory[gameProc.invSlot]).getTexture()].setPosition( + pl.position.x - camera.position.x - 8*MathUtils.sin(MathUtils.degRad*Assets.playerSprite[0][2].getRotation()), + pl.position.y - camera.position.y + 6 + 8*MathUtils.cos(MathUtils.degRad*Assets.playerSprite[0][2].getRotation())); + Assets.blockTextures[Items.ITEMS.get(pl.inventory[gameProc.invSlot]).getTexture()].draw(spriteBatch); + break; + default: + Assets.itemTextures[Items.ITEMS.get(pl.inventory[gameProc.invSlot]).getTexture()].flip((pl.dir==0), false); + Assets.itemTextures[Items.ITEMS.get(pl.inventory[gameProc.invSlot]).getTexture()].setRotation( + -45+pl.dir*90+Assets.playerSprite[0][2].getRotation()); + Assets.itemTextures[Items.ITEMS.get(pl.inventory[gameProc.invSlot]).getTexture()].setPosition( + pl.position.x - camera.position.x -10+(12*pl.dir) - 8*MathUtils.sin(MathUtils.degRad*Assets.playerSprite[0][2].getRotation()), + pl.position.y - camera.position.y + 2 + 8*MathUtils.cos(MathUtils.degRad*Assets.playerSprite[0][2].getRotation())); + Assets.itemTextures[Items.ITEMS.get(pl.inventory[gameProc.invSlot]).getTexture()].draw(spriteBatch); + Assets.itemTextures[Items.ITEMS.get(pl.inventory[gameProc.invSlot]).getTexture()].flip((pl.dir==0), false); + break; + } //front hand Assets.playerSprite[0][2].setPosition( pl.position.x - camera.position.x - 6, @@ -124,31 +160,65 @@ public class GameRenderer extends Renderer { spriteBatch.draw(Assets.creativeScroll, x+156, y+18+(gameProc.creativeScroll*(72/gameProc.maxCreativeScroll))); for (int i=gameProc.creativeScroll*8; i0 && i0 && i0) - spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()], - x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24); + switch (Items.ITEMS.get(gameProc.player.inventory[i]).getType()) { + case 0: + spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(gameProc.player.inventory[i]).getTexture()], + x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24); + break; + case 1: + spriteBatch.draw(Assets.itemTextures[Items.ITEMS.get(gameProc.player.inventory[i]).getTexture()], + x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24); + break; + } } } private void drawGUI() { + if (gameProc.blockDmg > 0) { + spriteBatch.draw(Assets.wreck[ + 10*gameProc.blockDmg/ + Items.BLOCKS.getValueAt(gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)).getHp()], + gameProc.cursorX*16-camera.position.x, + gameProc.cursorY*16-camera.position.y); + } if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)>0 || gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY)>0 || - gameProc.ctrlMode==1) + gameProc.ctrlMode==1 || + !CaveGame.TOUCH) spriteBatch.draw(Assets.guiCur, gameProc.cursorX*16-camera.position.x, gameProc.cursorY*16-camera.position.y); spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2, 0); for (int i=0; i<9; i++) { if (gameProc.player.inventory[i]>0) { - spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()], - camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20, - 3); + switch (Items.ITEMS.get(gameProc.player.inventory[i]).getType()) { + case 0: + spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(gameProc.player.inventory[i]).getTexture()], + camera.viewportWidth / 2 - Assets.invBar.getRegionWidth() / 2 + 3 + i * 20, + 3); + break; + case 1: + spriteBatch.draw(Assets.itemTextures[Items.ITEMS.get(gameProc.player.inventory[i]).getTexture()], + camera.viewportWidth / 2 - Assets.invBar.getRegionWidth() / 2 + 3 + i * 20, + 3); + break; + } } } spriteBatch.draw(Assets.invBarCur, @@ -172,9 +242,9 @@ public class GameRenderer extends Renderer { private void drawGamePlay() { drawWorldBackground(); - //Mob.animateMobs(); - for (Mob mob : gameProc.mobs) drawMob(mob); drawPlayer(gameProc.player); + for (Mob mob : gameProc.mobs) drawMob(mob); + for (Drop drop : gameProc.drops) drawDrop(drop); drawWorldForeground(); drawGUI(); } @@ -201,6 +271,8 @@ public class GameRenderer extends Renderer { drawString("X: "+(int)(gameProc.player.position.x/16),0, 10); drawString("Y: "+(int)(gameProc.player.position.y/16),0, 20); drawString("Mobs: "+gameProc.mobs.size(), 0, 30); + drawString("Drops: "+gameProc.drops.size(), 0, 40); + drawString("Block: "+Items.BLOCKS.getKeyAt(gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)), 0, 50); } spriteBatch.end();