X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=59557a2b9418ceebdcc5fc1f229d05ba512aceb0;hb=50082e8304a80c41dd8b1c1d80142e7c91a2d924;hp=b93de89b8d756f9e42470882954f262fa0a03e2d;hpb=7895e461428b3cd6db4c606373081f063a9e0a2b;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index b93de89..59557a2 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -6,10 +6,13 @@ import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.math.Rectangle; +import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector3; import ru.deadsoftware.cavecraft.Assets; +import ru.deadsoftware.cavecraft.CaveGame; +import ru.deadsoftware.cavecraft.Items; import ru.deadsoftware.cavecraft.GameScreen; +import ru.deadsoftware.cavecraft.game.mobs.Mob; import ru.deadsoftware.cavecraft.game.objects.Player; public class GameRenderer { @@ -37,20 +40,6 @@ public class GameRenderer { spriteBatch.setProjectionMatrix(camera.combined); } - private void setColor(int r, int g, int b) { - shapeRenderer.setColor(r/255f, g/255f, b/255f, 1f); - } - - private void fillRect(float x, float y, float w, float h) { - shapeRenderer.set(ShapeRenderer.ShapeType.Filled); - shapeRenderer.rect(x,y,w,h); - } - - private void drawRect(float x, float y, float w, float h) { - shapeRenderer.set(ShapeRenderer.ShapeType.Line); - shapeRenderer.rect(x,y,w,h); - } - private void drawWorld() { int minX = (int) (camera.position.x/16); int minY = (int) (camera.position.y/16); @@ -63,44 +52,110 @@ public class GameRenderer { for (int y=minY; y0) { - setColor(128,128,128); - fillRect(x*16-camera.position.x, - y*16-camera.position.y,16,16); - setColor(0,0,0); - drawRect(x*16-camera.position.x, - y*16-camera.position.y,16,16); - } else { - if (gameProc.world.getBackMap(x,y)>0) { - setColor(64,64,64); - fillRect(x*16-camera.position.x, - y*16-camera.position.y,16,16); - setColor(0,0,0); - drawRect(x*16-camera.position.x, - y*16-camera.position.y,16,16); - } + spriteBatch.draw( + Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(), + x * 16 - camera.position.x,y * 16 - camera.position.y); + } else if (gameProc.world.getBackMap(x,y)>0) { + spriteBatch.draw( + Items.BLOCKS.getValueAt(gameProc.world.getBackMap(x,y)).getTexture(), + x * 16 - camera.position.x,y * 16 - camera.position.y); + Assets.shade.setPosition(x * 16 - camera.position.x,y * 16 - camera.position.y); + Assets.shade.draw(spriteBatch); } - } } - shapeRenderer.setColor(Color.ORANGE); - drawRect(gameProc.cursorX*16-camera.position.x, - gameProc.cursorY*16-camera.position.y,16,16); + } + + private void drawMob(Mob mob) { + mob.draw(spriteBatch, + mob.position.x-camera.position.x, mob.position.y-camera.position.y); } private void drawPlayer(Player pl) { - spriteBatch.begin(); - Assets.playerSprite[pl.dir].setPosition(pl.position.x - camera.position.x, + if (!pl.moveX.equals(Vector2.Zero)) { + Assets.playerSkin[0][2].rotate(Mob.ANIM_SPEED); + Assets.playerSkin[1][2].rotate(-Mob.ANIM_SPEED); + Assets.playerSkin[0][3].rotate(-Mob.ANIM_SPEED); + Assets.playerSkin[1][3].rotate(Mob.ANIM_SPEED); + } else { + Assets.playerSkin[0][2].setRotation(0); + Assets.playerSkin[1][2].setRotation(0); + Assets.playerSkin[0][3].setRotation(0); + Assets.playerSkin[1][3].setRotation(0); + } + if (Assets.playerSkin[0][2].getRotation()>=60 || Assets.playerSkin[0][2].getRotation()<=-60) + Mob.ANIM_SPEED = -Mob.ANIM_SPEED; + Assets.playerSkin[1][2].setPosition( + pl.position.x - camera.position.x - 6, pl.position.y - camera.position.y); - Assets.playerSprite[pl.dir].draw(spriteBatch); - spriteBatch.end(); + Assets.playerSkin[1][2].draw(spriteBatch); + Assets.playerSkin[1][3].setPosition( + pl.position.x - camera.position.x - 6, + pl.position.y - camera.position.y + 10); + Assets.playerSkin[1][3].draw(spriteBatch); + Assets.playerSkin[0][3].setPosition( + pl.position.x - camera.position.x - 6, + pl.position.y - camera.position.y + 10); + Assets.playerSkin[0][3].draw(spriteBatch); + + spriteBatch.draw(Assets.playerSkin[pl.dir][0], + pl.position.x - camera.position.x - 2, pl.position.y - camera.position.y - 2); + spriteBatch.draw(Assets.playerSkin[pl.dir][1], + pl.position.x - camera.position.x - 2, pl.position.y - camera.position.y + 8); + + Assets.playerSkin[0][2].setPosition( + pl.position.x - camera.position.x - 6, + pl.position.y - camera.position.y); + Assets.playerSkin[0][2].draw(spriteBatch); + } + + private void drawGUI() { + spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2, 0); + for (int i=0; i<8; i++) { + if (gameProc.player.inventory[i]>0) { + spriteBatch.draw(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(), + camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20, + 3); + } + } + spriteBatch.draw(Assets.invCur, + camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2 - 1 + 20*gameProc.invSlot, + -1); + + if (CaveGame.TOUCH) { + spriteBatch.draw(Assets.touchArrows[0],26,camera.viewportHeight-52); + spriteBatch.draw(Assets.touchArrows[1],0,camera.viewportHeight-26); + spriteBatch.draw(Assets.touchArrows[2],26,camera.viewportHeight-26); + spriteBatch.draw(Assets.touchArrows[3],52,camera.viewportHeight-26); + spriteBatch.draw(Assets.touchSpace, camera.viewportWidth/2-52, camera.viewportHeight-26); + spriteBatch.draw(Assets.touchLMB, camera.viewportWidth-52, camera.viewportHeight-26); + spriteBatch.draw(Assets.touchRMB, camera.viewportWidth-26, camera.viewportHeight-26); + spriteBatch.draw(Assets.touchToggleMode, 78, camera.viewportHeight-26); + if (gameProc.ctrlMode==1) { + Assets.shade.setPosition(83, camera.viewportHeight-21); + Assets.shade.draw(spriteBatch); + } + } } public void render() { Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); - shapeRenderer.begin(); + + spriteBatch.begin(); drawWorld(); - shapeRenderer.end(); + for (Mob mob : gameProc.mobs) drawMob(mob); drawPlayer(gameProc.player); + drawGUI(); + spriteBatch.end(); + + if (gameProc.ctrlMode==1) { + shapeRenderer.begin(ShapeRenderer.ShapeType.Line); + shapeRenderer.setColor(Color.ORANGE); + shapeRenderer.set(ShapeRenderer.ShapeType.Line); + shapeRenderer.rect(gameProc.cursorX * 16 - camera.position.x, + gameProc.cursorY * 16 - camera.position.y, 16, 16); + shapeRenderer.end(); + } } }