X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=fac4ba2a9f25d42c987e1c6d68e1adaa33d38562;hb=75e8bbe4c9dceaabd8bb7e7976ad9052cfb0a968;hp=3ba99c3ec2c999dc7faa9866e3cb3bc5cc1d4430;hpb=d4b230bcff9be349af3d450cf5fea0bf0ebf33b8;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 3ba99c3..fac4ba2 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;
@@ -122,11 +125,11 @@ public class GameRenderer extends Renderer {
         spriteBatch.draw(Assets.creativeInv, x, y);
         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++) {
+        for (int i=gameProc.creativeScroll*8; i<gameProc.creativeScroll*8+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);
+                        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)
@@ -171,7 +174,7 @@ public class GameRenderer extends Renderer {
 
     private void drawGamePlay() {
         drawWorldBackground();
-        Mob.animateMobs();
+        //Mob.animateMobs();
         for (Mob mob : gameProc.mobs) drawMob(mob);
         drawPlayer(gameProc.player);
         drawWorldForeground();
@@ -195,6 +198,13 @@ 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);
+        }
+
         spriteBatch.end();
     }