Changeset 10698 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Jun 14, 2007, 5:33:43 PM (17 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

Location:

trunk/src/lib/graphics/importer/bsp

Files:

• bsp_manager.cc (modified) (4 diffs)
• bsp_manager.h (modified) (1 diff)

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

@@ -173 +173 @@
   // erase alreadyVisible
   for(int i = 0; i < this->bspFile->numFaces; i++) this->alreadyVisible[i] = false;
-  float tmp = 0;
+//   float tmp = 0;
   //this->opal.clear();
   //this->trasparent.clear();
@@ -186 +186 @@
 
   this->viewDir=    State::getCamera()->getAbsDirX();
-  float d = (cam.x*viewDir.x + cam.y*viewDir.y + cam.z * viewDir.z);
+//   float d = (cam.x*viewDir.x + cam.y*viewDir.y + cam.z * viewDir.z);
 
   BspTreeNode*  ActLeaf = this->getLeaf(this->bspFile->root, &ship);
@@ -254 +254 @@
 
     for(int i = 0; i <  this->bspFile->numLeafs   ; ++i ) {
-      leaf& camLeaf =  (this->bspFile->leaves)[ActLeaf->leafIndex] ;
+//       leaf& camLeaf =  (this->bspFile->leaves)[ActLeaf->leafIndex] ;
       leaf& curLeaf =  (this->bspFile->leaves)[i] ;
       int& cluster =  curLeaf.cluster;
@@ -1696 +1696 @@
 
 
+float BspManager::checkCollisionRay(Vector StartPoint, Vector Direction, float length )
+{
+  Direction.normalize(); // Oder besser vor dem Fkt-Aufruf schon normalisieren
+  this->outputStartsOut = true;
+  this->outputAllSolid = false;
+  this->outputFraction = 1.0f;
+  this->inputStart =  StartPoint;
+  Vector End =   StartPoint + (Direction)*length;
+  this->inputEnd =   End;
+
+  this->checkCollisionRayN(this->root, 0.0f, 1.0f, &StartPoint, &(End) );
+
+  return (this->outputFraction * length);
+
+}
+
+
 
 /**

trunk/src/lib/graphics/importer/bsp/bsp_manager.h

@@ -77 +77 @@
   void checkCollision(WorldEntity* worldEntity); /*!< WorldEntities use this function to check wheter they collided with the BspEntity.
                                                       If a collision has been detected, the collides-function of worldEntity will be called.*/
+  float checkCollisionRay(Vector StartPoint, Vector Direction, float length ) ;
 
   int sortTransparency;              //!< sort transparent textures