X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=7ab146b7235c7342b0a61b56e6bd2b98e4218a9d;hb=597ab66d10b43233da31893d0d074485d5aa0bd2;hp=a1a4c66bd93cd9a6489f0a545929d8fce1fab475;hpb=792296717939ac50df33865ae3acbb010e812ad1;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index a1a4c66..7ab146b 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -2,15 +2,14 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
 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.*;
+import ru.deadsoftware.cavecraft.CaveGame;
 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 extends Renderer{
+public class GameRenderer extends Renderer {
 
     private GameProc gameProc;
 
@@ -29,14 +28,19 @@ public class GameRenderer extends Renderer{
         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){
-                } 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);
+                }
             }
         }
     }
@@ -50,9 +54,9 @@ public class GameRenderer extends Renderer{
         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) {
+                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);
                 }
             }
@@ -116,14 +120,17 @@ public class GameRenderer extends Renderer{
         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; i<Items.BLOCKS.size; i++) {
-            spriteBatch.draw(Items.BLOCKS.getValueAt(i).getTexture(),x+8+(i%8)*18,
-                    y+18+(i/8)*18);
+        spriteBatch.draw(Assets.creativeScroll, x+156,
+                y+18+(gameProc.creativeScroll*(72/gameProc.maxCreativeScroll)));
+        for (int i=gameProc.creativeScroll*40; i<(gameProc.creativeScroll+1)*40; i++) {
+            if (i>0 && i<Items.BLOCKS.size)
+                spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(i).getTexture()],
+                        x+8+((i-gameProc.creativeScroll*40)%8)*18,
+                        y+18+((i-gameProc.creativeScroll*40)/8)*18);
         }
         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()],
                         x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24);
         }
     }
@@ -138,7 +145,7 @@ public class GameRenderer extends Renderer{
         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);
             }
@@ -184,14 +191,6 @@ public class GameRenderer extends Renderer{
 
         if (CaveGame.TOUCH) drawTouchGui();
 
-        setFontColor(255,255,255);
-        drawString("CaveCraft "+CaveGame.VERSION, 0, 0);
-        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();
     }