diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index 1ed455b75ce04cd450e7c6c5b407dfe31b205b8b..f49eb178b9f9501ebfb783cc0382debde6ac190e 100644 (file)
package ru.deadsoftware.cavecraft.game;
-import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
+import ru.deadsoftware.cavecraft.game.mobs.Mob;
import ru.deadsoftware.cavecraft.game.objects.Player;
public class GamePhysics {
public GamePhysics(GameProc gameProc) {
this.gameProc = gameProc;
- gravity = new Vector2(0,2);
+ gravity = new Vector2(0,1);
}
private boolean checkColl(Rectangle rect) {
int[] bl = new int [6];
- bl[0] = gameProc.world.getForeMap(((int)rect.x/16), ((int)rect.y/16));
- bl[1] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)rect.y/16));
- bl[2] = gameProc.world.getForeMap(((int)rect.x/16), ((int)(rect.y+rect.height/2)/16));
- bl[3] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+rect.height/2)/16));
- bl[4] = gameProc.world.getForeMap(((int)rect.x/16), ((int)(rect.y+rect.height-1)/16));
- bl[5] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+(rect.height-1))/16));
+ bl[0] = gameProc.world.getForeMap(((int)(rect.x+2)/16), ((int)rect.y/16));
+ bl[1] = gameProc.world.getForeMap(((int)(rect.x+rect.width-2)/16), ((int)rect.y/16));
+ bl[2] = gameProc.world.getForeMap(((int)(rect.x+2)/16), ((int)(rect.y+rect.height/2)/16));
+ bl[3] = gameProc.world.getForeMap(((int)(rect.x+rect.width-2)/16), ((int)(rect.y+rect.height/2)/16));
+ bl[4] = gameProc.world.getForeMap(((int)(rect.x+2)/16), ((int)(rect.y+rect.height-1)/16));
+ bl[5] = gameProc.world.getForeMap(((int)(rect.x+rect.width-2)/16), ((int)(rect.y+(rect.height-1))/16));
for (int b: bl) if (b>0) {
return true;
}
return false;
}
- private void movePlayer(Player pl) {
- pl.position.add(pl.moveX);
- if (checkColl(pl.getRect())) {
- int d = 0;
- if (pl.moveX.x<0) d=1; else if (pl.moveX.x>0) d=-1;
- while (checkColl(pl.getRect())) pl.position.x+=d;
- //pl.moveX.setZero();
- }
+ private void playerPhy(Player pl) {
pl.position.add(pl.moveY);
if (checkColl(pl.getRect())) {
- int d = 0;
+ pl.canJump = true;
+ int d = -1;
if (pl.moveY.y<0) d=1; else if (pl.moveY.y>0) d=-1;
+ pl.position.y = MathUtils.round(pl.position.y);
while (checkColl(pl.getRect())) pl.position.y+=d;
pl.moveY.setZero();
+ } else {
+ pl.canJump = false;
}
pl.moveY.add(gravity);
+ pl.position.add(pl.moveX);
+ if (pl.position.x<0 ||
+ pl.position.x+pl.width>gameProc.world.getWidth()*16)
+ pl.position.sub(pl.moveX);
+ if (checkColl(pl.getRect())) {
+ int d = 0;
+ if (pl.moveX.x<0) d=1; else if (pl.moveX.x>0) d=-1;
+ pl.position.x = MathUtils.round(pl.position.x);
+ while (checkColl(pl.getRect())) pl.position.x+=d;
+ }
switch (pl.dir) {
case 0:
gameProc.renderer.camTargetPos.x = pl.position.x-gameProc.renderer.camera.viewportWidth+100;
gameProc.renderer.camTargetPos.x = pl.position.x-100;
break;
}
+ if (gameProc.renderer.camTargetPos.x < 0) gameProc.renderer.camTargetPos.x = 0;
+ if (gameProc.renderer.camTargetPos.x + gameProc.renderer.camera.viewportWidth >
+ gameProc.world.getWidth()*16)
+ gameProc.renderer.camTargetPos.x = gameProc.world.getWidth()*16-gameProc.renderer.camera.viewportWidth;
}
+ 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;
+ 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);
+ 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;
+ }
+}
+
public void update(float delta) {
- movePlayer(gameProc.player);
+
+ for (Mob mob : gameProc.mobs) {
+ mob.ai();
+ mobPhy(mob);
+ }
+ playerPhy(gameProc.player);
+
if (gameProc.renderer.camera.position.x - gameProc.renderer.camTargetPos.x <= 8 &&
gameProc.renderer.camera.position.x - gameProc.renderer.camTargetPos.x >= -8) {
gameProc.renderer.camera.position.x = gameProc.renderer.camTargetPos.x;