Changeset 8894 in orxonox.OLD for trunk/src/lib/graphics/importer/bsp_manager.cc

Timestamp:

Jun 29, 2006, 12:19:48 AM (18 years ago)

Author:

patrick

Message:

merged the branche single_player_map with the trunk

File:

• trunk/src/lib/graphics/importer/bsp_manager.cc (modified) (6 diffs)

trunk/src/lib/graphics/importer/bsp_manager.cc

@@ -45 +45 @@
 
 #include "aabb.h"
-
+#include "cr_defs.h"
 
 
@@ -912 +912 @@
 {
   leaf& curLeaf = this->bspFile->leaves[node->leafIndex];
-  for(int i = 0; i < curLeaf.n_leaffaces ; i++) {
-  }
+  for(int i = 0; i < curLeaf.n_leaffaces ; i++) {}
   return 10.0f;
 }
 
 void BspManager::checkCollisionBox(void)
-{
-}
-;
+{}
+
 
 void BspManager::TraceBox( Vector& inputStart, Vector& inputEnd,
@@ -954 +952 @@
 
 
-  Vector forwardDir = worldEntity->getAbsDirX();
-
-
-  Vector upDir = worldEntity->getAbsDirY();
-  upDir.x = 0.0;
-  upDir.y = 1.0;
-  upDir.z = 0.0;
-  Vector dest;
-   
-
-  Vector position = worldEntity->getAbsCoor();       //+ upDir*10.0f ;
-  dest = worldEntity->getAbsCoor() - upDir*40.0f; //
-  Vector out = dest;
-
-
+  Vector forwardDir = Vector(0.0,0.0,1.0);
+  Vector upDir = Vector(0.0,1.0,0.0);
+  Vector position = worldEntity->getAbsCoor();
+
+  bool SolidFlag = false;
   bool collision = false;
   Vector position1 = position;
   Vector position2 = position + Vector(0.0,1.0,0.0);
+  Vector dest = worldEntity->getAbsCoor() - upDir*40.0f; //
   Vector dest1 = position + forwardDir*4.0f;
   Vector dest2 = position2 + forwardDir;
   dest = position - Vector(0.0, 40.0,0.0);
+  Vector out = dest;
   Vector out1;
   Vector out2;
 
- 
+
 
   float height = 40;
-  
-  
-  if( box != NULL)
-  {
+
+
+  if( box != NULL) {
     position = worldEntity->getAbsCoor() +  box->center; // + box->axis[1] * box->halfLength[1];
     dest     = worldEntity->getAbsCoor() +  box->center - box->axis[1] * box->halfLength[1] * 40.0;
-    
+
     position1 = worldEntity->getAbsCoor() +  box->center + box->axis[0] * box->halfLength[0] * 2.0f;
     dest1     = worldEntity->getAbsCoor() +  box->center - box->axis[0] * box->halfLength[0] *2.0f;
-    
-        
+
+
     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;
-    
-  }
-  else
-  {
-    
-  }
-
-  
-  
-  //
+
+  } else {
+    // Init positions and destinations to anything useful!
+
+  }
+
+
+
+  // 1st Ray
   this->inputStart =  position;
   this->inputEnd =   dest;
@@ -1025 +1013 @@
         this->collPlane->z = 0.0f;
         collision = true;
-      } else 
+        SolidFlag = true;
+      } else
         collision = false;
-        
-        
-        out = dest;
-      
+
+
+      out = dest;
+
     } else {
       collision = true;
@@ -1046 +1035 @@
   plane* testPlane = this->collPlane;
 
-  
-  // 2nd Collision Detection
-  this->outputStartsOut = true;
-  this->outputAllSolid = false;
-  this->outputFraction = 1.0f;
-  this->inputStart =  position1;
-  this->inputEnd =   dest1;
-  this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
-  out.x = this->outputFraction;
-  //out.z = this->outputFraction;
-  
-  
-    // 3rd Collision Detection
-  this->outputStartsOut = true;
-  this->outputAllSolid = false;
-  this->outputFraction = 1.0f;
-  this->inputStart =  position2;
-  this->inputEnd =   dest2;
-  this->checkCollisionRayN(this->root,0.0f,1.0f, &position2, &dest2 );
-  //out.x = this->outputFraction;
-  out.z = this->outputFraction;
-  
-
+
+  bool xCollision = false;
+  bool zCollision = false;
+  if(!SolidFlag) {
+
+    // 2nd Collision Detection
+    this->outputStartsOut = true;
+    this->outputAllSolid = false;
+    this->outputFraction = 1.0f;
+    this->inputStart =  position1;
+    this->inputEnd =   dest1;
+    this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
+
+    if(!this->outputAllSolid != 1.0f) {
+      out.x = dest1.x + (dest1.x -position1.x) * this->outputFraction;
+      xCollision = true;
+      testPlane = this->collPlane;
+    }
+    if(this->outputAllSolid) {
+      SolidFlag = true;
+      xCollision = true;  
+    }
+    //out.z = this->outputFraction;
+
+    if(!SolidFlag) {
+
+      // 3rd Collision Detection
+      this->outputStartsOut = true;
+      this->outputAllSolid = false;
+      this->outputFraction = 1.0f;
+      this->inputStart =  position2;
+      this->inputEnd =   dest2;
+      this->checkCollisionRayN(this->root,0.0f,1.0f, &position2, &dest2 );
+      //out.x = this->outputFraction;
+
+      if(this->outputFraction != 1.0f ) {
+        out.z = out.z = dest2.z + (dest2.z -position2.z) * this->outputFraction;
+        zCollision = true;
+        testPlane = this->collPlane;
+
+      }
+      if(this->outputAllSolid) {
+          SolidFlag = true;
+          zCollision = true;   
+      }
+    }
+  }//end if
   /*
   This is how you would calculate the Coordinates where worldEntity Collided with the BSP world.
@@ -1077 +1090 @@
 
   // 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(this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out);
-  } 
-  else  worldEntity->registerCollision(this->parent, worldEntity, Vector(0.0, 2.0, 0.0), dest);
+    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 {
+    if(xCollision || zCollision) {
+
+      worldEntity->registerCollision((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  worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y, this->parent, worldEntity, Vector(0.0, 2.0, 0.0), dest, false);
 
 }