Changeset 8912 in orxonox.OLD for branches

Timestamp:

Jun 29, 2006, 4:22:36 PM (18 years ago)

Author:

bottac

Message:

Collision detection working again.

File:

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

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

@@ -974 +974 @@
   Vector dest = worldEntity->getAbsCoor() - upDir*40.0f; //
   Vector dest1 = position + forwardDir*4.0f;
-  Vector dest2 = position2 + forwardDir;
+  Vector dest2 = position2 + forwardDir*4.0;
   dest = position - Vector(0.0, 40.0,0.0);
   Vector out = dest;
@@ -1045 +1045 @@
   }
 
-  plane* testPlane = new plane;
-  testPlane->x =  this->collPlane->x;
-  testPlane->y = this->collPlane->y;
-  testPlane->z = this->collPlane->z;
-
+  plane* testPlane = this->collPlane;
 
   bool xCollision = false;
@@ -1082 +1078 @@
       this->inputStart =  position2;
       this->inputEnd =   dest2;
+      
       this->checkCollisionRayN(this->root,0.0f,1.0f, &position2, &dest2 );
       //out.x = this->outputFraction;
@@ -1105 +1102 @@
 
   // Return the normal here: Normal's stored in this->collPlane;
-  if( collision) {
+/*  if( collision) {
     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, SolidFlag);
-  }
+} */
   if(xCollision) {
     worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);