X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=1eef325463a41614b6d98714ba21110ffb2e5af5;hb=7370b011158c7f9a1216dbf76de5acd9d277b7e9;hp=3ffc0aed78dda0c7914330a13d91c098cffc9037;hpb=c217099d21a0703347236f2d83e4d20c266f9be1;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 3ffc0ae..1eef325 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -1,9 +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.glutils.ShapeRenderer;
 import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavecraft.CaveGame;
+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;
@@ -28,14 +31,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);
+                }
             }
         }
     }
@@ -49,9 +57,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,33 +124,37 @@ public class GameRenderer extends Renderer {
         float y = camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2;
         spriteBatch.draw(Assets.creativeInv, x, y);
         spriteBatch.draw(Assets.creativeScroll, x+156,
-                y+18+(gameProc.creativeScroll*(72/(gameProc.maxCreativeScroll+1))));
-        for (int i=gameProc.creativeScroll*40; i<(gameProc.creativeScroll+1)*40; i++) {
-            if (i>0 && i<Items.BLOCKS.size)
-                spriteBatch.draw(Items.BLOCKS.getValueAt(i).getTexture(),
-                        x+8+((i-gameProc.creativeScroll*40)%8)*18,
-                        y+18+((i-gameProc.creativeScroll*40)/8)*18);
+                y+18+(gameProc.creativeScroll*(72/gameProc.maxCreativeScroll)));
+        for (int i=gameProc.creativeScroll*8; i<gameProc.creativeScroll*8+40; i++) {
+            if (i>0 && i<Items.ITEMS.size())
+                if (Items.ITEMS.get(i).getType() == 0)
+                    spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(i).getTexture()],
+                            x+8+((i-gameProc.creativeScroll*8)%8)*18,
+                            y+18+((i-gameProc.creativeScroll*8)/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(),
-                        x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24);
+                if (Items.ITEMS.get(i).getType() == 0)
+                    spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(i).getTexture()],
+                            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)
+                gameProc.ctrlMode==1 ||
+                !CaveGame.TOUCH)
             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) {
-                spriteBatch.draw(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(),
-                        camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20,
-                        3);
+                if (Items.ITEMS.get(gameProc.player.inventory[i]).getType()==0)
+                    spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(gameProc.player.inventory[i]).getTexture()],
+                            camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20,
+                            3);
             }
         }
         spriteBatch.draw(Assets.invBarCur,
@@ -158,13 +170,16 @@ public class GameRenderer extends Renderer {
         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() {
         drawWorldBackground();
-        Mob.animateMobs();
-        for (Mob mob : gameProc.mobs) drawMob(mob);
         drawPlayer(gameProc.player);
+        for (Mob mob : gameProc.mobs) drawMob(mob);
         drawWorldForeground();
         drawGUI();
     }
@@ -186,6 +201,14 @@ public class GameRenderer extends Renderer {
 
         if (CaveGame.TOUCH) drawTouchGui();
 
+        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);
+            drawString("Block: "+Items.BLOCKS.getKeyAt(gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)), 0, 40);
+        }
+
         spriteBatch.end();
     }