X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=5a82102a3fafaaa00fcd0dd6a30ec2522e913f1e;hb=20c99e213303aee769c1bf6320881badb524384f;hp=00508b2b74e153bdeb219000c0bb5c9cc99b6274;hpb=e5f474791112f95004f7e8f8ec96661884d7373f;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index 00508b2..5a82102 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -1,13 +1,12 @@ 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.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; @@ -19,8 +18,6 @@ public class GameRenderer { private GameProc gameProc; - public boolean showCreative = false; - public OrthographicCamera camera, fontCam; ShapeRenderer shapeRenderer; SpriteBatch spriteBatch, fontBatch; @@ -29,9 +26,13 @@ public class GameRenderer { Gdx.gl.glClearColor(0f,.6f,.6f,1f); this.gameProc = gameProc; camera = new OrthographicCamera(); - camera.setToOrtho(true, 480, - 480*((float)GameScreen.getHeight()/GameScreen.getWidth())); - + if (!CaveGame.TOUCH) { + camera.setToOrtho(true, 480, + 480 * ((float) GameScreen.getHeight() / GameScreen.getWidth())); + } else { + camera.setToOrtho(true, 320, + 320 * ((float) GameScreen.getHeight() / GameScreen.getWidth())); + } shapeRenderer = new ShapeRenderer(); shapeRenderer.setProjectionMatrix(camera.combined); shapeRenderer.setAutoShapeType(true); @@ -63,11 +64,11 @@ 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); + 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(), @@ -90,8 +91,8 @@ public class GameRenderer { if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight(); for (int y=minY; y0 && - Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).foreground) { + 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); @@ -106,46 +107,52 @@ public class GameRenderer { } private void drawPlayer(Player pl) { - 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); + if (!pl.moveX.equals(Vector2.Zero) || Assets.playerSprite[0][2].getRotation()!=0) { + Assets.playerSprite[0][2].rotate(Player.ANIM_SPEED); + Assets.playerSprite[1][2].rotate(-Player.ANIM_SPEED); + Assets.playerSprite[0][3].rotate(-Player.ANIM_SPEED); + Assets.playerSprite[1][3].rotate(Player.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); + Assets.playerSprite[0][2].setRotation(0); + Assets.playerSprite[1][2].setRotation(0); + Assets.playerSprite[0][3].setRotation(0); + Assets.playerSprite[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( + if (Assets.playerSprite[0][2].getRotation()>=60 || Assets.playerSprite[0][2].getRotation()<=-60) + Player.ANIM_SPEED = -Player.ANIM_SPEED; + + //back hand + Assets.playerSprite[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( + Assets.playerSprite[1][2].draw(spriteBatch); + //back leg + Assets.playerSprite[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( + Assets.playerSprite[1][3].draw(spriteBatch); + //front leg + Assets.playerSprite[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], + Assets.playerSprite[0][3].draw(spriteBatch); + //head + spriteBatch.draw(Assets.playerSprite[pl.dir][0], + pl.position.x - camera.position.x - 2, + pl.position.y - camera.position.y - 2); + //body + spriteBatch.draw(Assets.playerSprite[pl.dir][1], pl.position.x - camera.position.x - 2, pl.position.y - camera.position.y + 8); - - Assets.playerSkin[0][2].setPosition( + //front hand + Assets.playerSprite[0][2].setPosition( pl.position.x - camera.position.x - 6, pl.position.y - camera.position.y); - Assets.playerSkin[0][2].draw(spriteBatch); + Assets.playerSprite[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; + 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); + x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24); } } private void drawGUI() { + if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)>0 || + gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY)>0 || + gameProc.ctrlMode==1) + 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) { @@ -168,47 +181,49 @@ public class GameRenderer { 3); } } - spriteBatch.draw(Assets.invCur, + spriteBatch.draw(Assets.invBarCur, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2 - 1 + 20*gameProc.invSlot, -1); - - if (showCreative) drawCreative(); - - 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); + private void drawTouchGui() { + 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.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); + } - spriteBatch.begin(); + private void drawGamePlay() { drawWorld(); + Mob.animateMobs(); for (Mob mob : gameProc.mobs) drawMob(mob); drawPlayer(gameProc.player); drawWorldForeground(); drawGUI(); + } + public void render() { + Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + + spriteBatch.begin(); + switch (CaveGame.STATE) { + case GAME_PLAY: + drawGamePlay(); + break; + case GAME_CREATIVE_INV: + drawGamePlay(); + drawCreative(); + break; + } 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(); + if (CaveGame.TOUCH) { + spriteBatch.begin(); + drawTouchGui(); + spriteBatch.end(); } fontBatch.begin(); @@ -217,11 +232,8 @@ public class GameRenderer { 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); + drawString("Seed: "+WorldGen.getSeed(), 0, 80); + drawString("Mobs: "+gameProc.mobs.size, 0, 100); fontBatch.end(); }