New blocks structure

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / GameRenderer.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index b555f6bde14fc927d6e4de3d965de81bdf5a9887..06e9b624fae8fd2570fae96e342eeb8fe0e2e646 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
@@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.math.Intersector;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack;
@@ -14,7 +15,7 @@ import ru.deadsoftware.cavedroid.MainConfig;
 import ru.deadsoftware.cavedroid.game.mobs.Mob;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
 import ru.deadsoftware.cavedroid.game.mobs.Player;
-import ru.deadsoftware.cavedroid.game.objects.Block;
+import ru.deadsoftware.cavedroid.game.model.block.Block;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
 import ru.deadsoftware.cavedroid.game.objects.DropController;
 import ru.deadsoftware.cavedroid.game.objects.Item;
@@ -32,6 +33,8 @@ import static ru.deadsoftware.cavedroid.misc.Assets.*;
 @GameScope
 public class GameRenderer extends Renderer {
 
+    private static final String TAG = "GameRenderer";
+
     private final MainConfig mMainConfig;
     private final GameInput mGameInput;
     private final GameWorld mGameWorld;
@@ -67,6 +70,11 @@ public class GameRenderer extends Renderer {
         if (mGameInput.getBlockDamage() > 0) {
             int index = 10 * mGameInput.getBlockDamage() / GameItems.getBlock(bl).getHp();
             String key = "break_" + index;
+
+            if (index > 10 || index < 0) {
+                return;
+            }
+
             spriter.draw(textureRegions.get(key), mGameInput.getCurX() * 16 - getCamX(),
                     mGameInput.getCurY() * 16 - getCamY());
         }
@@ -298,7 +306,7 @@ public class GameRenderer extends Renderer {
 
         drawWorld(true);
         player.draw(spriter, player.getX() - getCamX() - player.getWidth() / 2, player.getY() - getCamY(), delta);
-        mMobsController.forEach( (mob) -> { drawMob(mob, delta); });
+        mMobsController.getMobs().forEach( (mob) -> { drawMob(mob, delta); });
         mDropController.forEach(this::drawDrop);
         drawWorld(false);
         drawGUI();
@@ -363,7 +371,7 @@ public class GameRenderer extends Renderer {
 
     @Override
     public void render(float delta) {
-        int fps = (int) (1 / delta);
+        int fps = MathUtils.ceil(1 / delta);
         updateCameraPosition();
         mGameInput.moveCursor(this);
 
@@ -401,7 +409,7 @@ public class GameRenderer extends Renderer {
             drawString("CurY: " + mGameInput.getCurY(), 0, 40);
             drawString("Velocity: " + player.getVelocity(), 0, 50);
             drawString("Swim: " + player.swim, 0, 60);
-            drawString("Mobs: " + mMobsController.getSize(), 0, 70);
+            drawString("Mobs: " + mMobsController.getMobs().size(), 0, 70);
             drawString("Drops: " + mDropController.getSize(), 0, 80);
             drawString("Block: " + GameItems.getBlockKey(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())), 0, 90);
             drawString("Hand: " + GameItems.getItemKey(mMobsController.getPlayer().inventory[mMobsController.getPlayer().slot]), 0, 100);