X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGamePhysics.java;h=c387bab3f84e816b87007acbd6b4aaa7b2bfe593;hp=fdf1206371935e23a848428fca23f3d594c61b33;hb=0b8922bfbb2bbec067b532ecb7912f6afe02c4ef;hpb=1cc111dfe31e7f7098e01afeaa025e19f91aa624 diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java index fdf1206..c387bab 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java @@ -7,6 +7,7 @@ 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; @@ -67,6 +68,16 @@ public class GamePhysics { return gameProc.world.getForeMap((int)(rect.x+rect.width/2)/16, (int)(rect.y+rect.height/8*7)/16); } + private void dropPhy(Drop drop) { + if (drop.move.y < 9) drop.move.y += gravity.y/4; + drop.position.add(drop.move); + drop.position.y = MathUtils.round(drop.position.y); + while (checkColl(drop.getRect())) { + drop.position.y--; + drop.move.y = 0; + } + } + private void playerPhy(Player pl) { pl.position.add(pl.moveY); if (checkColl(pl.getRect())) { @@ -170,6 +181,7 @@ public class GamePhysics { } public void update(float delta) { + for (Drop drop : gameProc.drops) dropPhy(drop); for (Mob mob : gameProc.mobs) { mob.ai(); mobPhy(mob);