X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=72686d11e6484a83a5091f09776f499965236267;hp=7780d51e5e40a2a9ea52a3fd1116c5f3188fce92;hb=99a56427db13dd0ecd025e433a438b77245cb739;hpb=b651af0014451661858adf2c0fa3b4ecb4d3d4db

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 7780d51..72686d1 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -1,15 +1,11 @@
 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.MathUtils;
 import ru.deadsoftware.cavecraft.CaveGame;
 import ru.deadsoftware.cavecraft.GameScreen;
 import ru.deadsoftware.cavecraft.game.mobs.Mob;
 import ru.deadsoftware.cavecraft.game.objects.Drop;
-import ru.deadsoftware.cavecraft.game.objects.Player;
 import ru.deadsoftware.cavecraft.misc.Assets;
 import ru.deadsoftware.cavecraft.misc.Renderer;
 
@@ -41,37 +37,29 @@ public class GameRenderer extends Renderer {
         }
     }
 
-    private void drawWorldBackground() {
-        int minX = (int) (getCamX() / 16) - 1;
-        int minY = (int) (getCamY() / 16) - 1;
-        int maxX = (int) ((getCamX() + getWidth()) / 16) + 1;
-        int maxY = (int) ((getCamY() + getHeight()) / 16) + 1;
-        if (minY < 0) minY = 0;
-        if (maxY > gp.world.getHeight()) maxY = gp.world.getHeight();
-        for (int y = minY; y < maxY; y++) {
-            for (int x = minX; x < maxX; x++) {
-                if ((gp.world.getForeMap(x, y) == 0 || GameItems.getBlock(gp.world.getForeMap(x, y)).isTransparent())
-                        && gp.world.getBackMap(x, y) > 0) {
-                    spriter.draw(
-                            Assets.blockTex[GameItems.getBlock(gp.world.getBackMap(x, y)).getTex()],
-                            drawX(x), drawY(y));
-                    if (gp.world.getForeMap(x, y) == 0 && x == gp.curX && y == gp.curY)
-                        drawWreck(gp.world.getBackMap(gp.curX, gp.curY));
-                    Assets.shade.setPosition(drawX(x), drawY(y));
-                    Assets.shade.draw(spriter);
-                }
-                if (gp.world.getForeMap(x, y) > 0 && GameItems.getBlock(gp.world.getForeMap(x, y)).isBackground()) {
-                    spriter.draw(
-                            Assets.blockTex[GameItems.getBlock(gp.world.getForeMap(x, y)).getTex()],
-                            drawX(x), drawY(y));
-                    if (x == gp.curX && y == gp.curY)
-                        drawWreck(gp.world.getForeMap(gp.curX, gp.curY));
-                }
+    private void drawBlock(int x, int y, boolean drawBG) {
+        if (drawBG) {
+            if ((gp.world.getForeMap(x, y) == 0 || GameItems.getBlock(gp.world.getForeMap(x, y)).isTransparent())
+                    && gp.world.getBackMap(x, y) > 0) {
+                spriter.draw(
+                        Assets.blockTex[GameItems.getBlock(gp.world.getBackMap(x, y)).getTex()],
+                        drawX(x), drawY(y));
+                if (gp.world.getForeMap(x, y) == 0 && x == gp.curX && y == gp.curY)
+                    drawWreck(gp.world.getBackMap(gp.curX, gp.curY));
+                Assets.shade.setPosition(drawX(x), drawY(y));
+                Assets.shade.draw(spriter);
             }
         }
+        if (gp.world.getForeMap(x, y) > 0 && GameItems.getBlock(gp.world.getForeMap(x, y)).isBackground() == drawBG) {
+            spriter.draw(
+                    Assets.blockTex[GameItems.getBlock(gp.world.getForeMap(x, y)).getTex()],
+                    drawX(x), drawY(y));
+            if (x == gp.curX && y == gp.curY)
+                drawWreck(gp.world.getForeMap(gp.curX, gp.curY));
+        }
     }
 
-    private void drawWorldForeground() {
+    private void drawWorld(boolean bg) {
         int minX = (int) (getCamX() / 16) - 1;
         int minY = (int) (getCamY() / 16) - 1;
         int maxX = (int) ((getCamX() + getWidth()) / 16) + 1;
@@ -80,13 +68,7 @@ public class GameRenderer extends Renderer {
         if (maxY > gp.world.getHeight()) maxY = gp.world.getHeight();
         for (int y = minY; y < maxY; y++) {
             for (int x = minX; x < maxX; x++) {
-                if (gp.world.getForeMap(x, y) > 0 && !GameItems.getBlock(gp.world.getForeMap(x, y)).isBackground()) {
-                    spriter.draw(
-                            Assets.blockTex[GameItems.getBlock(gp.world.getForeMap(x, y)).getTex()],
-                            drawX(x), drawY(y));
-                    if (x == gp.curX && y == gp.curY)
-                        drawWreck(gp.world.getForeMap(gp.curX, gp.curY));
-                }
+                drawBlock(x, y, bg);
             }
         }
     }
@@ -123,65 +105,6 @@ public class GameRenderer extends Renderer {
         }
     }
 
-    private void drawPlayer(Player pl) {
-
-        float drawX = pl.pos.x - getCamX() - 2;
-        float drawY = pl.pos.y - getCamY();
-
-        if (pl.mov.x != 0 || Assets.plSprite[0][2].getRotation() != 0) {
-            Assets.plSprite[0][2].rotate(Player.ANIM_SPEED);
-            Assets.plSprite[1][2].rotate(-Player.ANIM_SPEED);
-            Assets.plSprite[0][3].rotate(-Player.ANIM_SPEED);
-            Assets.plSprite[1][3].rotate(Player.ANIM_SPEED);
-        } else {
-            Assets.plSprite[0][2].setRotation(0);
-            Assets.plSprite[1][2].setRotation(0);
-            Assets.plSprite[0][3].setRotation(0);
-            Assets.plSprite[1][3].setRotation(0);
-        }
-        if (Assets.plSprite[0][2].getRotation() >= 60 || Assets.plSprite[0][2].getRotation() <= -60)
-            Player.ANIM_SPEED = -Player.ANIM_SPEED;
-
-        //back hand
-        Assets.plSprite[1][2].setPosition(drawX - 6, drawY);
-        Assets.plSprite[1][2].draw(spriter);
-        //back leg
-        Assets.plSprite[1][3].setPosition(drawX - 6, drawY + 10);
-        Assets.plSprite[1][3].draw(spriter);
-        //front leg
-        Assets.plSprite[0][3].setPosition(drawX - 6, drawY + 10);
-        Assets.plSprite[0][3].draw(spriter);
-        //head
-        spriter.draw(Assets.plSprite[pl.getDir()][0], drawX - 2, drawY - 2);
-        //body
-        spriter.draw(Assets.plSprite[pl.getDir()][1], drawX - 2, drawY + 8);
-        //item in hand
-        if (pl.inv[gp.slot] > 0) {
-            float handRotation = MathUtils.degRad * Assets.plSprite[0][2].getRotation();
-            switch (GameItems.getItem(pl.inv[gp.slot]).getType()) {
-                case 0:
-                    Assets.blockTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setPosition(
-                            drawX - 8 * MathUtils.sin(handRotation),
-                            drawY + 6 + 8 * MathUtils.cos(handRotation));
-                    Assets.blockTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].draw(spriter);
-                    break;
-                default:
-                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].flip((pl.getDir() == 0), false);
-                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setRotation(
-                            -45 + pl.getDir() * 90 + Assets.plSprite[0][2].getRotation());
-                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].setPosition(
-                            drawX - 10 + (12 * pl.getDir()) - 8 * MathUtils.sin(handRotation),
-                            drawY + 2 + 8 * MathUtils.cos(handRotation));
-                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].draw(spriter);
-                    Assets.itemTex[GameItems.getItem(pl.inv[gp.slot]).getTex()].flip((pl.getDir() == 0), false);
-                    break;
-            }
-        }
-        //front hand
-        Assets.plSprite[0][2].setPosition(drawX - 6, drawY);
-        Assets.plSprite[0][2].draw(spriter);
-    }
-
     @SuppressWarnings("IntegerDivisionInFloatingPointContext")
     private void drawCreative() {
         float x = getWidth() / 2 - (float) Assets.creativeInv.getRegionWidth() / 2;
@@ -245,7 +168,7 @@ public class GameRenderer extends Renderer {
             }
         }
         spriter.draw(Assets.invBarCur,
-                getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 - 1 + 20 * gp.slot,
+                getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 - 1 + 20 * gp.player.invSlot,
                 -1);
     }
 
@@ -264,11 +187,11 @@ public class GameRenderer extends Renderer {
     }
 
     private void drawGamePlay() {
-        drawWorldBackground();
-        drawPlayer(gp.player);
+        drawWorld(true);
+        gp.player.draw(spriter, gp.player.pos.x - getCamX() - 2, gp.player.pos.y - getCamY());
         for (Mob mob : gp.mobs) drawMob(mob);
         for (Drop drop : gp.drops) drawDrop(drop);
-        drawWorldForeground();
+        drawWorld(false);
         drawGUI();
     }