diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index 1bedc729471a0a022c701bca28c56ebfbb674d04..34c4df111304a96557ee12ec0f767b3e8bfef40f 100644 (file)
package ru.deadsoftware.cavecraft.game;
-import com.badlogic.gdx.math.*;
+import com.badlogic.gdx.math.Intersector;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
import ru.deadsoftware.cavecraft.CaveGame;
-import ru.deadsoftware.cavecraft.Items;
import ru.deadsoftware.cavecraft.game.mobs.Mob;
import ru.deadsoftware.cavecraft.game.objects.Player;
public GamePhysics(GameProc gameProc) {
this.gameProc = gameProc;
- gravity = new Vector2(0,1);
+ gravity = new Vector2(0,.9f);
}
private boolean checkJump(Rectangle rect, int dir) {
- int bl = 0;
+ int bl;
switch (dir) {
case 0:
- if ((int)((rect.x+(rect.width/2))/16) - 1>=0)
- bl = gameProc.world.getForeMap(
- (int)((rect.x+(rect.width/2))/16) - 1,
- (int)(rect.y/16)+1);
+ bl = gameProc.world.getForeMap((int)((rect.x-8)/16),(int)((rect.y+rect.height-8)/16));
break;
case 1:
- if ((int)((rect.x+(rect.width/2))/16) + 1<gameProc.world.getWidth())
- bl = gameProc.world.getForeMap(
- (int)((rect.x+(rect.width/2))/16) + 1,
- (int)(rect.y/16)+1);
+ bl = gameProc.world.getForeMap((int)((rect.x+rect.width+8)/16),(int)((rect.y+rect.height-8)/16));
break;
default:
bl=0;
int minY = (int) ((rect.y+rect.height/2)/16)-4;
int maxX = (int) ((rect.x+rect.width/2)/16)+4;
int maxY = (int) ((rect.y+rect.height/2)/16)+4;
- if (minX<0) minX=0;
if (minY<0) minY=0;
- if (maxX>gameProc.world.getWidth()) maxX = gameProc.world.getWidth();
if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight();
for (int y=minY; y<maxY; y++) {
for (int x=minX; x<maxX; x++) {
private void playerPhy(Player pl) {
pl.position.add(pl.moveY);
if (checkColl(pl.getRect())) {
- pl.flyMode = false;
- pl.canJump = true;
int d = -1;
- if (pl.moveY.y<0) d=1; else if (pl.moveY.y>0) d=-1;
+ if (pl.moveY.y<0) d=1;
+ if (d==-1) {
+ pl.flyMode = false;
+ pl.canJump = true;
+ }
pl.position.y = MathUtils.round(pl.position.y);
while (checkColl(pl.getRect())) pl.position.y+=d;
pl.moveY.setZero();
} else {
pl.canJump = false;
}
- if (!pl.flyMode) pl.moveY.add(gravity);
+ if (!pl.flyMode && pl.moveY.y<18) pl.moveY.add(gravity);
pl.position.add(pl.moveX);
- if (pl.position.x<0 ||
- pl.position.x+pl.texWidth>=gameProc.world.getWidth()*16)
- pl.position.sub(pl.moveX);
if (checkColl(pl.getRect())) {
if (pl.canJump && !pl.flyMode) pl.position.y-=8;
if (checkColl(pl.getRect())) {
while (checkColl(pl.getRect())) pl.position.x += d;
}
}
+ if (pl.position.x+pl.texWidth/2<0) pl.position.x+=gameProc.world.getWidth()*16;
+ if (pl.position.x+pl.texWidth/2>gameProc.world.getWidth()*16) pl.position.x-=gameProc.world.getWidth()*16;
if (pl.position.y > gameProc.world.getHeight()*16) {
pl.position = gameProc.world.getSpawnPoint().cpy();
}
private void mobPhy(Mob mob) {
mob.position.add(mob.moveY);
if (checkColl(mob.getRect())) {
- mob.canJump = true;
int d = -1;
- if (mob.moveY.y<0) d=1; else if (mob.moveY.y>0) d=-1;
+ if (mob.moveY.y<0) d=1;
+ if (d==-1) mob.canJump = true;
mob.position.y = MathUtils.round(mob.position.y);
while (checkColl(mob.getRect())) mob.position.y+=d;
mob.moveY.setZero();
} else {
mob.canJump = false;
}
- mob.moveY.add(gravity);
+ if (mob.moveY.y<18) mob.moveY.add(gravity);
mob.position.add(mob.moveX);
- if (mob.position.x<32 ||
- mob.position.x+mob.width>gameProc.world.getWidth()*16-32)
- mob.position.sub(mob.moveX);
if (checkColl(mob.getRect())) {
- int d = 0;
- if (mob.moveX.x<0) d=1; else if (mob.moveX.x>0) d=-1;
- mob.position.x = MathUtils.round(mob.position.x);
- while (checkColl(mob.getRect())) mob.position.x+=d;
+ if (mob.canJump) {
+ mob.position.y-=8;
+ }
+ if (checkColl(mob.getRect())) {
+ if (mob.canJump) mob.position.y+=8;
+ int d = 0;
+ if (mob.moveX.x < 0) d = 1;
+ else if (mob.moveX.x > 0) d = -1;
+ mob.position.x = MathUtils.round(mob.position.x);
+ while (checkColl(mob.getRect())) mob.position.x += d;
+ }
+ }
+ if (mob.position.x+mob.width/2<0) mob.position.x+=gameProc.world.getWidth()*16;
+ if (mob.position.x+mob.width/2>gameProc.world.getWidth()*16) mob.position.x-=gameProc.world.getWidth()*16;
+ if (mob.position.y > gameProc.world.getHeight()*16) {
+ mob.position.y = 0;
+ }
+ if (checkJump(mob.getRect(), mob.dir) && mob.canJump && !mob.moveX.equals(Vector2.Zero)) {
+ mob.moveY.add(0, -8);
+ mob.canJump = false;
}
}
public void update(float delta) {
-
for (Mob mob : gameProc.mobs) {
mob.ai();
mobPhy(mob);