Support different block texture sizes and animation

[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 018fe1bf750e5b3fba65d98bb1acddcead8af876..19f2681b0df65020285bcdb4572076bc089fb969 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
@@ -23,8 +23,6 @@ import static ru.deadsoftware.cavedroid.misc.Assets.textureRegions;
 @GameScope
 public class GameRenderer extends Renderer {
 
-    private static final String TAG = "GameRenderer";
-
     private final MainConfig mMainConfig;
     private final GameInput mGameInput;
     private final GameWorld mGameWorld;
@@ -69,14 +67,14 @@ public class GameRenderer extends Renderer {
         if (drawBG) {
             if ((!mGameWorld.hasForeAt(x, y) || mGameWorld.getForeMapBlock(x, y).isTransparent())
                     && mGameWorld.hasBackAt(x, y)) {
-                spriter.draw(mGameWorld.getBackMapBlock(x, y).getTexture(), drawX(x), drawY(y));
+                mGameWorld.getBackMapBlock(x, y).draw(spriter, drawX(x), drawY(y));
                 if (!mGameWorld.hasForeAt(x, y) && x == mGameInput.getCurX() && y == mGameInput.getCurY()) {
                     drawWreck(mGameWorld.getBackMap(mGameInput.getCurX(), mGameInput.getCurY()));
                 }
             }
         }
         if (mGameWorld.hasForeAt(x, y) && mGameWorld.getForeMapBlock(x, y).isBackground() == drawBG) {
-            spriter.draw(mGameWorld.getForeMapBlock(x, y).getTexture(), drawX(x), drawY(y));
+            mGameWorld.getForeMapBlock(x, y).draw(spriter, drawX(x), drawY(y));
             if (x == mGameInput.getCurX() && y == mGameInput.getCurY()) {
                 drawWreck(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY()));
             }
@@ -286,16 +284,17 @@ public class GameRenderer extends Renderer {
 
         if (mMainConfig.isShowInfo()) {
             spriter.begin();
+            Player player = mMobsController.getPlayer();
             drawString("FPS: " + fps, 0, 0);
-            drawString("X: " + mMobsController.getPlayer().getMapX(), 0, 10);
-            drawString("Y: " + mMobsController.getPlayer().getUpperMapY(), 0, 20);
+            drawString("X: " + player.getMapX(), 0, 10);
+            drawString("Y: " + player.getUpperMapY(), 0, 20);
             drawString("CurX: " + mGameInput.getCurX(), 0, 30);
             drawString("CurY: " + mGameInput.getCurY(), 0, 40);
             drawString("Mobs: " + mMobsController.getSize(), 0, 50);
             drawString("Drops: " + mDropController.getSize(), 0, 60);
             drawString("Block: " + GameItems.getBlockKey(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())), 0, 70);
             drawString("Hand: " + GameItems.getItemKey(mMobsController.getPlayer().inventory[mMobsController.getPlayer().slot]), 0, 80);
-            drawString("Game mode: " + mMobsController.getPlayer().gameMode, 0, 90);
+            drawString("Game mode: " + player.gameMode, 0, 90);
             spriter.end();
         }