Changeset 8933 in orxonox.OLD for branches/single_player_map/src/lib/graphics/importer

Timestamp:

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

Author:

patrick

Message:

front collision alg should work

File:

• branches/single_player_map/src/lib/graphics/importer/bsp_manager.cc (modified) (2 diffs)

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);
   }