diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index 372bf6e9e6e162a0f711a906ad190408a44d05c3..101ff7950f8d7f5560a84daf0c772212265e4d85 100644 (file)
package ru.deadsoftware.cavecraft.game;
-import com.badlogic.gdx.Gdx;
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.game.mobs.Mob;
+import ru.deadsoftware.cavecraft.game.objects.Drop;
import ru.deadsoftware.cavecraft.game.objects.Player;
import java.util.Iterator;
-public class GamePhysics {
+class GamePhysics {
- public static final int PL_SPEED = 2;
+ static final int PL_SPEED = 2;
- private GameProc gameProc;
+ private GameProc gp;
private Vector2 gravity;
- public GamePhysics(GameProc gameProc) {
- this.gameProc = gameProc;
- gravity = new Vector2(0,.9f);
+ GamePhysics(GameProc gp) {
+ this.gp = gp;
+ gravity = new Vector2(0, .9f);
}
private boolean checkJump(Rectangle rect, int dir) {
int bl;
switch (dir) {
case 0:
- bl = gameProc.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;
+ 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 = gameProc.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;
+ 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;
+ bl = 0;
}
- return (bl>0 && Items.BLOCKS.getValueAt(bl).toJump() &&
- (rect.y+rect.height)-Items.BLOCKS.getValueAt(bl).getRect((int)((rect.x-8)/16),(int)((rect.y+rect.height-8)/16)).y>8);
+ 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);
}
private boolean checkColl(Rectangle rect) {
int bl;
- 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;
- int maxY = (int) ((rect.y+rect.height/2)/16)+4;
- if (minY<0) minY=0;
- if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight();
- for (int y=minY; y<maxY; y++) {
- for (int x=minX; x<maxX; x++) {
- bl = gameProc.world.getForeMap(x,y);
- if (bl>0 && Items.BLOCKS.getValueAt(bl).collision){
- if (Intersector.overlaps(rect, Items.BLOCKS.getValueAt(bl).getRect(x,y))){
+ 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;
+ int maxY = (int) ((rect.y + rect.height / 2) / 16) + 4;
+ if (minY < 0) minY = 0;
+ if (maxY > gp.world.getHeight()) maxY = gp.world.getHeight();
+ for (int y = minY; y < maxY; y++) {
+ for (int x = minX; x < maxX; x++) {
+ bl = gp.world.getForeMap(x, y);
+ if (bl > 0 && GameItems.getBlock(bl).hasCollision()) {
+ if (Intersector.overlaps(rect, GameItems.getBlock(bl).getRect(x, y))) {
return true;
}
}
}
private int getBlock(Rectangle rect) {
- return gameProc.world.getForeMap((int)(rect.x+rect.width/2)/16, (int)(rect.y+rect.height/8*7)/16);
+ return gp.world.getForeMap((int) (rect.x + rect.width / 2) / 16, (int) (rect.y + rect.height / 8 * 7) / 16);
}
- private void playerPhy(Player pl) {
- pl.position.add(pl.moveY);
- if (checkColl(pl.getRect())) {
- int 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();
+ private void dropPhy(Drop drop) {
+ if (drop.closeToPlayer(gp) > 0) {
+ drop.moveToPlayer(gp);
} else {
- pl.canJump = false;
+ if (drop.move.x >= .5f) drop.move.x -= .5f;
+ else if (drop.move.x <= -.5f) drop.move.x += .5f;
+ else drop.move.x = 0;
+ if (drop.move.y < 9) drop.move.y += gravity.y / 4;
}
-
- if (Items.isFluid(getBlock(pl.getRect()))) {
- if (CaveGame.TOUCH && pl.moveX.x!=0 && !gameProc.swim && !pl.flyMode) gameProc.swim = true;
- if (!gameProc.swim) {
- if (!pl.flyMode && pl.moveY.y < 4.5f) pl.moveY.add(gravity.x / 4, gravity.y / 4);
- if (!pl.flyMode && pl.moveY.y > 4.5f) pl.moveY.add(0, -1f);
- } else {
- pl.moveY.add(0, -.5f);
- if (pl.moveY.y<-3) pl.moveY.y = -3;
- }
- } else {
- if (!pl.flyMode && pl.moveY.y<18) pl.moveY.add(gravity);
- //if (CaveGame.TOUCH && gameProc.swim) gameProc.swim = false;
+ drop.pos.add(drop.move);
+ if (drop.pos.x + 8 > gp.world.getWidthPx()) drop.pos.x -= gp.world.getWidthPx();
+ else if (drop.pos.x < 0) drop.pos.x += gp.world.getWidthPx();
+ drop.pos.y = MathUtils.round(drop.pos.y);
+ while (checkColl(drop.getRect())) {
+ drop.pos.y--;
+ drop.move.y = 0;
}
+ }
- pl.position.add(pl.moveX);
- if (checkColl(pl.getRect())) {
- if (pl.canJump && !pl.flyMode) pl.position.y-=8;
- if (checkColl(pl.getRect())) {
- if (pl.canJump && !pl.flyMode) pl.position.y+=8;
+ 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 (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;
+ 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 (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();
- }
- if (CaveGame.TOUCH && checkJump(pl.getRect(), pl.dir) && !pl.flyMode && pl.canJump && !pl.moveX.equals(Vector2.Zero)) {
- pl.moveY.add(0, -8);
- pl.canJump = false;
- }
+ 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 mobPhy(Mob mob) {
- mob.position.add(mob.moveY);
+ private void mobYColl(Mob mob) {
if (checkColl(mob.getRect())) {
int 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();
+ if (mob.mov.y < 0) d = 1;
+ if (d == -1) {
+ 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) {
- gameProc.world.setForeMap((int)mob.position.x/16, (int)mob.position.y/16, mob.getType());
- mob.position.y = -1;
- mob.dead = true;
+ gp.world.setForeMap(mob.getMapX(), mob.getMapY(), mob.getType());
+ mob.kill();
}
} else {
mob.canJump = false;
}
+ if (mob.pos.y > gp.world.getHeightPx()) {
+ mob.kill();
+ }
+ }
- if (mob.getType()==0 && Items.isFluid(getBlock(mob.getRect()))) {
- if (mob.moveY.y > 9) mob.moveY.add(0, -.9f);
- mob.moveY.add(0, -.5f);
- if (mob.moveY.y<-3) mob.moveY.y = -3;
- } else if (mob.moveY.y<18) mob.moveY.add(gravity);
-
- mob.position.add(mob.moveX);
- if (checkColl(mob.getRect())) {
- 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.canJump) mob.changeDir();
+ private void playerPhy(Player pl) {
+ pl.pos.y += pl.mov.y;
+ mobYColl(pl);
+
+ if (GameItems.isFluid(getBlock(pl.getRect()))) {
+ 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.mov.add(0, -.5f);
+ if (pl.mov.y < -3) pl.mov.y = -3;
}
+ } else {
+ if (!pl.flyMode && pl.mov.y < 18) pl.mov.add(gravity);
}
- 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;
+
+ pl.pos.x += pl.mov.x;
+ 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;
}
- if (checkJump(mob.getRect(), mob.dir) && mob.canJump && !mob.moveX.equals(Vector2.Zero)) {
- mob.moveY.add(0, -8);
+ }
+
+ private void mobPhy(Mob mob) {
+ mob.pos.y += mob.mov.y;
+ mobYColl(mob);
+
+ 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.flyMode && mob.mov.y < 18) mob.mov.add(gravity);
+
+ mob.pos.x += mob.mov.x;
+ 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);
+ if (Intersector.overlaps(drop.getRect(), gp.player.getRect())) drop.pickUpDrop(gp.player);
+ if (drop.pickedUp) it.remove();
+ }
- public void update(float delta) {
- for (Mob mob : gameProc.mobs) {
+ for (Iterator<Mob> it = gp.mobs.iterator(); it.hasNext(); ) {
+ Mob mob = it.next();
mob.ai();
mobPhy(mob);
+ if (mob.isDead()) it.remove();
}
- for (Iterator<Mob> it = gameProc.mobs.iterator(); it.hasNext();) {
- Mob m = it.next();
- if (m.dead)
- it.remove();
- }
- playerPhy(gameProc.player);
- gameProc.renderer.camera.position.set(
- gameProc.player.position.x+gameProc.player.texWidth/2 - gameProc.renderer.camera.viewportWidth/2,
- gameProc.player.position.y+gameProc.player.height/2-gameProc.renderer.camera.viewportHeight/2,
- 0
- );
+ playerPhy(gp.player);
+ if (gp.player.isDead()) gp.player.respawn(gp.world);
+
+ gp.renderer.setCamPos(
+ gp.player.pos.x + gp.player.getWidth() / 2 - gp.renderer.getWidth() / 2,
+ gp.player.pos.y + gp.player.getHeight() / 2 - gp.renderer.getHeight() / 2);
}
}