Changeset 8926 in orxonox.OLD

Timestamp:

Jun 29, 2006, 11:11:20 PM (18 years ago)

Author:

bottac

Message:

collision coordinates fixed.

File:

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

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

@@ -1061 +1061 @@
     if(this->outputFraction < 1.0f) {
       out.x = dest1.x + (dest1.x -position1.x) * this->outputFraction;
+      dest1 = dest1 + (dest1 -position1) * this->outputFraction;
       xCollision = true;
       testPlane = this->collPlane;
@@ -1084 +1085 @@
       if(this->outputFraction < 1.0f ) {
         out.z = out.z = dest2.z + (dest2.z -position2.z) * this->outputFraction;
+        dest2 = dest2 + (dest2 -position2) * this->outputFraction;
         zCollision = true;
         testPlane = this->collPlane;
@@ -1106 +1108 @@
 }
   if(xCollision) {
-    worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, 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_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), dest2 , SolidFlag);
   }