Changeset 8264 in orxonox.OLD for branches/bsp_model/src/lib/graphics/importer

Timestamp:

Jun 8, 2006, 4:19:39 PM (19 years ago)

Author:

patrick

Message:

bsp: fixed a bug in the cr engine. now the checks are performed correctly

File:

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

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

@@ -917 +917 @@
 
     */
-    
+
     float height = 10;
-        
-        
+
+
     this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
     if(this->outputFraction == 1.0f) out = dest;
@@ -939 +939 @@
 
     }
-    
-    
+
+
 
     // Return the normal here: Normal's stored in this->collPlane;
@@ -946 +946 @@
     if(collision) {
       PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
-      worldEntity->registerCollision(worldEntity, this->parent, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
+      worldEntity->registerCollision(this->parent, worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
     }
       //worldEntity->collidesWithGround(out,out1,out2);