X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGamePhysics.java;h=c91b1766720a60f0ffb1ee4614ffc8e2fd837713;hb=40312aaac2ec8bd1247ad5979f7bd1d8e47ecae3;hp=f8843f2c6851ba086a4c3a8e3fbb6aeccb61e529;hpb=50082e8304a80c41dd8b1c1d80142e7c91a2d924;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java index f8843f2..c91b176 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java @@ -1,8 +1,7 @@ package ru.deadsoftware.cavecraft.game; -import com.badlogic.gdx.math.MathUtils; -import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; +import com.badlogic.gdx.math.*; +import ru.deadsoftware.cavecraft.Items; import ru.deadsoftware.cavecraft.game.mobs.Mob; import ru.deadsoftware.cavecraft.game.objects.Player; @@ -19,16 +18,47 @@ public class GamePhysics { gravity = new Vector2(0,1); } + private boolean checkJump(Rectangle rect, int dir) { + int bl = 0; + 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); + break; + case 1: + if ((int)((rect.x+(rect.width/2))/16) + 10 && 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[] ids = new int[6]; + ids[0] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)rect.y/16)); + ids[1] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)rect.y/16)); + ids[2] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)(rect.y+rect.height/2)/16)); + ids[3] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+rect.height/2)/16)); + ids[4] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)(rect.y+rect.height-1)/16)); + ids[5] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+(rect.height-1))/16)); + Rectangle[] bl = new Rectangle[6]; + if (ids[0]>0) bl[0] = Items.BLOCKS.getValueAt(ids[0]).getRect((int)(rect.x)/16,(int)rect.y/16); + if (ids[1]>0) bl[1] = Items.BLOCKS.getValueAt(ids[1]).getRect(((int)(rect.x+rect.width-1)/16), ((int)rect.y/16)); + if (ids[2]>0) bl[2] = Items.BLOCKS.getValueAt(ids[2]).getRect(((int)(rect.x)/16), ((int)(rect.y+rect.height/2)/16)); + if (ids[3]>0) bl[3] = Items.BLOCKS.getValueAt(ids[3]).getRect(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+rect.height/2)/16)); + if (ids[4]>0) bl[4] = Items.BLOCKS.getValueAt(ids[4]).getRect(((int)(rect.x)/16), ((int)(rect.y+rect.height-1)/16)); + if (ids[5]>0) bl[5] = Items.BLOCKS.getValueAt(ids[5]).getRect(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+(rect.height-1))/16)); + for (int i=0; i<6; i++) { + if (ids[i]>0 && + Items.BLOCKS.getValueAt(ids[i]).collision && + Intersector.overlaps(rect,bl[i])) + return true; } return false; } @@ -49,7 +79,7 @@ public class GamePhysics { if (!pl.flyMode) 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.x+pl.texWidth>=gameProc.world.getWidth()*16) pl.position.sub(pl.moveX); if (checkColl(pl.getRect())) { int d = 0; @@ -57,18 +87,11 @@ public class GamePhysics { 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 (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; + + /*if (checkJump(pl.getRect(), pl.dir) && !pl.flyMode && pl.canJump && !pl.moveX.equals(Vector2.Zero)) { + pl.moveY.add(0, -8); + pl.canJump = false; + }*/ } private void mobPhy(Mob mob) { @@ -104,18 +127,11 @@ public class GamePhysics { } 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 + ); } }