X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGamePhysics.java;h=6572cf558a9551692f67155b419f5e6d9cbaab51;hb=3992892d92be0c4ea654de3b4e10c32bf4552d9c;hp=6695d6e76864606e4fe06a6aaaa80e8dcf3e97b1;hpb=f4d52e3e4a3712050532786fca0aded5ff8b5a03;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
index 6695d6e..6572cf5 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
@@ -9,6 +9,7 @@ import ru.deadsoftware.cavedroid.game.mobs.Mob;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
 import ru.deadsoftware.cavedroid.game.mobs.Player;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
+import ru.deadsoftware.cavedroid.game.objects.DropController;
 
 import javax.inject.Inject;
 import java.util.Iterator;
@@ -24,14 +25,17 @@ class GamePhysics {
     private final GameWorld mGameWorld;
     private final MainConfig mMainConfig;
     private final MobsController mMobsController;
+    private final DropController mDropController;
 
     @Inject
     public GamePhysics(GameWorld gameWorld,
                        MainConfig mainConfig,
-                       MobsController mobsController) {
+                       MobsController mobsController,
+                       DropController dropController) {
         mGameWorld = gameWorld;
         mMainConfig = mainConfig;
         mMobsController = mobsController;
+        mDropController = dropController;
     }
 
     /**
@@ -92,26 +96,26 @@ class GamePhysics {
         if (dropToPlayer > 0) {
             drop.moveToPlayer(mGameWorld, mMobsController.getPlayer(), dropToPlayer);
         } else {
-            if (drop.getMove().x >= .5f) {
-                drop.getMove().x -= .5f;
-            } else if (drop.getMove().x <= -.5f) {
-                drop.getMove().x += .5f;
+            if (drop.getVelocity().x >= .5f) {
+                drop.getVelocity().x -= .5f;
+            } else if (drop.getVelocity().x <= -.5f) {
+                drop.getVelocity().x += .5f;
             } else {
-                drop.getMove().x = 0;
+                drop.getVelocity().x = 0;
             }
-            if (drop.getMove().y < 9) {
-                drop.getMove().y += gravity.y / 4;
+            if (drop.getVelocity().y < 9) {
+                drop.getVelocity().y += gravity.y / 4;
             }
         }
         drop.move();
 
 
         if (checkColl(drop)) {
-            drop.getMove().set(0, -1);
+            drop.getVelocity().set(0, -1);
             do {
                 drop.move();
             } while (checkColl(drop));
-            drop.getMove().setZero();
+            drop.getVelocity().setZero();
         }
     }
 
@@ -128,9 +132,9 @@ class GamePhysics {
 
                 int d = 0;
 
-                if (mob.getMove().x < 0) {
+                if (mob.getVelocity().x < 0) {
                     d = 1;
-                } else if (mob.getMove().x > 0) {
+                } else if (mob.getVelocity().x > 0) {
                     d = -1;
                 }
 
@@ -153,7 +157,7 @@ class GamePhysics {
         if (checkColl(mob)) {
             int d = -1;
 
-            if (mob.getMove().y < 0) {
+            if (mob.getVelocity().y < 0) {
                 d = 1;
             }
 
@@ -168,7 +172,7 @@ class GamePhysics {
                 mob.y += d;
             }
 
-            mob.getMove().y = 0;
+            mob.getVelocity().y = 0;
 
         } else {
             mob.setCanJump(false);
@@ -180,7 +184,7 @@ class GamePhysics {
     }
 
     private void playerPhy(Player player) {
-        player.y += player.getMove().y;
+        player.y += player.getVelocity().y;
         mobYColl(player);
 
         if (player.isDead()) {
@@ -188,81 +192,83 @@ class GamePhysics {
         }
 
         if (GameItems.isFluid(getBlock(player))) {
-            if (mMainConfig.isTouch() && player.getMove().x != 0 && !player.swim && !player.isFlyMode()) {
+            if (mMainConfig.isTouch() && player.getVelocity().x != 0 && !player.swim && !player.isFlyMode()) {
                 player.swim = true;
             }
             if (!player.swim) {
-                if (!player.isFlyMode() && player.getMove().y < 4.5f) {
-                    player.getMove().add(gravity.x / 4, gravity.y / 4);
+                if (!player.isFlyMode() && player.getVelocity().y < 4.5f) {
+                    player.getVelocity().add(gravity.x / 4, gravity.y / 4);
                 }
-                if (!player.isFlyMode() && player.getMove().y > 4.5f) {
-                    player.getMove().add(0, -1f);
+                if (!player.isFlyMode() && player.getVelocity().y > 4.5f) {
+                    player.getVelocity().add(0, -1f);
                 }
             } else {
-                player.getMove().add(0, -.5f);
-                if (player.getMove().y < -3) {
-                    player.getMove().y = -3;
+                player.getVelocity().add(0, -.5f);
+                if (player.getVelocity().y < -3) {
+                    player.getVelocity().y = -3;
                 }
             }
         } else {
-            if (!player.isFlyMode() && player.getMove().y < 18) {
-                player.getMove().add(gravity);
+            if (!player.isFlyMode() && player.getVelocity().y < 18) {
+                player.getVelocity().add(gravity);
             }
         }
 
-        player.x += player.getMove().x * (player.isFlyMode() ? 1.5f : 1) *
+        player.x += player.getVelocity().x * (player.isFlyMode() ? 1.5f : 1) *
                 (GameItems.isFluid(getBlock(player)) && !player.isFlyMode() ? .8f : 1);
 
         mobXColl(player);
 
-        if (mMainConfig.isTouch() && !player.isFlyMode() && player.canJump() && player.getMove().x != 0 && checkJump(player)) {
-            player.getMove().add(0, -8);
+        if (mMainConfig.isTouch() && !player.isFlyMode() && player.canJump() && player.getVelocity().x != 0 && checkJump(player)) {
+            player.getVelocity().add(0, -8);
             player.setCanJump(false);
         }
     }
 
     private void mobPhy(Mob mob) {
         if (mob.getType() == Mob.Type.MOB && GameItems.isFluid(getBlock(mob))) {
-            if (mob.getMove().y > 9) {
-                mob.getMove().add(0, -.9f);
+            if (mob.getVelocity().y > 9) {
+                mob.getVelocity().add(0, -.9f);
             }
 
-            mob.getMove().add(0, -.5f);
+            mob.getVelocity().add(0, -.5f);
 
-            if (mob.getMove().y < -3) {
-                mob.getMove().y = -3;
+            if (mob.getVelocity().y < -3) {
+                mob.getVelocity().y = -3;
             }
-        } else if (!mob.isFlyMode() && mob.getMove().y < 18) {
-            mob.getMove().add(gravity);
+        } else if (!mob.isFlyMode() && mob.getVelocity().y < 18) {
+            mob.getVelocity().add(gravity);
         }
 
-        mob.y += mob.getMove().y;
+        mob.y += mob.getVelocity().y;
         mobYColl(mob);
 
         if (mob.isDead()) {
             return;
         }
 
-        mob.x += mob.getMove().x;
+        mob.x += mob.getVelocity().x;
         mobXColl(mob);
 
-        if (mob.canJump() && mob.getMove().x != 0 && checkJump(mob)) {
-            mob.getMove().add(0, -8);
+        if (mob.canJump() && mob.getVelocity().x != 0 && checkJump(mob)) {
+            mob.getVelocity().add(0, -8);
             mob.setCanJump(false);
         }
     }
 
-    void update() {
-//        for (Iterator<Drop> it = GP.drops.iterator(); it.hasNext(); ) {
-//            Drop drop = it.next();
-//            dropPhy(drop);
-//            if (Intersector.overlaps(drop, GP.player)) {
-//                drop.pickUpDrop(GP.player);
-//            }
-//            if (drop.isPickedUp()) {
-//                it.remove();
-//            }
-//        }
+    void update(float delta) {
+        Player player = mMobsController.getPlayer();
+
+        for (Iterator<Drop> it = mDropController.getIterator(); it.hasNext(); ) {
+            Drop drop = it.next();
+            dropPhy(drop);
+            if (Intersector.overlaps(drop, player)) {
+                drop.pickUpDrop(player);
+            }
+            if (drop.isPickedUp()) {
+                it.remove();
+            }
+        }
 
         for (Iterator<Mob> it = mMobsController.getIterator(); it.hasNext(); ) {
             Mob mob = it.next();
@@ -273,7 +279,6 @@ class GamePhysics {
             }
         }
 
-        Player player = mMobsController.getPlayer();
         playerPhy(player);
         if (player.isDead()) {
             player.respawn(mGameWorld);