X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGamePhysics.java;h=631e9d128c4c8b8a55ceab3cd033f8f55a5e16ac;hb=7895e461428b3cd6db4c606373081f063a9e0a2b;hp=1ed455b75ce04cd450e7c6c5b407dfe31b205b8b;hpb=a6ec412e508cfa8679dcf32e69600fbb939122af;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index 1ed455b..631e9d1 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
@@ -1,6 +1,7 @@
 package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavecraft.game.objects.Player;
@@ -15,17 +16,17 @@ public class GamePhysics {
 
     public GamePhysics(GameProc gameProc) {
         this.gameProc = gameProc;
-        gravity = new Vector2(0,2);
+        gravity = new Vector2(0,1);
     }
 
     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));
+        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;
         }
@@ -34,18 +35,25 @@ public class GamePhysics {
 
     private void movePlayer(Player pl) {
         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;
-            //pl.moveX.setZero();
         }
         pl.position.add(pl.moveY);
         if (checkColl(pl.getRect())) {
-            int d = 0;
+            pl.canJump = true;
+            float d = 0;
             if (pl.moveY.y<0) d=1; else if (pl.moveY.y>0) d=-1;
+            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);
         switch (pl.dir) {
@@ -56,6 +64,10 @@ public class GamePhysics {
                 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;
     }
 
     public void update(float delta) {