Changeset 8888 in orxonox.OLD

Timestamp:

Jun 28, 2006, 9:38:32 PM (18 years ago)

Author:

bottac

Message:

Not yet done. Still working on collision detection.

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

@@ -1062 +1062 @@
   this->inputEnd =   dest1;
   this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
-  out.x = this->outputFraction;
+  out.x = dest1.x + (dest1.x -position1.x) * this->outputFraction;
   xCollision = true;
   //out.z = this->outputFraction;
@@ -1077 +1077 @@
   this->checkCollisionRayN(this->root,0.0f,1.0f, &position2, &dest2 );
   //out.x = this->outputFraction;
-  out.z = this->outputFraction;
+  out.z = out.z = dest2.z + (dest2.z -position2.z) * this->outputFraction;
   if(this->outputFraction != 1.0 )
     zCollision = true;
@@ -1093 +1093 @@
   {
     PRINTF(5)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
-    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y, this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, false);
+    worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y || (xCollision ? COLLISION_TYPE_AXIS_X :0) | (zCollision ? COLLISION_TYPE_AXIS_Z :0), this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);
   }
   else