Changeset 8933 in orxonox.OLD

Timestamp:

Jun 30, 2006, 1:12:57 AM (18 years ago)

Author:

patrick

Message:

front collision alg should work

Location:

branches/single_player_map/src/lib

Files:

• collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• graphics/importer/bsp_manager.cc (modified) (2 diffs)

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[0];
+        front = collPos.x - box->halfLength[2]; // should be [0]
 
         // object is beneath the plane (ground)
@@ -134 +134 @@
       case COLLISION_TYPE_AXIS_Z:
 
-        side = collPos.z - box->halfLength[2];
+        side = collPos.z - box->halfLength[0]; // should be [2]
 
         // object is beneath the plane (ground)
         if( side <= 0.0f )
         {
-          entity->shiftCoor(Vector(0.0f, 0.0f, side));
+          Vector backoff = entity->getAbsDirX() * side;
+          entity->shiftCoor(backoff);
+//           entity->shiftCoor(Vector(0.0f, 0.0f, side));
         }
         // object is already in the wall

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

@@ -993 +993 @@
 
 
-    position2 = worldEntity->getAbsCoor() +  box->center + box->axis[2] * box->halfLength[2] * 2.0f;
-    dest2     = worldEntity->getAbsCoor() +  box->center - box->axis[2] * box->halfLength[2] * 2.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;
 
   } else {
@@ -1120 +1120 @@
 }
   if(xCollision) {
-    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z),dest1 , SolidFlag);
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z),dest1 , SolidFlag);
   }
   if(zCollision) {
-    worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), dest2 , SolidFlag);
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), dest2 , SolidFlag);
   }