X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameRenderer.java;h=76d806f40f4c8ef977b8cac409819b22f9cde1ad;hb=59d48c1b28c570755327a8fb0827fa57e7fd3914;hp=e6ead52d5c2f25a8aee5572740c07d95646d09da;hpb=84377178320105196ad70bfa798ba8f299f961b2;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index e6ead52..76d806f 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
@@ -9,14 +9,13 @@ import com.badlogic.gdx.math.Rectangle;
 import ru.deadsoftware.cavedroid.CaveGame;
 import ru.deadsoftware.cavedroid.GameScreen;
 import ru.deadsoftware.cavedroid.game.mobs.Mob;
-import ru.deadsoftware.cavedroid.game.mobs.Pig;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
-import ru.deadsoftware.cavedroid.misc.Assets;
 import ru.deadsoftware.cavedroid.misc.ControlMode;
 import ru.deadsoftware.cavedroid.misc.Renderer;
 
 import static ru.deadsoftware.cavedroid.GameScreen.GP;
-import static ru.deadsoftware.cavedroid.misc.Assets.*;
+import static ru.deadsoftware.cavedroid.misc.Assets.guiMap;
+import static ru.deadsoftware.cavedroid.misc.Assets.textureRegions;
 
 public class GameRenderer extends Renderer {
 
@@ -47,14 +46,16 @@ public class GameRenderer extends Renderer {
             if ((!GP.world.hasForeAt(x, y) || GP.world.getForeMapBlock(x, y).isTransparent())
                     && GP.world.hasBackAt(x, y)) {
                 spriter.draw(GP.world.getBackMapBlock(x, y).getTex(), drawX(x), drawY(y));
-                if (!GP.world.hasForeAt(x, y) && x == GP.input.getCurX() && y == GP.input.getCurY())
+                if (!GP.world.hasForeAt(x, y) && x == GP.input.getCurX() && y == GP.input.getCurY()) {
                     drawWreck(GP.world.getBackMap(GP.input.getCurX(), GP.input.getCurY()));
+                }
             }
         }
         if (GP.world.hasForeAt(x, y) && GP.world.getForeMapBlock(x, y).isBackground() == drawBG) {
             spriter.draw(GP.world.getForeMapBlock(x, y).getTex(), drawX(x), drawY(y));
-            if (x == GP.input.getCurX() && y == GP.input.getCurY())
+            if (x == GP.input.getCurX() && y == GP.input.getCurY()) {
                 drawWreck(GP.world.getForeMap(GP.input.getCurX(), GP.input.getCurY()));
+            }
         }
     }
 
@@ -63,8 +64,12 @@ public class GameRenderer extends Renderer {
         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();
+        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++) {
                 drawBlock(x, y, bg);
@@ -79,8 +84,9 @@ public class GameRenderer extends Renderer {
             for (int y = minY; y < maxY; y++) {
                 for (int x = minX; x < maxX; x++) {
                     if ((!GP.world.hasForeAt(x, y) || GP.world.getForeMapBlock(x, y).isTransparent())
-                            && GP.world.hasBackAt(x, y))
+                            && GP.world.hasBackAt(x, y)) {
                         shaper.rect(drawX(x), drawY(y), 16, 16);
+                    }
                 }
             }
             shaper.end();
@@ -92,6 +98,15 @@ public class GameRenderer extends Renderer {
     private void drawMob(Mob mob) {
         float mobDrawX = mob.getX() - getCamX();
         float mobDrawY = mob.getY() - getCamY();
+
+        if (mobDrawX + mob.getWidth() < 0 && mobDrawX + GP.world.getWidthPx() > 0) {
+            mobDrawX += GP.world.getWidthPx();
+        } else if (mobDrawX > getWidth() && mobDrawX + mob.getWidth() - GP.world.getWidthPx() > 0) {
+            mobDrawX -= GP.world.getWidthPx();
+        } else if (mobDrawX + mob.getWidth() < 0 && mobDrawX > getWidth()) {
+            return;
+        }
+
         mob.draw(spriter, mobDrawX, mobDrawY);
     }
 
@@ -107,7 +122,7 @@ public class GameRenderer extends Renderer {
         spriter.draw(textureRegions.get("handle"), x + 156,
                 y + 18 + (GP.input.getCreativeScroll() * (72f / GameProc.MAX_CREATIVE_SCROLL)));
         for (int i = GP.input.getCreativeScroll() * 8; i < GP.input.getCreativeScroll() * 8 + 40; i++) {
-            if (i > 0 && i < GameItems.getItemsSize())
+            if (i > 0 && i < GameItems.getItemsSize()) {
                 if (GameItems.getItem(i).isBlock()) {
                     spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(i)).getTex(),
                             x + 8 + ((i - GP.input.getCreativeScroll() * 8) % 8) * 18,
@@ -117,9 +132,10 @@ public class GameRenderer extends Renderer {
                             x + 8 + ((i - GP.input.getCreativeScroll() * 8) % 8) * 18,
                             y + 18 + ((i - GP.input.getCreativeScroll() * 8) / 8) * 18);
                 }
+            }
         }
         for (int i = 0; i < 9; i++) {
-            if (GP.player.inventory[i] > 0)
+            if (GP.player.inventory[i] > 0) {
                 if (GameItems.getItem(GP.player.inventory[i]).isBlock()) {
                     spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(GP.player.inventory[i])).getTex(),
                             x + 8 + i * 18, y + creative.getRegionHeight() - 24);
@@ -127,6 +143,7 @@ public class GameRenderer extends Renderer {
                     spriter.draw(GameItems.getItem(GP.player.inventory[i]).getTex(),
                             x + 8 + i * 18, y + creative.getRegionHeight() - 24);
                 }
+            }
         }
 
     }
@@ -139,10 +156,11 @@ public class GameRenderer extends Renderer {
         if (GP.world.hasForeAt(GP.input.getCurX(), GP.input.getCurY()) ||
                 GP.world.hasBackAt(GP.input.getCurX(), GP.input.getCurY()) ||
                 GP.controlMode == ControlMode.CURSOR ||
-                !CaveGame.TOUCH)
+                !CaveGame.TOUCH) {
             spriter.draw(cursor,
                     GP.input.getCurX() * 16 - getCamX(),
                     GP.input.getCurY() * 16 - getCamY());
+        }
         spriter.draw(hotbar, getWidth() / 2 - (float) hotbar.getRegionWidth() / 2, 0);
         for (int i = 0; i < 9; i++) {
             if (GP.player.inventory[i] > 0) {
@@ -197,7 +215,9 @@ public class GameRenderer extends Renderer {
                 break;
         }
 
-        if (CaveGame.TOUCH) drawTouchGui();
+        if (CaveGame.TOUCH) {
+            drawTouchGui();
+        }
 
         spriter.end();