DEADSOFTWARE

Optimize font
[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / GameRenderer.java
index d104b2f2056a873d781118decc40d4b0867be7d6..a1a4c66bd93cd9a6489f0a545929d8fce1fab475 100644 (file)
@@ -1,74 +1,35 @@
 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.*;
 import ru.deadsoftware.cavecraft.game.mobs.Mob;
 import ru.deadsoftware.cavecraft.game.objects.Player;
 
-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; y<maxY; y++) {
             for (int x=minX; x<maxX; x++) {
-                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);*/
+                if (gameProc.world.getForeMap(x,y)>0){
                 } else if (gameProc.world.getBackMap(x,y)>0) {
                     spriteBatch.draw(
                             Items.BLOCKS.getValueAt(gameProc.world.getBackMap(x,y)).getTexture(),
@@ -81,18 +42,15 @@ public class GameRenderer {
     }
 
     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; y<maxY; y++) {
             for (int x=minX; x<maxX; x++) {
-                if (gameProc.world.getForeMap(x,y)>0) { /*&&
-                        Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).foreground) {*/
+                if (gameProc.world.getForeMap(x,y)>0) {
                     spriteBatch.draw(
                             Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(),
                             x * 16 - camera.position.x,y * 16 - camera.position.y);
@@ -102,8 +60,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) {
@@ -197,7 +159,7 @@ public class GameRenderer {
     }
 
     private void drawGamePlay() {
-        drawWorld();
+        drawWorldBackground();
         Mob.animateMobs();
         for (Mob mob : gameProc.mobs) drawMob(mob);
         drawPlayer(gameProc.player);
@@ -205,6 +167,7 @@ public class GameRenderer {
         drawGUI();
     }
 
+    @Override
     public void render() {
         Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
 
@@ -218,29 +181,18 @@ 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();
-        }
-
-        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();
+        drawString("FPS: "+GameScreen.FPS, 0, 12);
+        drawString("X: "+(int)(gameProc.player.position.x/16), 0, 24);
+        drawString("Y: "+(gameProc.world.getHeight()-(int)(gameProc.player.position.y/16)), 0, 36);
+        drawString("Seed: "+WorldGen.getSeed(), 0, 48);
+        drawString("Mobs: "+gameProc.mobs.size, 0, 60);
+
+        spriteBatch.end();
     }
 
 }