Changeset 9100 in orxonox.OLD

Timestamp:

Jul 4, 2006, 4:14:59 AM (18 years ago)

Author:

patrick

Message:

best cr ever. straifing in the wall works also

Location:

branches/presentation/src/lib

Files:

• collision_reaction/cr_physics_ground_walk.cc (modified) (3 diffs)
• graphics/importer/bsp_manager.cc (modified) (1 diff)
• graphics/importer/bsp_manager.h (modified) (1 diff)

branches/presentation/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -104 +104 @@
           Vector backoff = dirX * front;
 
-          entity->setAbsCoor(entity->getLastAbsCoor());
-         // entity->shiftCoor(backoff);
+          //entity->setAbsCoor(entity->getLastAbsCoor());
+          entity->shiftCoor(backoff);
         }
         // object is already in the wall
@@ -117 +117 @@
         back = collPos.len() - box->halfLength[0];
 
-        PRINTF(0)("back: %f\n", back);
+        PRINTF(0)("backward: back = %f\n", back);
+
         // object is beneath the plane (ground)
         if( back <= 0.0f)
         {
           Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize();
-          Vector backoff = dirX * front;
-
-          entity->setAbsCoor(entity->getLastAbsCoor());
-         // entity->shiftCoor(backoff);
-        }
-        // object is already in the wall
-        else if( ce->isInWall())
-        {
-          entity->setAbsCoor(entity->getLastAbsCoor());
+          Vector backoff = dirX * back * -1.0f;
+
+           //entity->setAbsCoor(entity->getLastAbsCoor());
+           entity->shiftCoor(backoff);
+        }
+        // object is already in the wall
+        else if( ce->isInWall())
+        {
+           entity->setAbsCoor(entity->getLastAbsCoor());
         }
         break;
@@ -138 +139 @@
       case COLLISION_TYPE_AXIS_Y_NEG:
         // calulate the height above ground
-        height = collPos.y - box->halfLength[1];
+        height = collPos.len() - box->halfLength[1];
 
 

branches/presentation/src/lib/graphics/importer/bsp_manager.cc

@@ -1236 +1236 @@
     testPlane = this->collPlane;
   }
-  if(this->outputAllSolid )
+  if( this->outputAllSolid)
   {
     this->collPlane = new plane;

branches/presentation/src/lib/graphics/importer/bsp_manager.h

@@ -28 +28 @@
 
 
-#define BSP_X_OFFSET 40.0f
+#define BSP_X_OFFSET 20.0f
 #define BSP_Y_OFFSET 40.0f
-#define BSP_Z_OFFSET 40.0f
+#define BSP_Z_OFFSET 20.0f