X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=b528972d71e342a39227b1a8bb65fb02b132fed1;hb=d5e611f9fb8deb93a9403b41f17dc000b9fa63ce;hp=d104b2f2056a873d781118decc40d4b0867be7d6;hpb=385255cc7b49fbfd3290497367cbc69919b24d4f;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java index d104b2f..b528972 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java @@ -1,100 +1,63 @@ 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.math.Vector2; -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; +import ru.deadsoftware.cavecraft.misc.Assets; +import ru.deadsoftware.cavecraft.misc.Renderer; -public class GameRenderer { +public class GameRenderer extends Renderer { private GameProc gameProc; - public OrthographicCamera camera, fontCam; - ShapeRenderer shapeRenderer; - SpriteBatch spriteBatch, fontBatch; - - public GameRenderer(GameProc gameProc) { + public GameRenderer(GameProc gameProc,float width, float heigth) { + super(width,heigth); Gdx.gl.glClearColor(0f,.6f,.6f,1f); this.gameProc = gameProc; - camera = new OrthographicCamera(); - 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); - spriteBatch = new SpriteBatch(); - spriteBatch.setProjectionMatrix(camera.combined); - - fontCam = new OrthographicCamera(); - fontCam.setToOrtho(true, GameScreen.getWidth(), GameScreen.getHeight()); - fontBatch = new SpriteBatch(); - fontBatch.setProjectionMatrix(fontCam.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() { - int minX = (int) (camera.position.x/16); - int minY = (int) (camera.position.y/16); + private void drawWorldBackground() { + int minX = (int) (camera.position.x/16)-1; + int minY = (int) (camera.position.y/16)-1; 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);*/ - } else if (gameProc.world.getBackMap(x,y)>0) { + if ((gameProc.world.getForeMap(x,y)==0 || Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).transparent) + && gameProc.world.getBackMap(x,y)>0) { spriteBatch.draw( - Items.BLOCKS.getValueAt(gameProc.world.getBackMap(x,y)).getTexture(), + Assets.blockTextures[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); } + if (gameProc.world.getForeMap(x,y)>0 && Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).background) { + spriteBatch.draw( + Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture()], + x * 16 - camera.position.x,y * 16 - camera.position.y); + } } } } private void drawWorldForeground(){ - int minX = (int) (camera.position.x/16); - int minY = (int) (camera.position.y/16); + int minX = (int) (camera.position.x/16)-1; + int minY = (int) (camera.position.y/16)-1; 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) {*/ + if (gameProc.world.getForeMap(x,y)>0 && !Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).background) { spriteBatch.draw( - Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(), + Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture()], x * 16 - camera.position.x,y * 16 - camera.position.y); } } @@ -102,8 +65,12 @@ public class GameRenderer { } private void drawMob(Mob mob) { + mob.draw(spriteBatch, + mob.position.x-camera.position.x-gameProc.world.getWidth()*16, mob.position.y-camera.position.y); mob.draw(spriteBatch, mob.position.x-camera.position.x, mob.position.y-camera.position.y); + mob.draw(spriteBatch, + mob.position.x-camera.position.x+gameProc.world.getWidth()*16, mob.position.y-camera.position.y); } private void drawPlayer(Player pl) { @@ -154,14 +121,17 @@ public class GameRenderer { 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 && i0) - spriteBatch.draw(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(), + spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()], x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24); } } @@ -176,7 +146,7 @@ public class GameRenderer { 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(), + spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()], camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20, 3); } @@ -194,17 +164,22 @@ public class GameRenderer { 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); + } } private void drawGamePlay() { - drawWorld(); - Mob.animateMobs(); + drawWorldBackground(); + //Mob.animateMobs(); for (Mob mob : gameProc.mobs) drawMob(mob); drawPlayer(gameProc.player); drawWorldForeground(); drawGUI(); } + @Override public void render() { Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); @@ -218,29 +193,17 @@ public class GameRenderer { drawCreative(); break; } - spriteBatch.end(); - shapeRenderer.begin(ShapeRenderer.ShapeType.Line); - shapeRenderer.setColor(Color.ORANGE); - shapeRenderer.line(0-camera.position.x, 128*16-camera.position.y, - gameProc.world.getWidth()*16-camera.position.x, 128*16-camera.position.y); - shapeRenderer.end(); + if (CaveGame.TOUCH) drawTouchGui(); - if (CaveGame.TOUCH) { - spriteBatch.begin(); - drawTouchGui(); - spriteBatch.end(); + 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); } - 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("Seed: "+WorldGen.getSeed(), 0, 80); - drawString("Mobs: "+gameProc.mobs.size, 0, 100); - fontBatch.end(); + spriteBatch.end(); } }