X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=ee9d6d4d9d68c83542c76877831bfc851259e784;hb=1cc111dfe31e7f7098e01afeaa025e19f91aa624;hp=3ba99c3ec2c999dc7faa9866e3cb3bc5cc1d4430;hpb=d4b230bcff9be349af3d450cf5fea0bf0ebf33b8;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index 3ba99c3..ee9d6d4 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -1,9 +1,13 @@ 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.Player; import ru.deadsoftware.cavecraft.misc.Assets; @@ -109,6 +113,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, @@ -122,32 +146,59 @@ public class GameRenderer extends Renderer { spriteBatch.draw(Assets.creativeInv, x, y); spriteBatch.draw(Assets.creativeScroll, x+156, y+18+(gameProc.creativeScroll*(72/gameProc.maxCreativeScroll))); - for (int i=gameProc.creativeScroll*40; i<(gameProc.creativeScroll+1)*40; i++) { - if (i>0 && 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.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, @@ -171,9 +222,8 @@ 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); drawWorldForeground(); drawGUI(); } @@ -195,6 +245,14 @@ public class GameRenderer extends Renderer { if (CaveGame.TOUCH) drawTouchGui(); + if (GameScreen.SHOW_DEBUG) { + drawString("FPS: "+GameScreen.FPS,0, 0); + 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("Block: "+Items.BLOCKS.getKeyAt(gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)), 0, 40); + } + spriteBatch.end(); }