X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGamePhysics.java;h=2fdc29bca17b88dd066b8ef1ebd8840fc0cab6cb;hb=524d5abc0b76b25a4cf2b31e6ba4f41a107a5ab6;hp=f49eb178b9f9501ebfb783cc0382debde6ac190e;hpb=083e40ac85e4aca2df81d1ca16c0a54561c3bd38;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java index f49eb17..2fdc29b 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java @@ -1,8 +1,11 @@ package ru.deadsoftware.cavecraft.game; +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; @@ -16,19 +19,49 @@ public class GamePhysics { 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; + switch (dir) { + case 0: + bl = gameProc.world.getForeMap( + (int)((rect.x+(rect.width/2))/16) - 1, + (int)(rect.y/16)+1); + if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)-1,(int)(rect.y/16))>0) bl=0; + if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)-1,(int)(rect.y/16)-1)>0) bl=0; + break; + case 1: + bl = gameProc.world.getForeMap( + (int)((rect.x+(rect.width/2))/16) + 1, + (int)(rect.y/16)+1); + if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)+1,(int)(rect.y/16))>0) bl=0; + if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)+1,(int)(rect.y/16)-1)>0) bl=0; + break; + default: + bl=0; + } + return (bl>0 && Items.BLOCKS.getValueAt(bl).collision); } private boolean checkColl(Rectangle rect) { - int[] bl = new int [6]; - 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; + 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; y0 && Items.BLOCKS.getValueAt(bl).collision){ + if (Intersector.overlaps(rect, Items.BLOCKS.getValueAt(bl).getRect(x,y))){ + return true; + } + } + } } return false; } @@ -36,38 +69,38 @@ public class GamePhysics { private void playerPhy(Player pl) { pl.position.add(pl.moveY); if (checkColl(pl.getRect())) { - pl.canJump = true; int d = -1; if (pl.moveY.y<0) d=1; else 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; } - 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.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; + if (pl.canJump && !pl.flyMode) pl.position.y-=8; + if (checkColl(pl.getRect())) { + if (pl.canJump && !pl.flyMode) pl.position.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; + } } - switch (pl.dir) { - case 0: - gameProc.renderer.camTargetPos.x = pl.position.x-gameProc.renderer.camera.viewportWidth+100; - break; - case 1: - gameProc.renderer.camTargetPos.x = pl.position.x-100; - break; + 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 (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) { @@ -84,9 +117,6 @@ public class GamePhysics { } 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; @@ -96,25 +126,17 @@ public class GamePhysics { } public void update(float delta) { - 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; - } - if (gameProc.renderer.camera.position.x > gameProc.renderer.camTargetPos.x) { - gameProc.renderer.camera.position.sub(16,0,0); - } - if (gameProc.renderer.camera.position.x < gameProc.renderer.camTargetPos.x) { - gameProc.renderer.camera.position.add(16,0,0); - } - gameProc.renderer.camera.position.y = gameProc.player.position.y+gameProc.player.height/2 - -gameProc.renderer.camera.viewportHeight/2; + 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 + ); } }