X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=682984a5611adc334464374b8aad5fa46223746f;hb=c9d399d3ae0b7f797d6fd62a4c22202a12a8825b;hp=6a41ea26f1a25e56005adb997dea168b9f1714ec;hpb=083e40ac85e4aca2df81d1ca16c0a54561c3bd38;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index 6a41ea2..682984a 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -6,6 +6,7 @@ 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; @@ -18,25 +19,42 @@ public class GameRenderer { private GameProc gameProc; - public Vector3 camTargetPos; - public OrthographicCamera camera; + public boolean showCreative = false; + + public OrthographicCamera camera, fontCam, touchCam; ShapeRenderer shapeRenderer; - SpriteBatch spriteBatch; + SpriteBatch spriteBatch, fontBatch, touchBatch; public GameRenderer(GameProc gameProc) { Gdx.gl.glClearColor(0f,.6f,.6f,1f); this.gameProc = gameProc; 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(); + camera.setToOrtho(true, 480, + 480*((float)GameScreen.getHeight()/GameScreen.getWidth())); + shapeRenderer = new ShapeRenderer(); shapeRenderer.setProjectionMatrix(camera.combined); shapeRenderer.setAutoShapeType(true); spriteBatch = new SpriteBatch(); spriteBatch.setProjectionMatrix(camera.combined); + + fontCam = new OrthographicCamera(); + fontCam.setToOrtho(true, GameScreen.getWidth(), GameScreen.getHeight()); + fontBatch = new SpriteBatch(); + fontBatch.setProjectionMatrix(fontCam.combined); + touchCam = new OrthographicCamera(); + touchCam.setToOrtho(true, 240, + 240*((float)GameScreen.getHeight()/GameScreen.getWidth())); + touchBatch = new SpriteBatch(); + touchBatch.setProjectionMatrix(touchCam.combined); + } + + private void setFontColor(int r, int g, int b) { + Assets.minecraftFont.setColor(r/255f, g/255f, b/255f, 1f); + } + + private void drawString(String str, float x, float y) { + Assets.minecraftFont.draw(fontBatch, str, x, y); } private void drawWorld() { @@ -50,7 +68,8 @@ public class GameRenderer { if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight(); for (int y=minY; y0) { + if (gameProc.world.getForeMap(x,y)>0 && + !Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).foreground) { spriteBatch.draw( Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(), x * 16 - camera.position.x,y * 16 - camera.position.y); @@ -65,20 +84,89 @@ public class GameRenderer { } } + private void drawWorldForeground(){ + int minX = (int) (camera.position.x/16); + int minY = (int) (camera.position.y/16); + int maxX = (int) ((camera.position.x+camera.viewportWidth)/16)+1; + int maxY = (int) ((camera.position.y+camera.viewportHeight)/16)+1; + if (minX<0) minX=0; + if (minY<0) minY=0; + if (maxX>gameProc.world.getWidth()) maxX = gameProc.world.getWidth(); + if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight(); + for (int y=minY; y0 && + Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).foreground) { + spriteBatch.draw( + Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(), + x * 16 - camera.position.x,y * 16 - camera.position.y); + } + } + } + } + private void drawMob(Mob mob) { - spriteBatch.draw(Assets.playerSkin[mob.dir], - mob.position.x - camera.position.x, mob.position.y - camera.position.y); + mob.draw(spriteBatch, + mob.position.x-camera.position.x, mob.position.y-camera.position.y); } private void drawPlayer(Player pl) { - spriteBatch.draw(Assets.playerSkin[pl.dir], - pl.position.x - camera.position.x, pl.position.y - camera.position.y); + 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.playerSkin[0][2].draw(spriteBatch); + } + + private void drawCreative() { + float x = camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2; + float y = camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2; + spriteBatch.draw(Assets.creativeInv, x, y); + spriteBatch.draw(Assets.creativeScroll, x+156, y+18); + for (int i=1; i0) + spriteBatch.draw(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(), + x+8+i*18, y+184); + } } private void drawGUI() { - spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2, - 0);//camera.viewportHeight - Assets.invBar.getRegionHeight()); - for (int i=0; i<8; i++) { + 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(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(), camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20, @@ -89,20 +177,18 @@ public class GameRenderer { 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); - } - } + if (showCreative) drawCreative(); + } + + private void drawTouchGui() { + touchBatch.draw(Assets.touchArrows[0],26,touchCam.viewportHeight-52); + touchBatch.draw(Assets.touchArrows[1],0,touchCam.viewportHeight-26); + touchBatch.draw(Assets.touchArrows[2],26,touchCam.viewportHeight-26); + touchBatch.draw(Assets.touchArrows[3],52,touchCam.viewportHeight-26); + //touchBatch.draw(Assets.touchSpace, touchCam.viewportWidth/2-52, touchCam.viewportHeight-26); + touchBatch.draw(Assets.touchLMB, touchCam.viewportWidth-52, touchCam.viewportHeight-26); + touchBatch.draw(Assets.touchRMB, touchCam.viewportWidth-26, touchCam.viewportHeight-26); + touchBatch.draw(Assets.touchToggleMode, 78, touchCam.viewportHeight-26); } public void render() { @@ -110,13 +196,18 @@ public class GameRenderer { spriteBatch.begin(); drawWorld(); - for (Mob mob : gameProc.mobs) { - drawMob(mob); - } + for (Mob mob : gameProc.mobs) drawMob(mob); drawPlayer(gameProc.player); + drawWorldForeground(); drawGUI(); spriteBatch.end(); + if (CaveGame.TOUCH) { + touchBatch.begin(); + drawTouchGui(); + touchBatch.end(); + } + if (gameProc.ctrlMode==1) { shapeRenderer.begin(ShapeRenderer.ShapeType.Line); shapeRenderer.setColor(Color.ORANGE); @@ -125,6 +216,19 @@ public class GameRenderer { 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+gameProc.player.texWidth/2)/16), + (int)(gameProc.player.position.y/16+2))), + 0, 80); + fontBatch.end(); } }