Add landscape

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

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 54ec384e040cf91cf688cce9b31ba7bcd9ad357f..3c6d7b38b7aa26b3ee4ec750220c0c1862867b9c 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -6,10 +6,9 @@ import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector3;
 import ru.deadsoftware.cavecraft.Assets;
-import ru.deadsoftware.cavecraft.BlocksLoader;
+import ru.deadsoftware.cavecraft.Items;
 import ru.deadsoftware.cavecraft.GameScreen;
 import ru.deadsoftware.cavecraft.game.objects.Player;
 
@@ -65,11 +64,11 @@ public class GameRenderer {
             for (int x=minX; x<maxX; x++) {
                 if (gameProc.world.getForeMap(x,y)>0) {
                     spriteBatch.draw(
-                            BlocksLoader.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(),
+                            Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(),
                             x * 16 - camera.position.x,y * 16 - camera.position.y);
                 } else if (gameProc.world.getBackMap(x,y)>0) {
                     spriteBatch.draw(
-                            BlocksLoader.BLOCKS.getValueAt(gameProc.world.getBackMap(x,y)).getTexture(),
+                            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);
@@ -89,7 +88,7 @@ public class GameRenderer {
                 camera.viewportHeight - Assets.invBar.getRegionHeight());
         for (int i=0; i<8; i++) {
             if (gameProc.player.inventory[i]>0) {
-                spriteBatch.draw(BlocksLoader.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(),
+                spriteBatch.draw(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(),
                         camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20,
                         camera.viewportHeight-19);
             }
@@ -106,6 +105,7 @@ public class GameRenderer {
         drawPlayer(gameProc.player);
         drawGUI();
         spriteBatch.end();
+
         shapeRenderer.begin(ShapeRenderer.ShapeType.Line);
         shapeRenderer.setColor(Color.ORANGE);
         drawRect(gameProc.cursorX*16-camera.position.x,