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

Timestamp:

Jun 22, 2006, 3:14:58 PM (19 years ago)

Author:

bensch

Message:

merged the bsp-model-stuff back here

File:

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

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

@@ -50 +50 @@
 BspManager::BspManager(WorldEntity* parent)
 {
- 
+
   this->parent = parent;
   /*// open a BSP file
@@ -840 +840 @@
         this->checkBrushRayN(&curBrush);
       if(curBrush.n_brushsides <=0) this->outputAllSolid = true;
-    }
+    } 
+    
     return;
   }
@@ -907 +908 @@
 
 }
+
+float BspManager::checkPatchAltitude(BspTreeNode* node)
+{
+  leaf& curLeaf = this->bspFile->leaves[node->leafIndex];
+  for(int i = 0; i < curLeaf.n_leaffaces ; i++)
+  {
+   
+  }
+  return 10.0f;
+}
+
 void BspManager::checkCollisionBox(void)
 {
@@ -937 +949 @@
 void BspManager::checkCollision(WorldEntity* worldEntity)
 {
-  
+
   this->outputStartsOut = true;
   this->outputAllSolid = false;
   this->outputFraction = 1.0f;
-  
-  Vector position = worldEntity->getAbsCoor();
+
+
 
 
   Vector forwardDir = worldEntity->getAbsDirX();
-  forwardDir = forwardDir * 8.0f;
+
 
   Vector upDir = worldEntity->getAbsDirY();
@@ -958 +970 @@
   dest.z  += forwardDir.z;
   */
-
-  dest = worldEntity->getAbsCoor() - upDir*40.0;
+  Vector position = worldEntity->getAbsCoor() + upDir*10.0f ;
+  dest = worldEntity->getAbsCoor() - upDir*40.0f; //
   Vector out = dest;
 
@@ -966 +978 @@
 
   bool collision = false;
-  Vector position1 = position + Vector(0.0,0.1,0.0);
-  Vector position2 = position + Vector(0.0,0.2,0.0);
-  Vector dest1 = position1 + forwardDir;
+  Vector position1 = position; // + Vector(0.0,0.6,0.0);
+  Vector position2 = position + Vector(0.0,1.0,0.0);
+  Vector dest1 = position + forwardDir*4.0f;
   Vector dest2 = position2 + forwardDir;
   dest = position - Vector(0.0, 40.0,0.0);
@@ -976 +988 @@
 
   float height = 40;
-  
+
   this->inputStart =  position;
   this->inputEnd =   dest;
   this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
-
-  PRINTF(0)(" checking collision: %s, solid = %i, fraction = %f\n", worldEntity->getClassName(), this->outputAllSolid, this->outputFraction);
-  PRINTF(0)("checking collision!! Pos.Coords: %f , %f , %f\n", position.x , position.y, position.z);
-  PRINTF(0)("checking collision!! Dest.Coords: %f , %f , %f\n", dest.x , dest.y, dest.z);  
+  
+
+
+//   PRINTF(0)(" checking collision: %s, solid = %i, fraction = %f\n", worldEntity->getClassName(), this->outputAllSolid, this->outputFraction);
+//   PRINTF(0)("checking collision!! Pos.Coords: %f , %f , %f\n", position.x , position.y, position.z);
+//   PRINTF(0)("checking collision!! Dest.Coords: %f , %f , %f\n", dest.x , dest.y, dest.z);
+
 //   position1.debug();
+
+  if(!this->outputStartsOut )
+  {
+    this->collPlane = new plane;
+    this->collPlane->x = 0.0f;
+    this->collPlane->y = 0.0f;
+    this->collPlane->z = 0.0f;
+    collision = true;
+  }
+  else
+  {
+
+
+
 
   if( this->outputFraction == 1.0f)
   {
-    if(this->outputAllSolid)
+    if(this->outputAllSolid )
     {
       this->collPlane = new plane;
-      this->collPlane->x = 1.0f;
+      this->collPlane->x = 0.0f;
       this->collPlane->y = 0.0f;
       this->collPlane->z = 0.0f;
@@ -1013 +1042 @@
   }
 
+
+  }
+  
+  plane* testPlane = this->collPlane;
+  
+  this->outputStartsOut = true;
+  this->outputAllSolid = false;
+  this->outputFraction = 1.0f;
+  this->inputStart =  position;
+  this->inputEnd =   dest1;
+  this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest1 );
+  out.x = this->outputFraction;
+  out.z = this->outputFraction;
+  
+  /*
+  out.x = position1.x + (dest.x -position1.x) * this->outputFraction;
+  
+  out.z = position1.z + (dest.z -position1.z) * this->outputFraction;
+  */
+  
+  
   // Return the normal here: Normal's stored in this->collPlane;
   if( collision) {
-    PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
-    worldEntity->registerCollision(this->parent, worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);
-  }
+    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);
 
 }