X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=cc3bcdee8c9f849e89f1d8184bb68b397c4660e8;hb=503cd1720db3f53b7cbf7e3819968044de29a465;hp=42bd07e21c7b20004514d3613709134272c6c8a4;hpb=226f349b0fcb10ca5b7d540ae632c8b7a6600439;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index 42bd07e..cc3bcde 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -6,20 +6,22 @@ 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.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 { private GameProc gameProc; - public Vector3 camTargetPos; - public OrthographicCamera camera; + public OrthographicCamera camera, fontCam; ShapeRenderer shapeRenderer; - SpriteBatch spriteBatch; + SpriteBatch spriteBatch, fontBatch; public GameRenderer(GameProc gameProc) { Gdx.gl.glClearColor(0f,.6f,.6f,1f); @@ -27,28 +29,25 @@ public class GameRenderer { camera = new OrthographicCamera(); camera.setToOrtho(true, 360, 360*((float)GameScreen.getHeight()/GameScreen.getWidth())); - camera.position.x=0; - camera.position.y=0; - camTargetPos = camera.position.cpy(); + shapeRenderer = new ShapeRenderer(); shapeRenderer.setProjectionMatrix(camera.combined); shapeRenderer.setAutoShapeType(true); spriteBatch = new SpriteBatch(); spriteBatch.setProjectionMatrix(camera.combined); - } - private void setColor(int r, int g, int b) { - shapeRenderer.setColor(r/255f, g/255f, b/255f, 1f); + fontCam = new OrthographicCamera(); + fontCam.setToOrtho(true, GameScreen.getWidth(), GameScreen.getHeight()); + fontBatch = new SpriteBatch(); + fontBatch.setProjectionMatrix(fontCam.combined); } - private void fillRect(float x, float y, float w, float h) { - shapeRenderer.set(ShapeRenderer.ShapeType.Filled); - shapeRenderer.rect(x,y,w,h); + private void setFontColor(int r, int g, int b) { + Assets.minecraftFont.setColor(r/255f, g/255f, b/255f, 1f); } - private void drawRect(float x, float y, float w, float h) { - shapeRenderer.set(ShapeRenderer.ShapeType.Line); - shapeRenderer.rect(x,y,w,h); + private void drawString(String str, float x, float y) { + Assets.minecraftFont.draw(fontBatch, str, x, y); } private void drawWorld() { @@ -77,39 +76,109 @@ public class GameRenderer { } } + 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) { - Assets.playerSprite[pl.dir].setPosition(pl.position.x - camera.position.x, + if (!pl.moveX.equals(Vector2.Zero) || Assets.playerSkin[0][2].getRotation()!=0) { + 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.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.playerSprite[pl.dir].draw(spriteBatch); + Assets.playerSkin[0][2].draw(spriteBatch); } private void drawGUI() { - spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2, - camera.viewportHeight - Assets.invBar.getRegionHeight()); + 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, - camera.viewportHeight-19); + 3); } } spriteBatch.draw(Assets.invCur, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2 - 1 + 20*gameProc.invSlot, - camera.viewportHeight - Assets.invBar.getRegionHeight() - 2); + -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); + spriteBatch.begin(); drawWorld(); + for (Mob mob : gameProc.mobs) drawMob(mob); drawPlayer(gameProc.player); drawGUI(); spriteBatch.end(); - shapeRenderer.begin(ShapeRenderer.ShapeType.Line); - shapeRenderer.setColor(Color.ORANGE); - drawRect(gameProc.cursorX*16-camera.position.x, - gameProc.cursorY*16-camera.position.y,16,16); - shapeRenderer.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(); + } + + fontBatch.begin(); + setFontColor(255,255,255); + drawString("CaveCraft "+CaveGame.VERSION, 0, 0); + drawString("FPS: "+GameScreen.FPS, 0, 20); + drawString("X: "+(int)(gameProc.player.position.x/16), 0, 40); + drawString("Y: "+(int)(gameProc.player.position.y/16), 0, 60); + drawString("Block: "+ + Items.BLOCKS.keys().toArray().get(gameProc.world.getForeMap( + (int)(gameProc.player.position.x/16), + (int)(gameProc.player.position.y/16+2))), + 0, 80); + fontBatch.end(); } }