diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index 8f3e8fe7309f8f679626b2fbf5665f12fb21a8a3..88791dc67a59d337235c8a79d55c9080cb117c04 100644 (file)
private boolean checkJump(Rectangle rect, int dir) {
int bl;
- switch (dir) {
- case 0:
- bl = gp.world.getForeMap((int) ((rect.x - 8) / 16), (int) ((rect.y + rect.height - 8) / 16));
- if (checkColl(new Rectangle(rect.x - 8, rect.y - 18, rect.width, rect.height))) bl = 0;
- break;
- case 1:
- bl = gp.world.getForeMap((int) ((rect.x + rect.width + 8) / 16), (int) ((rect.y + rect.height - 8) / 16));
- if (checkColl(new Rectangle(rect.x + rect.width + 8, rect.y - 18, rect.width, rect.height))) bl = 0;
- break;
- default:
- bl = 0;
- }
+ int blX = (int) (rect.x + rect.width * dir - 8 + 16 * dir);
+ int blY = (int) (rect.y + rect.height - 8);
+
+ bl = gp.world.getForeMap(blX / 16, blY / 16);
+ if (checkColl(new Rectangle(blX, rect.y - 18, rect.width, rect.height))) bl = 0;
+
return (bl > 0 && GameItems.getBlock(bl).toJump() &&
- (rect.y + rect.height) - GameItems.getBlock(bl).getRect((int) ((rect.x - 8) / 16), (int) ((rect.y + rect.height - 8) / 16)).y > 8);
+ (rect.y + rect.height) - GameItems.getBlock(bl).getRect(blX / 16, blY / 16).y > 8);
}
private boolean checkColl(Rectangle rect) {
}
}
- private void playerPhy(Player pl) {
- pl.pos.y += pl.mov.y;
- if (checkColl(pl.getRect())) {
+ private void mobXColl(Mob mob) {
+ if (checkColl(mob.getRect())) {
+ if (mob.canJump && !mob.flyMode) {
+ mob.pos.y -= 8;
+ }
+ if (checkColl(mob.getRect())) {
+ if (mob.canJump && !mob.flyMode) mob.pos.y += 8;
+ int d = 0;
+ if (mob.mov.x < 0) d = 1;
+ else if (mob.mov.x > 0) d = -1;
+ mob.pos.x = MathUtils.round(mob.pos.x);
+ while (checkColl(mob.getRect())) mob.pos.x += d;
+ if (mob.canJump) mob.changeDir();
+ }
+ }
+ if (mob.pos.x + mob.getWidth() / 2 < 0) mob.pos.x += gp.world.getWidthPx();
+ if (mob.pos.x + mob.getWidth() / 2 > gp.world.getWidthPx()) mob.pos.x -= gp.world.getWidthPx();
+ }
+
+ private void mobYColl(Mob mob) {
+ if (checkColl(mob.getRect())) {
int d = -1;
- if (pl.mov.y < 0) d = 1;
+ if (mob.mov.y < 0) d = 1;
if (d == -1) {
- pl.flyMode = false;
- pl.canJump = true;
+ mob.canJump = true;
+ mob.flyMode = false;
+ }
+ mob.pos.y = MathUtils.round(mob.pos.y);
+ while (checkColl(mob.getRect())) mob.pos.y += d;
+ mob.mov.y = 0;
+ if (mob.getType() > 0) {
+ gp.world.setForeMap(mob.getMapX(), mob.getMapY(), mob.getType());
+ mob.kill();
}
- pl.pos.y = MathUtils.round(pl.pos.y);
- while (checkColl(pl.getRect())) pl.pos.y += d;
- pl.mov.y = 0;
} else {
- pl.canJump = false;
+ mob.canJump = false;
}
+ if (mob.pos.y > gp.world.getHeightPx()) {
+ mob.kill();
+ }
+ }
+
+ private void playerPhy(Player pl) {
+ pl.pos.y += pl.mov.y;
+ mobYColl(pl);
+ if (pl.isDead()) return;
if (GameItems.isFluid(getBlock(pl.getRect()))) {
- if (CaveGame.TOUCH && pl.mov.x != 0 && !gp.swim && !pl.flyMode) gp.swim = true;
- if (!gp.swim) {
+ if (CaveGame.TOUCH && pl.mov.x != 0 && !pl.swim && !pl.flyMode) pl.swim = true;
+ if (!pl.swim) {
if (!pl.flyMode && pl.mov.y < 4.5f) pl.mov.add(gravity.x / 4, gravity.y / 4);
if (!pl.flyMode && pl.mov.y > 4.5f) pl.mov.add(0, -1f);
} else {
}
pl.pos.x += pl.mov.x;
- if (checkColl(pl.getRect())) {
- if (pl.canJump && !pl.flyMode) pl.pos.y -= 8;
- if (checkColl(pl.getRect())) {
- if (pl.canJump && !pl.flyMode) pl.pos.y += 8;
- int d = 0;
- if (pl.mov.x < 0) d = 1;
- else if (pl.mov.x > 0) d = -1;
- pl.pos.x = MathUtils.round(pl.pos.x);
- while (checkColl(pl.getRect())) pl.pos.x += d;
- }
- }
- if (pl.pos.x + pl.getWidth() / 2 < 0) pl.pos.x += gp.world.getWidthPx();
- if (pl.pos.x + pl.getWidth() / 2 > gp.world.getWidthPx()) pl.pos.x -= gp.world.getWidthPx();
- if (pl.pos.y > gp.world.getHeightPx()) {
- pl.respawn(gp.world);
- }
+ mobXColl(pl);
+
if (CaveGame.TOUCH && checkJump(pl.getRect(), pl.getDir()) && !pl.flyMode && pl.canJump && pl.mov.x != 0) {
pl.mov.add(0, -8);
pl.canJump = false;
private void mobPhy(Mob mob) {
mob.pos.y += mob.mov.y;
- if (checkColl(mob.getRect())) {
- int d = -1;
- if (mob.mov.y < 0) d = 1;
- if (d == -1) mob.canJump = true;
- mob.pos.y = MathUtils.round(mob.pos.y);
- while (checkColl(mob.getRect())) mob.pos.y += d;
- mob.mov.y = 0;
- if (mob.getType() > 0) {
- gp.world.setForeMap(mob.getMapX(), mob.getMapY(), mob.getType());
- mob.kill();
- }
- } else {
- mob.canJump = false;
- }
+ mobYColl(mob);
+ if (mob.isDead()) return;
if (mob.getType() == 0 && GameItems.isFluid(getBlock(mob.getRect()))) {
if (mob.mov.y > 9) mob.mov.add(0, -.9f);
mob.mov.add(0, -.5f);
if (mob.mov.y < -3) mob.mov.y = -3;
- } else if (mob.mov.y < 18) mob.mov.add(gravity);
+ } else if (!mob.flyMode && mob.mov.y < 18) mob.mov.add(gravity);
mob.pos.x += mob.mov.x;
- if (checkColl(mob.getRect())) {
- if (mob.canJump) {
- mob.pos.y -= 8;
- }
- if (checkColl(mob.getRect())) {
- if (mob.canJump) mob.pos.y += 8;
- int d = 0;
- if (mob.mov.x < 0) d = 1;
- else if (mob.mov.x > 0) d = -1;
- mob.pos.x = MathUtils.round(mob.pos.x);
- while (checkColl(mob.getRect())) mob.pos.x += d;
- if (mob.canJump) mob.changeDir();
- }
- }
- if (mob.pos.x + mob.getWidth() / 2 < 0) mob.pos.x += gp.world.getWidthPx();
- if (mob.pos.x + mob.getWidth() / 2 > gp.world.getWidthPx()) mob.pos.x -= gp.world.getWidthPx();
- if (mob.pos.y > gp.world.getHeightPx()) {
- mob.pos.y = 0;
- }
+ mobXColl(mob);
+
if (checkJump(mob.getRect(), mob.getDir()) && mob.canJump && mob.mov.x != 0) {
mob.mov.add(0, -8);
mob.canJump = false;
}
void update(float delta) {
+ //TODO use delta time
for (Iterator<Drop> it = gp.drops.iterator(); it.hasNext(); ) {
Drop drop = it.next();
dropPhy(drop);
}
playerPhy(gp.player);
+ if (gp.player.isDead()) gp.player.respawn(gp.world);
gp.renderer.setCamPos(
- gp.player.pos.x + (float) gp.player.getWidth() / 2 - gp.renderer.getWidth() / 2,
- gp.player.pos.y + (float) gp.player.getHeight() / 2 - gp.renderer.getHeight() / 2);
+ gp.player.pos.x + gp.player.getWidth() / 2 - gp.renderer.getWidth() / 2,
+ gp.player.pos.y + gp.player.getHeight() / 2 - gp.renderer.getHeight() / 2);
}
}