diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
index d6b5a9aa5da8e907c07430e1670cce350a61a757..e3ceb531cb3a37c4ac9aec5adf5b6c83152dc838 100644 (file)
import ru.deadsoftware.cavedroid.game.mobs.Player;
import ru.deadsoftware.cavedroid.game.objects.Drop;
import ru.deadsoftware.cavedroid.game.objects.DropController;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
import javax.inject.Inject;
import java.util.Iterator;
@GameScope
-class GamePhysics {
+public class GamePhysics {
- static final int PL_SPEED = 2;
+ public static final float PL_SPEED = 69.072f;
+ public static final float PL_JUMP_VELOCITY = -133.332f;
+ public static final float PL_TERMINAL_VELOCITY = 1254.4f;
- private final Vector2 gravity = new Vector2(0, .9f);
+ private final Vector2 gravity = new Vector2(0, 444.44f);
private final GameWorld mGameWorld;
private final MainConfig mMainConfig;
(int) (rect.y + rect.height / 8 * 7) / 16);
}
- private void dropPhy(Drop drop) {
+ private void dropPhy(Drop drop, float delta) {
int dropToPlayer = drop.closeToPlayer(mGameWorld, mMobsController.getPlayer());
+
if (dropToPlayer > 0) {
- drop.moveToPlayer(mGameWorld, mMobsController.getPlayer(), dropToPlayer);
+ drop.moveToPlayer(mGameWorld, mMobsController.getPlayer(), dropToPlayer, delta);
} else {
- if (drop.getMove().x >= .5f) {
- drop.getMove().x -= .5f;
- } else if (drop.getMove().x <= -.5f) {
- drop.getMove().x += .5f;
+ if (drop.getVelocity().x >= 300f) {
+ drop.getVelocity().x = 300f;
+ } else if (drop.getVelocity().x <= -300f) {
+ drop.getVelocity().x = -300f;
} else {
- drop.getMove().x = 0;
+ drop.getVelocity().x = 0;
}
- if (drop.getMove().y < 9) {
- drop.getMove().y += gravity.y / 4;
+ if (drop.getVelocity().y < PL_TERMINAL_VELOCITY) {
+ drop.getVelocity().y += gravity.y * delta;
}
}
- drop.move();
+ drop.move(delta);
if (checkColl(drop)) {
- drop.getMove().set(0, -1);
+ drop.getVelocity().set(0, -1);
do {
- drop.move();
+ drop.move(1);
} while (checkColl(drop));
- drop.getMove().setZero();
+ drop.getVelocity().setZero();
}
}
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;
}
if (checkColl(mob)) {
int d = -1;
- if (mob.getMove().y < 0) {
+ if (mob.getVelocity().y < 0) {
d = 1;
}
mob.y += d;
}
- mob.getMove().y = 0;
+ mob.getVelocity().y = 0;
+
+
+
+ //todo fall damage
+ // h = (v^2) / 2g
+ // dmg = max(0, (h - 48) / 32) - half of blocks fallen starting from 3 blocks height
+ // int dmg = ((int)Math.max(0f, (((mob.getVelocity().y * mob.getVelocity().y) / (2 * gravity.y)) - 48f) / 16f));
+ // if (dmg > 0) System.out.println("Damage: " + dmg);
} else {
- mob.setCanJump(false);
+ mob.y += 1;
+ mob.setCanJump(checkColl(mob));
+ mob.y -= 1;
}
if (mob.getY() > mGameWorld.getHeightPx()) {
}
}
- private void playerPhy(Player player) {
- player.y += player.getMove().y;
- mobYColl(player);
-
+ private void playerPhy(Player player, float delta) {
if (player.isDead()) {
return;
}
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 < 32f) {
+ player.getVelocity().y += gravity.y * delta;
}
- if (!player.isFlyMode() && player.getMove().y > 4.5f) {
- player.getMove().add(0, -1f);
+ if (!player.isFlyMode() && player.getVelocity().y > 32f) {
+ player.getVelocity().y -= player.getVelocity().y * 32f * delta;
}
} else {
- player.getMove().add(0, -.5f);
- if (player.getMove().y < -3) {
- player.getMove().y = -3;
+ player.getVelocity().y += PL_JUMP_VELOCITY * delta;
+ if (player.getVelocity().y < -PL_SPEED) {
+ player.getVelocity().y = -PL_SPEED;
}
}
} else {
- if (!player.isFlyMode() && player.getMove().y < 18) {
- player.getMove().add(gravity);
+ if (!player.isFlyMode() && player.getVelocity().y < PL_TERMINAL_VELOCITY) {
+ player.getVelocity().y += gravity.y * delta;
}
}
- player.x += player.getMove().x * (player.isFlyMode() ? 1.5f : 1) *
- (GameItems.isFluid(getBlock(player)) && !player.isFlyMode() ? .8f : 1);
+ player.y += player.getVelocity().y * delta;
+ mobYColl(player);
+
+ player.x += player.getVelocity().x * (player.isFlyMode() ? 1.5f : 1) *
+ (GameItems.isFluid(getBlock(player)) && !player.isFlyMode() ? .8f : 1) * delta;
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().y = PL_JUMP_VELOCITY;
player.setCanJump(false);
}
}
- private void mobPhy(Mob mob) {
+ private void mobPhy(Mob mob, float delta) {
if (mob.getType() == Mob.Type.MOB && GameItems.isFluid(getBlock(mob))) {
- if (mob.getMove().y > 9) {
- mob.getMove().add(0, -.9f);
+ if (mob.getVelocity().y > 32f) {
+ mob.getVelocity().y -= mob.getVelocity().y * 32f * delta;
}
- mob.getMove().add(0, -.5f);
+ mob.getVelocity().y += PL_JUMP_VELOCITY * delta;
- if (mob.getMove().y < -3) {
- mob.getMove().y = -3;
+ if (mob.getVelocity().y < -PL_SPEED) {
+ mob.getVelocity().y = -PL_SPEED;
}
- } else if (!mob.isFlyMode() && mob.getMove().y < 18) {
- mob.getMove().add(gravity);
+ } else if (!mob.isFlyMode() && mob.getVelocity().y < PL_TERMINAL_VELOCITY) {
+ mob.getVelocity().y += gravity.y * delta;
}
- mob.y += mob.getMove().y;
+ mob.y += mob.getVelocity().y * delta;
mobYColl(mob);
if (mob.isDead()) {
return;
}
- mob.x += mob.getMove().x;
+ mob.x += mob.getVelocity().x * delta;
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().y = PL_JUMP_VELOCITY;
mob.setCanJump(false);
}
}
- void update() {
+ void update(float delta) {
Player player = mMobsController.getPlayer();
for (Iterator<Drop> it = mDropController.getIterator(); it.hasNext(); ) {
Drop drop = it.next();
- dropPhy(drop);
+ dropPhy(drop, delta);
if (Intersector.overlaps(drop, player)) {
drop.pickUpDrop(player);
}
for (Iterator<Mob> it = mMobsController.getIterator(); it.hasNext(); ) {
Mob mob = it.next();
- mob.ai(mGameWorld);
- mobPhy(mob);
+ mob.ai(mGameWorld, delta);
+ mobPhy(mob, delta);
if (mob.isDead()) {
it.remove();
}
}
- playerPhy(player);
+ playerPhy(player, delta);
if (player.isDead()) {
player.respawn(mGameWorld);
}