X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGamePhysics.java;h=d9bf21fe5dec302fad3e1cf984e7d44eae22852e;hb=3d972278cf3a54b6a7b574690ca4b41577464dce;hp=70afcbfe5d3f1be77cdd772d61584b142022f7bd;hpb=462f97f8da742fe35f516fec00ca9a581d688e7a;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java index 70afcbf..d9bf21f 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java @@ -7,9 +7,10 @@ import com.badlogic.gdx.math.Vector2; import ru.deadsoftware.cavedroid.MainConfig; 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 ru.deadsoftware.cavedroid.game.mobs.player.Player; +import ru.deadsoftware.cavedroid.game.model.block.Block; +import ru.deadsoftware.cavedroid.game.objects.drop.Drop; +import ru.deadsoftware.cavedroid.game.objects.drop.DropController; import ru.deadsoftware.cavedroid.game.world.GameWorld; import javax.annotation.CheckForNull; @@ -29,16 +30,19 @@ public class GamePhysics { private final MainConfig mMainConfig; private final MobsController mMobsController; private final DropController mDropController; + private final GameItemsHolder mGameItemsHolder; @Inject public GamePhysics(GameWorld gameWorld, MainConfig mainConfig, MobsController mobsController, - DropController dropController) { + DropController dropController, + GameItemsHolder gameItemsHolder) { mGameWorld = gameWorld; mMainConfig = mainConfig; mMobsController = mobsController; mDropController = dropController; + mGameItemsHolder = gameItemsHolder; } /** @@ -50,17 +54,21 @@ public class GamePhysics { int dir = mob.looksLeft() ? 0 : 1; int blX = (int) (mob.getX() + mob.getWidth() * dir - 8 + 16 * dir); int blY = (int) (mob.getY() + mob.getHeight() - 8); - int block = mGameWorld.getForeMap(blX / 16, blY / 16); + Block block = mGameWorld.getForeMap(blX / 16, blY / 16); - if (checkColl(new Rectangle(blX, mob.getY() - 18, mob.getWidth(), mob.getHeight()))) { - block = 0; + if (checkColl(new Rectangle(blX, mob.getY() - 18, mob.getWidth(), mob.getHeight())) != null) { + return false; } - return (block > 0 && GameItems.getBlock(block).toJump() && - (mob.getY() + mob.getHeight()) - GameItems.getBlock(block).getRectangle(blX / 16, blY / 16).y > 8); + return (block.toJump() && + (mob.getY() + mob.getHeight()) - block.getRectangle(blX / 16, blY / 16).y > 8); } - private boolean checkColl(Rectangle rect) { + /** + * @return colliding rect or null if no collision + */ + @CheckForNull + private Rectangle checkColl(Rectangle rect) { int minX = (int) ((rect.x + rect.width / 2) / 16) - 4; int minY = (int) ((rect.y + rect.height / 2) / 16) - 4; int maxX = (int) ((rect.x + rect.width / 2) / 16) + 4; @@ -74,22 +82,26 @@ public class GamePhysics { maxY = mGameWorld.getHeight(); } - int block; + Block block; for (int y = minY; y < maxY; y++) { for (int x = minX; x < maxX; x++) { + if (!mGameWorld.hasForeAt(x, y)) { + continue; + } block = mGameWorld.getForeMap(x, y); - if (block > 0 && GameItems.getBlock(block).hasCollision()) { - if (Intersector.overlaps(rect, GameItems.getBlock(block).getRectangle(x, y))) { - return true; + if (block.hasCollision()) { + final Rectangle blockRect = block.getRectangle(x, y); + if (Intersector.overlaps(rect, blockRect)) { + return blockRect; } } } } - return false; + return null; } - private int getBlock(Rectangle rect) { + private Block getBlock(Rectangle rect) { return mGameWorld.getForeMap((int) (rect.x + rect.width / 2) / 16, (int) (rect.y + rect.height / 8 * 7) / 16); } @@ -106,6 +118,10 @@ public class GamePhysics { private Rectangle getShiftedMagnetingPlayerRect(Drop drop) { final Player player = mMobsController.getPlayer(); + if (!player.inventory.canPickItem(drop)) { + return null; + } + if (drop.canMagnetTo(player)) { return getShiftedPlayerRect(0); } @@ -127,7 +143,7 @@ public class GamePhysics { final Player player = mMobsController.getPlayer(); if (Intersector.overlaps(shiftedPlayerTarget, drop)) { - player.pickUpDrop(drop); + player.inventory.pickDrop(drop); } } @@ -151,11 +167,11 @@ public class GamePhysics { drop.x += dropVelocity.x * delta; drop.y += dropVelocity.y * delta; - if (checkColl(drop)) { + if (checkColl(drop) != null) { dropVelocity.setZero(); do { drop.y--; - } while (checkColl(drop)); + } while (checkColl(drop) != null); } if (playerMagnetTarget != null) { @@ -164,16 +180,21 @@ public class GamePhysics { } private void mobXColl(Mob mob) { - if (checkColl(mob)) { - if (mob.canJump() && !mob.isFlyMode()) { - mob.y -= 8; + if (mob.getVelocity().x == 0f) { + return; + } + + @CheckForNull Rectangle collidingRect = checkColl(mob); + + if (collidingRect != null) { + if (mob.canJump() && !mob.isFlyMode() && collidingRect.y >= mob.y + mob.height - 8) { + mob.y = collidingRect.y - mob.height; + return; } - if (checkColl(mob)) { - if (mob.canJump() && !mob.isFlyMode()) { - mob.y += 8; - } + collidingRect = checkColl(mob); + if (collidingRect != null) { int d = 0; if (mob.getVelocity().x < 0) { @@ -182,12 +203,17 @@ public class GamePhysics { d = -1; } - mob.x = MathUtils.round(mob.getX()); - - while (checkColl(mob)) { - mob.x += d; + if (d < 0) { + mob.x = collidingRect.x - mob.width; + } else { + mob.x = collidingRect.x + collidingRect.width; } +// mob.x = MathUtils.round(mob.getX()); +// while (checkColl(mob) != null) { +// mob.x += d; +// } + if (mob.canJump()) { mob.changeDir(); } @@ -198,7 +224,8 @@ public class GamePhysics { } private void mobYColl(Mob mob) { - if (checkColl(mob)) { + @CheckForNull final Rectangle collidingRect = checkColl(mob); + if (collidingRect != null) { int d = -1; if (mob.getVelocity().y < 0) { @@ -208,27 +235,31 @@ public class GamePhysics { if (d == -1) { mob.setCanJump(true); mob.setFlyMode(false); - } - - mob.y = MathUtils.round(mob.getY()); - while (checkColl(mob)) { - mob.y += d; + int dmg = ((int)Math.max(0f, (((mob.getVelocity().y * mob.getVelocity().y) / (2 * gravity.y)) - 48f) / 16f)); + if (dmg > 0) { + mob.damage(dmg); + } } - mob.getVelocity().y = 0; + if (d < 0) { + mob.y = collidingRect.y - mob.height; + } else { + mob.y = collidingRect.y + collidingRect.height; + } +// mob.y = MathUtils.round(mob.getY()); +// +// while (checkColl(mob)) { +// mob.y += d; +// } - //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); + mob.getVelocity().y = 0; } else { mob.y += 1; - mob.setCanJump(checkColl(mob)); + mob.setCanJump(checkColl(mob) != null); mob.y -= 1; } @@ -242,7 +273,7 @@ public class GamePhysics { return; } - if (GameItems.isFluid(getBlock(player))) { + if (getBlock(player).isFluid()) { if (mMainConfig.isTouch() && player.getVelocity().x != 0 && !player.swim && !player.isFlyMode()) { player.swim = true; } @@ -269,7 +300,7 @@ public class GamePhysics { mobYColl(player); player.x += player.getVelocity().x * (player.isFlyMode() ? 1.5f : 1) * - (GameItems.isFluid(getBlock(player)) && !player.isFlyMode() ? .8f : 1) * delta; + (getBlock(player).isFluid() && !player.isFlyMode() ? .8f : 1) * delta; mobXColl(player); @@ -280,7 +311,7 @@ public class GamePhysics { } private void mobPhy(Mob mob, float delta) { - if (mob.getType() == Mob.Type.MOB && GameItems.isFluid(getBlock(mob))) { + if (mob.getType() == Mob.Type.MOB && getBlock(mob).isFluid()) { if (mob.getVelocity().y > 32f) { mob.getVelocity().y -= mob.getVelocity().y * 32f * delta; } @@ -321,9 +352,9 @@ public class GamePhysics { } } - for (Iterator it = mMobsController.getIterator(); it.hasNext(); ) { + for (Iterator it = mMobsController.getMobs().iterator(); it.hasNext(); ) { Mob mob = it.next(); - mob.ai(mGameWorld, delta); + mob.ai(mGameWorld, mGameItemsHolder, delta); mobPhy(mob, delta); if (mob.isDead()) { it.remove(); @@ -331,8 +362,9 @@ public class GamePhysics { } playerPhy(player, delta); + player.ai(mGameWorld, mGameItemsHolder, delta); if (player.isDead()) { - player.respawn(mGameWorld); + player.respawn(mGameWorld, mGameItemsHolder); } }