X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGamePhysics.java;h=38253948725eae1e5fbf6c874509d1d7fe13f771;hb=e7a1e15a93abaafa8e2e0435336483a198cc697c;hp=6572cf558a9551692f67155b419f5e6d9cbaab51;hpb=3992892d92be0c4ea654de3b4e10c32bf4552d9c;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java index 6572cf5..3825394 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java @@ -10,17 +10,20 @@ 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 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; @@ -91,7 +94,7 @@ class GamePhysics { (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); @@ -107,13 +110,13 @@ class GamePhysics { drop.getVelocity().y += gravity.y / 4; } } - drop.move(); + drop.move(delta); if (checkColl(drop)) { drop.getVelocity().set(0, -1); do { - drop.move(); + drop.move(delta); } while (checkColl(drop)); drop.getVelocity().setZero(); } @@ -174,8 +177,18 @@ class GamePhysics { 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()) { @@ -183,10 +196,7 @@ class GamePhysics { } } - private void playerPhy(Player player) { - player.y += player.getVelocity().y; - mobYColl(player); - + private void playerPhy(Player player, float delta) { if (player.isDead()) { return; } @@ -196,62 +206,65 @@ class GamePhysics { player.swim = true; } if (!player.swim) { - if (!player.isFlyMode() && player.getVelocity().y < 4.5f) { - player.getVelocity().add(gravity.x / 4, gravity.y / 4); + if (!player.isFlyMode() && player.getVelocity().y < 32f) { + player.getVelocity().y += gravity.y * delta; } - if (!player.isFlyMode() && player.getVelocity().y > 4.5f) { - player.getVelocity().add(0, -1f); + if (!player.isFlyMode() && player.getVelocity().y > 32f) { + player.getVelocity().y -= player.getVelocity().y * 32f * delta; } } else { - player.getVelocity().add(0, -.5f); - if (player.getVelocity().y < -3) { - player.getVelocity().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.getVelocity().y < 18) { - player.getVelocity().add(gravity); + if (!player.isFlyMode() && player.getVelocity().y < PL_TERMINAL_VELOCITY) { + player.getVelocity().y += gravity.y * delta; } } + 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); + (GameItems.isFluid(getBlock(player)) && !player.isFlyMode() ? .8f : 1) * delta; mobXColl(player); if (mMainConfig.isTouch() && !player.isFlyMode() && player.canJump() && player.getVelocity().x != 0 && checkJump(player)) { - player.getVelocity().add(0, -8); + 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.getVelocity().y > 9) { - mob.getVelocity().add(0, -.9f); + if (mob.getVelocity().y > 32f) { + mob.getVelocity().y -= mob.getVelocity().y * 32f * delta; } - mob.getVelocity().add(0, -.5f); + mob.getVelocity().y += PL_JUMP_VELOCITY * delta; - if (mob.getVelocity().y < -3) { - mob.getVelocity().y = -3; + if (mob.getVelocity().y < -PL_SPEED) { + mob.getVelocity().y = -PL_SPEED; } - } else if (!mob.isFlyMode() && mob.getVelocity().y < 18) { - mob.getVelocity().add(gravity); + } else if (!mob.isFlyMode() && mob.getVelocity().y < PL_TERMINAL_VELOCITY) { + mob.getVelocity().y += gravity.y * delta; } - mob.y += mob.getVelocity().y; + mob.y += mob.getVelocity().y * delta; mobYColl(mob); if (mob.isDead()) { return; } - mob.x += mob.getVelocity().x; + mob.x += mob.getVelocity().x * delta; mobXColl(mob); if (mob.canJump() && mob.getVelocity().x != 0 && checkJump(mob)) { - mob.getVelocity().add(0, -8); + mob.getVelocity().y += PL_JUMP_VELOCITY; mob.setCanJump(false); } } @@ -261,7 +274,7 @@ class GamePhysics { for (Iterator it = mDropController.getIterator(); it.hasNext(); ) { Drop drop = it.next(); - dropPhy(drop); + dropPhy(drop, delta); if (Intersector.overlaps(drop, player)) { drop.pickUpDrop(player); } @@ -272,14 +285,14 @@ class GamePhysics { for (Iterator 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); }