X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGamePhysics.java;h=101ff7950f8d7f5560a84daf0c772212265e4d85;hp=fe0765a0fa06b9f06a17344a3973ad82b2637e41;hb=99a56427db13dd0ecd025e433a438b77245cb739;hpb=feb58daa2c3e8126871e9d4f26e978d2fc1fb01c

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index fe0765a..101ff79 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
@@ -11,15 +11,15 @@ import ru.deadsoftware.cavecraft.game.objects.Player;
 
 import java.util.Iterator;
 
-public class GamePhysics {
+class GamePhysics {
 
-    public static final int PL_SPEED = 2;
+    static final int PL_SPEED = 2;
 
     private GameProc gp;
 
     private Vector2 gravity;
 
-    public GamePhysics(GameProc gp) {
+    GamePhysics(GameProc gp) {
         this.gp = gp;
         gravity = new Vector2(0, .9f);
     }
@@ -38,8 +38,8 @@ public class GamePhysics {
             default:
                 bl = 0;
         }
-        return (bl > 0 && Items.blocks.getValueAt(bl).toJump() &&
-                (rect.y + rect.height) - Items.blocks.getValueAt(bl).getRect((int) ((rect.x - 8) / 16), (int) ((rect.y + rect.height - 8) / 16)).y > 8);
+        return (bl > 0 && GameItems.getBlock(bl).toJump() &&
+                (rect.y + rect.height) - GameItems.getBlock(bl).getRect((int) ((rect.x - 8) / 16), (int) ((rect.y + rect.height - 8) / 16)).y > 8);
     }
 
     private boolean checkColl(Rectangle rect) {
@@ -53,8 +53,8 @@ public class GamePhysics {
         for (int y = minY; y < maxY; y++) {
             for (int x = minX; x < maxX; x++) {
                 bl = gp.world.getForeMap(x, y);
-                if (bl > 0 && Items.blocks.getValueAt(bl).coll) {
-                    if (Intersector.overlaps(rect, Items.blocks.getValueAt(bl).getRect(x, y))) {
+                if (bl > 0 && GameItems.getBlock(bl).hasCollision()) {
+                    if (Intersector.overlaps(rect, GameItems.getBlock(bl).getRect(x, y))) {
                         return true;
                     }
                 }
@@ -68,125 +68,117 @@ public class GamePhysics {
     }
 
     private void dropPhy(Drop drop) {
-        if (drop.move.y < 9) drop.move.y += gravity.y / 4;
-        drop.position.add(drop.move);
-        drop.position.y = MathUtils.round(drop.position.y);
+        if (drop.closeToPlayer(gp) > 0) {
+            drop.moveToPlayer(gp);
+        } else {
+            if (drop.move.x >= .5f) drop.move.x -= .5f;
+            else if (drop.move.x <= -.5f) drop.move.x += .5f;
+            else drop.move.x = 0;
+            if (drop.move.y < 9) drop.move.y += gravity.y / 4;
+        }
+        drop.pos.add(drop.move);
+        if (drop.pos.x + 8 > gp.world.getWidthPx()) drop.pos.x -= gp.world.getWidthPx();
+        else if (drop.pos.x < 0) drop.pos.x += gp.world.getWidthPx();
+        drop.pos.y = MathUtils.round(drop.pos.y);
         while (checkColl(drop.getRect())) {
-            drop.position.y--;
+            drop.pos.y--;
             drop.move.y = 0;
         }
     }
 
-    private void playerPhy(Player pl) {
-        pl.position.y += pl.move.y;
-        if (checkColl(pl.getRect())) {
+    private void mobXColl(Mob mob) {
+        if (checkColl(mob.getRect())) {
+            if (mob.canJump && !mob.flyMode) {
+                mob.pos.y -= 8;
+            }
+            if (checkColl(mob.getRect())) {
+                if (mob.canJump && !mob.flyMode) mob.pos.y += 8;
+                int d = 0;
+                if (mob.mov.x < 0) d = 1;
+                else if (mob.mov.x > 0) d = -1;
+                mob.pos.x = MathUtils.round(mob.pos.x);
+                while (checkColl(mob.getRect())) mob.pos.x += d;
+                if (mob.canJump) mob.changeDir();
+            }
+        }
+        if (mob.pos.x + mob.getWidth() / 2 < 0) mob.pos.x += gp.world.getWidthPx();
+        if (mob.pos.x + mob.getWidth() / 2 > gp.world.getWidthPx()) mob.pos.x -= gp.world.getWidthPx();
+    }
+
+    private void mobYColl(Mob mob) {
+        if (checkColl(mob.getRect())) {
             int d = -1;
-            if (pl.move.y < 0) d = 1;
+            if (mob.mov.y < 0) d = 1;
             if (d == -1) {
-                pl.flyMode = false;
-                pl.canJump = true;
+                mob.canJump = true;
+                mob.flyMode = false;
+            }
+            mob.pos.y = MathUtils.round(mob.pos.y);
+            while (checkColl(mob.getRect())) mob.pos.y += d;
+            mob.mov.y = 0;
+            if (mob.getType() > 0) {
+                gp.world.setForeMap(mob.getMapX(), mob.getMapY(), mob.getType());
+                mob.kill();
             }
-            pl.position.y = MathUtils.round(pl.position.y);
-            while (checkColl(pl.getRect())) pl.position.y += d;
-            pl.move.y = 0;
         } else {
-            pl.canJump = false;
+            mob.canJump = false;
+        }
+        if (mob.pos.y > gp.world.getHeightPx()) {
+            mob.kill();
         }
+    }
 
-        if (Items.isFluid(getBlock(pl.getRect()))) {
-            if (CaveGame.TOUCH && pl.move.x != 0 && !gp.swim && !pl.flyMode) gp.swim = true;
-            if (!gp.swim) {
-                if (!pl.flyMode && pl.move.y < 4.5f) pl.move.add(gravity.x / 4, gravity.y / 4);
-                if (!pl.flyMode && pl.move.y > 4.5f) pl.move.add(0, -1f);
+    private void playerPhy(Player pl) {
+        pl.pos.y += pl.mov.y;
+        mobYColl(pl);
+
+        if (GameItems.isFluid(getBlock(pl.getRect()))) {
+            if (CaveGame.TOUCH && pl.mov.x != 0 && !pl.swim && !pl.flyMode) pl.swim = true;
+            if (!pl.swim) {
+                if (!pl.flyMode && pl.mov.y < 4.5f) pl.mov.add(gravity.x / 4, gravity.y / 4);
+                if (!pl.flyMode && pl.mov.y > 4.5f) pl.mov.add(0, -1f);
             } else {
-                pl.move.add(0, -.5f);
-                if (pl.move.y < -3) pl.move.y = -3;
+                pl.mov.add(0, -.5f);
+                if (pl.mov.y < -3) pl.mov.y = -3;
             }
         } else {
-            if (!pl.flyMode && pl.move.y < 18) pl.move.add(gravity);
+            if (!pl.flyMode && pl.mov.y < 18) pl.mov.add(gravity);
         }
 
-        pl.position.x += pl.move.x;
-        if (checkColl(pl.getRect())) {
-            if (pl.canJump && !pl.flyMode) pl.position.y -= 8;
-            if (checkColl(pl.getRect())) {
-                if (pl.canJump && !pl.flyMode) pl.position.y += 8;
-                int d = 0;
-                if (pl.move.x < 0) d = 1;
-                else if (pl.move.x > 0) d = -1;
-                pl.position.x = MathUtils.round(pl.position.x);
-                while (checkColl(pl.getRect())) pl.position.x += d;
-            }
-        }
-        if (pl.position.x + pl.texWidth / 2 < 0) pl.position.x += gp.world.getWidth() * 16;
-        if (pl.position.x + pl.texWidth / 2 > gp.world.getWidth() * 16)
-            pl.position.x -= gp.world.getWidth() * 16;
-        if (pl.position.y > gp.world.getHeight() * 16) {
-            pl.position = gp.world.getSpawnPoint().cpy();
-        }
-        if (CaveGame.TOUCH && checkJump(pl.getRect(), pl.dir) && !pl.flyMode && pl.canJump && pl.move.x != 0) {
-            pl.move.add(0, -8);
+        pl.pos.x += pl.mov.x;
+        mobXColl(pl);
+
+        if (CaveGame.TOUCH && checkJump(pl.getRect(), pl.getDir()) && !pl.flyMode && pl.canJump && pl.mov.x != 0) {
+            pl.mov.add(0, -8);
             pl.canJump = false;
         }
     }
 
     private void mobPhy(Mob mob) {
-        mob.position.y += mob.move.y;
-        if (checkColl(mob.getRect())) {
-            int d = -1;
-            if (mob.move.y < 0) d = 1;
-            if (d == -1) mob.canJump = true;
-            mob.position.y = MathUtils.round(mob.position.y);
-            while (checkColl(mob.getRect())) mob.position.y += d;
-            mob.move.y = 0;
-            if (mob.getType() > 0) {
-                gp.world.setForeMap((int) mob.position.x / 16, (int) mob.position.y / 16, mob.getType());
-                mob.position.y = -1;
-                mob.dead = true;
-            }
-        } else {
-            mob.canJump = false;
-        }
+        mob.pos.y += mob.mov.y;
+        mobYColl(mob);
 
-        if (mob.getType() == 0 && Items.isFluid(getBlock(mob.getRect()))) {
-            if (mob.move.y > 9) mob.move.add(0, -.9f);
-            mob.move.add(0, -.5f);
-            if (mob.move.y < -3) mob.move.y = -3;
-        } else if (mob.move.y < 18) mob.move.add(gravity);
+        if (mob.getType() == 0 && GameItems.isFluid(getBlock(mob.getRect()))) {
+            if (mob.mov.y > 9) mob.mov.add(0, -.9f);
+            mob.mov.add(0, -.5f);
+            if (mob.mov.y < -3) mob.mov.y = -3;
+        } else if (!mob.flyMode && mob.mov.y < 18) mob.mov.add(gravity);
 
-        mob.position.x += mob.move.x;
-        if (checkColl(mob.getRect())) {
-            if (mob.canJump) {
-                mob.position.y -= 8;
-            }
-            if (checkColl(mob.getRect())) {
-                if (mob.canJump) mob.position.y += 8;
-                int d = 0;
-                if (mob.move.x < 0) d = 1;
-                else if (mob.move.x > 0) d = -1;
-                mob.position.x = MathUtils.round(mob.position.x);
-                while (checkColl(mob.getRect())) mob.position.x += d;
-                if (mob.canJump) mob.changeDir();
-            }
-        }
-        if (mob.position.x + mob.width / 2 < 0) mob.position.x += gp.world.getWidth() * 16;
-        if (mob.position.x + mob.width / 2 > gp.world.getWidth() * 16)
-            mob.position.x -= gp.world.getWidth() * 16;
-        if (mob.position.y > gp.world.getHeight() * 16) {
-            mob.position.y = 0;
-        }
-        if (checkJump(mob.getRect(), mob.dir) && mob.canJump && mob.move.x != 0) {
-            mob.move.add(0, -8);
+        mob.pos.x += mob.mov.x;
+        mobXColl(mob);
+
+        if (checkJump(mob.getRect(), mob.getDir()) && mob.canJump && mob.mov.x != 0) {
+            mob.mov.add(0, -8);
             mob.canJump = false;
         }
     }
 
-    public void update(float delta) {
+    void update(float delta) {
+        //TODO use delta time
         for (Iterator<Drop> it = gp.drops.iterator(); it.hasNext(); ) {
             Drop drop = it.next();
             dropPhy(drop);
-            if (Intersector.overlaps(drop.getRect(), gp.player.getRect()))
-                drop.pickUpDrop(gp.player);
+            if (Intersector.overlaps(drop.getRect(), gp.player.getRect())) drop.pickUpDrop(gp.player);
             if (drop.pickedUp) it.remove();
         }
 
@@ -194,15 +186,15 @@ public class GamePhysics {
             Mob mob = it.next();
             mob.ai();
             mobPhy(mob);
-            if (mob.dead)
-                it.remove();
+            if (mob.isDead()) it.remove();
         }
 
         playerPhy(gp.player);
+        if (gp.player.isDead()) gp.player.respawn(gp.world);
 
         gp.renderer.setCamPos(
-                gp.player.position.x + gp.player.texWidth / 2 - gp.renderer.getWidth() / 2,
-                gp.player.position.y + gp.player.height / 2 - gp.renderer.getHeight() / 2);
+                gp.player.pos.x + gp.player.getWidth() / 2 - gp.renderer.getWidth() / 2,
+                gp.player.pos.y + gp.player.getHeight() / 2 - gp.renderer.getHeight() / 2);
     }
 
 }