Changeset 8934 in orxonox.OLD for branches/single_player_map

Timestamp:

Jun 30, 2006, 1:38:40 AM (18 years ago)

Author:

patrick

Message:

found a major error in the cr alg

Location:

branches/single_player_map/src/lib

Files:

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

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

@@ -96 +96 @@
         // collision in the x-axis
       case COLLISION_TYPE_AXIS_X:
-        front = collPos.x - box->halfLength[2]; // should be [0]
+        front = collPos.x - box->halfLength[0]; // should be [0]
 
         // object is beneath the plane (ground)
@@ -102 +102 @@
         {
           Vector backoff = entity->getAbsDirX() * front;
-          entity->shiftCoor(backoff);
+//           entity->shiftCoor(backoff);
         }
         // object is already in the wall
@@ -134 +134 @@
       case COLLISION_TYPE_AXIS_Z:
 
-        side = collPos.z - box->halfLength[0]; // should be [2]
+        side = collPos.z - box->halfLength[2]; // should be [2]
 
         // object is beneath the plane (ground)
@@ -140 +140 @@
         {
           Vector backoff = entity->getAbsDirX() * side;
-          entity->shiftCoor(backoff);
-//           entity->shiftCoor(Vector(0.0f, 0.0f, side));
+//           entity->shiftCoor(backoff);
         }
         // object is already in the wall

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

@@ -986 +986 @@
 
   if( box != NULL) {
-    position = worldEntity->getAbsCoor() +  box->center + box->axis[1] * box->halfLength[1];
-    dest     = worldEntity->getAbsCoor() +  box->center - box->axis[1] * box->halfLength[1]  * 40.0f;
-
-    position1 = worldEntity->getAbsCoor() +  box->center + box->axis[0] * box->halfLength[0] * 10.0f;
-    dest1     = worldEntity->getAbsCoor() +  box->center - box->axis[0] * box->halfLength[0] * 10.0f;
-
-
-    position2 = worldEntity->getAbsCoor() +  box->center + box->axis[2] * box->halfLength[2] * 0.0f;
-    dest2     = worldEntity->getAbsCoor() +  box->center - box->axis[2] * box->halfLength[2] * 0.0f;
+    position = worldEntity->getAbsCoor() +  box->center + worldEntity->getAbsDirY() * box->halfLength[1];
+    dest     = worldEntity->getAbsCoor() +  box->center - worldEntity->getAbsDirY() * (box->halfLength[1] + BSP_Y_OFFSET);
+
+    position1 = worldEntity->getAbsCoor() +  box->center + worldEntity->getAbsDirX() * (box->halfLength[0]  + BSP_X_OFFSET);
+    dest1     = worldEntity->getAbsCoor() +  box->center - worldEntity->getAbsDirX() * (box->halfLength[0]  + BSP_X_OFFSET);
+
+    position2 = worldEntity->getAbsCoor() +  box->center + worldEntity->getAbsDirZ() * (box->halfLength[2]  + BSP_Z_OFFSET);
+    dest2     = worldEntity->getAbsCoor() +  box->center - worldEntity->getAbsDirZ() * (box->halfLength[2]  + BSP_Z_OFFSET);
 
   } else {