diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
index e3ceb531cb3a37c4ac9aec5adf5b6c83152dc838..cd900d873dc1398e6b41ea492be77a87feaca25a 100644 (file)
import ru.deadsoftware.cavedroid.game.objects.DropController;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
+import javax.annotation.CheckForNull;
import javax.inject.Inject;
import java.util.Iterator;
(int) (rect.y + rect.height / 8 * 7) / 16);
}
+ private Rectangle getShiftedPlayerRect(float shift) {
+ final Player player = mMobsController.getPlayer();
+ return new Rectangle(player.x + shift, player.y, player.width, player.height);
+ }
+
+ /**
+ * @return Rectangle representing magneting target for this drop
+ */
+ @CheckForNull
+ private Rectangle getShiftedMagnetingPlayerRect(Drop drop) {
+ final Player player = mMobsController.getPlayer();
+
+ if (drop.canMagnetTo(player)) {
+ return getShiftedPlayerRect(0);
+ }
+
+ final Rectangle shiftedLeft = getShiftedPlayerRect(-mGameWorld.getWidthPx());
+ if (drop.canMagnetTo(shiftedLeft)) {
+ return shiftedLeft;
+ }
+
+ final Rectangle shiftedRight = getShiftedPlayerRect(mGameWorld.getWidthPx());
+ if (drop.canMagnetTo(shiftedRight)) {
+ return shiftedRight;
+ }
+
+ return null;
+ }
+
+ private void pickUpDropIfPossible(Rectangle shiftedPlayerTarget, Drop drop) {
+ final Player player = mMobsController.getPlayer();
+
+ if (Intersector.overlaps(shiftedPlayerTarget, drop)) {
+ player.pickUpDrop(drop);
+ }
+ }
+
private void dropPhy(Drop drop, float delta) {
- int dropToPlayer = drop.closeToPlayer(mGameWorld, mMobsController.getPlayer());
+ final Rectangle playerMagnetTarget = getShiftedMagnetingPlayerRect(drop);
+ final Vector2 dropVelocity = drop.getVelocity();
+
- if (dropToPlayer > 0) {
- drop.moveToPlayer(mGameWorld, mMobsController.getPlayer(), dropToPlayer, delta);
+ if (playerMagnetTarget != null) {
+ final Vector2 magnetVector = new Vector2(playerMagnetTarget.x - drop.x,
+ playerMagnetTarget.y - drop.y);
+ magnetVector.nor().scl(Drop.MAGNET_VELOCITY * delta);
+ dropVelocity.add(magnetVector);
} else {
- if (drop.getVelocity().x >= 300f) {
- drop.getVelocity().x = 300f;
- } else if (drop.getVelocity().x <= -300f) {
- drop.getVelocity().x = -300f;
- } else {
- drop.getVelocity().x = 0;
- }
- if (drop.getVelocity().y < PL_TERMINAL_VELOCITY) {
- drop.getVelocity().y += gravity.y * delta;
- }
+ dropVelocity.y += gravity.y * delta;
}
- drop.move(delta);
+ dropVelocity.x = MathUtils.clamp(dropVelocity.x, -Drop.MAGNET_VELOCITY, Drop.MAGNET_VELOCITY);
+ dropVelocity.y = MathUtils.clamp(dropVelocity.y, -Drop.MAGNET_VELOCITY, Drop.MAGNET_VELOCITY);
+
+ drop.x += dropVelocity.x * delta;
+ drop.y += dropVelocity.y * delta;
if (checkColl(drop)) {
- drop.getVelocity().set(0, -1);
+ dropVelocity.setZero();
do {
- drop.move(1);
+ drop.y--;
} while (checkColl(drop));
- drop.getVelocity().setZero();
+ }
+
+ if (playerMagnetTarget != null) {
+ pickUpDropIfPossible(playerMagnetTarget, drop);
}
}
for (Iterator<Drop> it = mDropController.getIterator(); it.hasNext(); ) {
Drop drop = it.next();
dropPhy(drop, delta);
- if (Intersector.overlaps(drop, player)) {
- drop.pickUpDrop(player);
- }
- if (drop.isPickedUp()) {
+ if (drop.getPickedUp()) {
it.remove();
}
}