Changeset 7596 in orxonox.OLD for branches

Timestamp:

May 11, 2006, 3:07:39 PM (19 years ago)

Author:

bottac

Message:

 

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

• bsp_file.cc (modified) (1 diff)
• bsp_file.h (modified) (1 diff)
• bsp_manager.cc (modified) (6 diffs)

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

@@ -40 +40 @@
  * @param name the Name of the *.bsp file
  */
-int BspFile::read(char* name)
+int BspFile::read(const char* name)
 {
   int offset;
   int size;
   struct stat results;
-  name = "/root/data/Kanti175.bsp";
+  // name = "/root/data/Kanti175.bsp";
 
   if (stat( name , &results) == 0) {

branches/bsp_model/src/lib/graphics/importer/bsp_file.h

@@ -142 +142 @@
 public:
   BspFile();
-  int read( char* name );
+  int read(const char* name );
   void build_tree();
   void load_textures();

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

@@ -26 +26 @@
 #include "world_entities/player.h"
 #include "world_entities/playable.h"
+#include "util/loading/resource_manager.h"
 // STL Containers
 #include <vector>
@@ -33 +34 @@
 
 
+
 BspManager::BspManager()
 {
   // open a BSP file
   this->bspFile = new BspFile();
-  this->bspFile->read("/root/data/Kanti175.bsp");
+  this->bspFile->read(ResourceManager::getFullName("test.bsp").c_str());
   this->bspFile->build_tree();
   this->root  = this->bspFile->get_root();
@@ -95 +97 @@
   if(this->outputFraction != 1.0f || this->outputAllSolid ) this->drawDebugCube(&this->cam);
 
-  if (false  || viscluster < 0 ) // || (((int *)(this->bspFile->header))[35] == 0 )  || viscluster < 0)  //!< if (sizeof(Visdata) == 0)
+  if (false || viscluster < 0  || ((int *)(this->bspFile->header))[35] == 0 )  //!< if (sizeof(Visdata) == 0)
   {
    
@@ -121 +123 @@
       dMaxs = dir.x*(float)curLeaf.maxs[0] +dir.y*(float)curLeaf.maxs[1] +dir.z*(float)curLeaf.maxs[2] ;
      
-      if(dMins < 0.0 && dMaxs < 0.0)
+      if(dMins < -100.0 && dMaxs < -100.0)
       {    
-        //continue; 
+       continue; 
       }
     
@@ -129 +131 @@
       // Iterate through all faces
       for (int j = 0; j < curLeaf.n_leaffaces ; ++j) {
-        const int f = ( j +  ((leaf *) (this->bspFile->leaves))[i].leafface) % this->bspFile->numFaces;
+        const int g = (j +  curLeaf.leafface);
+        const int f = ((int *)this->bspFile->leafFaces)[g];
         if (f >=0 && !this->isAlreadyVisible(f)) {
           this->alreadyVisible[f] = true;
@@ -141 +144 @@
 
     } //for
-  } else {
+  } 
+  else {