X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=6a41ea26f1a25e56005adb997dea168b9f1714ec;hb=083e40ac85e4aca2df81d1ca16c0a54561c3bd38;hp=b93de89b8d756f9e42470882954f262fa0a03e2d;hpb=7895e461428b3cd6db4c606373081f063a9e0a2b;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index b93de89..6a41ea2 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -6,10 +6,12 @@ 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.CaveGame;
+import ru.deadsoftware.cavecraft.Items;
 import ru.deadsoftware.cavecraft.GameScreen;
+import ru.deadsoftware.cavecraft.game.mobs.Mob;
 import ru.deadsoftware.cavecraft.game.objects.Player;
 
 public class GameRenderer {
@@ -37,20 +39,6 @@ public class GameRenderer {
         spriteBatch.setProjectionMatrix(camera.combined);
     }
 
-    private void setColor(int r, int g, int b) {
-        shapeRenderer.setColor(r/255f, g/255f, b/255f, 1f);
-    }
-
-    private void fillRect(float x, float y, float w, float h) {
-        shapeRenderer.set(ShapeRenderer.ShapeType.Filled);
-        shapeRenderer.rect(x,y,w,h);
-    }
-
-    private void drawRect(float x, float y, float w, float h) {
-        shapeRenderer.set(ShapeRenderer.ShapeType.Line);
-        shapeRenderer.rect(x,y,w,h);
-    }
-
     private void drawWorld() {
         int minX = (int) (camera.position.x/16);
         int minY = (int) (camera.position.y/16);
@@ -63,44 +51,80 @@ public class GameRenderer {
         for (int y=minY; y<maxY; y++) {
             for (int x=minX; x<maxX; x++) {
                 if (gameProc.world.getForeMap(x,y)>0) {
-                    setColor(128,128,128);
-                    fillRect(x*16-camera.position.x,
-                            y*16-camera.position.y,16,16);
-                    setColor(0,0,0);
-                    drawRect(x*16-camera.position.x,
-                            y*16-camera.position.y,16,16);
-                } else {
-                    if (gameProc.world.getBackMap(x,y)>0) {
-                        setColor(64,64,64);
-                        fillRect(x*16-camera.position.x,
-                                y*16-camera.position.y,16,16);
-                        setColor(0,0,0);
-                        drawRect(x*16-camera.position.x,
-                                y*16-camera.position.y,16,16);
-                    }
+                    spriteBatch.draw(
+                            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(
+                            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);
                 }
-
             }
         }
-        shapeRenderer.setColor(Color.ORANGE);
-        drawRect(gameProc.cursorX*16-camera.position.x,
-                gameProc.cursorY*16-camera.position.y,16,16);
+    }
+
+    private void drawMob(Mob mob) {
+        spriteBatch.draw(Assets.playerSkin[mob.dir],
+                mob.position.x - camera.position.x, mob.position.y - camera.position.y);
     }
 
     private void drawPlayer(Player pl) {
-        spriteBatch.begin();
-        Assets.playerSprite[pl.dir].setPosition(pl.position.x - camera.position.x,
-                pl.position.y - camera.position.y);
-        Assets.playerSprite[pl.dir].draw(spriteBatch);
-        spriteBatch.end();
+        spriteBatch.draw(Assets.playerSkin[pl.dir],
+                pl.position.x - camera.position.x, pl.position.y - camera.position.y);
+    }
+
+    private void drawGUI() {
+        spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2,
+                0);//camera.viewportHeight - Assets.invBar.getRegionHeight());
+        for (int i=0; i<8; 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);
+            }
+        }
+        spriteBatch.draw(Assets.invCur,
+                camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2 - 1 + 20*gameProc.invSlot,
+                -1);
+
+        if (CaveGame.TOUCH) {
+            spriteBatch.draw(Assets.touchArrows[0],26,camera.viewportHeight-52);
+            spriteBatch.draw(Assets.touchArrows[1],0,camera.viewportHeight-26);
+            spriteBatch.draw(Assets.touchArrows[2],26,camera.viewportHeight-26);
+            spriteBatch.draw(Assets.touchArrows[3],52,camera.viewportHeight-26);
+            spriteBatch.draw(Assets.touchSpace, camera.viewportWidth/2-52, camera.viewportHeight-26);
+            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);
+            }
+        }
     }
 
     public void render() {
         Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-        shapeRenderer.begin();
+
+        spriteBatch.begin();
         drawWorld();
-        shapeRenderer.end();
+        for (Mob mob : gameProc.mobs) {
+            drawMob(mob);
+        }
         drawPlayer(gameProc.player);
+        drawGUI();
+        spriteBatch.end();
+
+        if (gameProc.ctrlMode==1) {
+            shapeRenderer.begin(ShapeRenderer.ShapeType.Line);
+            shapeRenderer.setColor(Color.ORANGE);
+            shapeRenderer.set(ShapeRenderer.ShapeType.Line);
+            shapeRenderer.rect(gameProc.cursorX * 16 - camera.position.x,
+                    gameProc.cursorY * 16 - camera.position.y, 16, 16);
+            shapeRenderer.end();
+        }
     }
 
 }