X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGamePhysics.java;h=5677c2426fa5f8e1ef47e959870ae8dfb0038e38;hb=e7be8067d83f2a39c237ec7afbe115a846a74f3d;hp=3bd467d2ab05ce5ae97f0f9dc7f93efb49e0ead4;hpb=503cd1720db3f53b7cbf7e3819968044de29a465;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java index 3bd467d..5677c24 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java @@ -1,9 +1,10 @@ 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 com.badlogic.gdx.math.Vector3; +import ru.deadsoftware.cavecraft.CaveGame; import ru.deadsoftware.cavecraft.game.mobs.Mob; import ru.deadsoftware.cavecraft.game.objects.Player; @@ -17,38 +18,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; + int bl = 0; switch (dir) { case 0: bl = gameProc.world.getForeMap( - (int)((rect.x+(rect.width/2))/16) - 1, - (int)(rect.y/16)+1); + (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); + (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); + 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)/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)); - 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; } @@ -56,29 +68,37 @@ public class GamePhysics { 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 (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())) { - 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; + } } - - if (checkJump(pl.getRect(), pl.dir) && !pl.flyMode && pl.canJump && !pl.moveX.equals(Vector2.Zero)) { + 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; } @@ -98,9 +118,8 @@ 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 (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 (checkColl(mob.getRect())) { int d = 0; if (mob.moveX.x<0) d=1; else if (mob.moveX.x>0) d=-1; @@ -110,7 +129,6 @@ public class GamePhysics { } public void update(float delta) { - for (Mob mob : gameProc.mobs) { mob.ai(); mobPhy(mob);