Changeset 7385 in orxonox.OLD for branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

Timestamp:

Apr 26, 2006, 4:37:58 PM (18 years ago)

Author:

bottac

Message:

Minor improvements (transparancy). Code formatting revised.

File:

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

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

@@ -17 +17 @@
 #include "bsp_file.h"
 #include "bsp_manager.h"
-#include "bsp_tree_node.h"
+#include "bsp_tree_leaf.h"
 #include "p_node.h"
 #include "state.h"
@@ -23 +23 @@
 #include "material.h"
 #include "camera.h"
-
 #include "vertex_array_model.h"
 
-
-
-
+// STL Containers
+#include <vector>
+#include <deque>
 
 
@@ -37 +36 @@
         // open a BSP file
         this->bspFile = new BspFile();
-        this->bspFile->read("Kanti175.bsp");
+        this->bspFile->read("/root/data/Kanti175.bsp");
         this->bspFile->build_tree();
         this->root  = this->bspFile->get_root();
@@ -64 +63 @@
    // 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();    
   // Find all visible faces...
 
@@ -110 +111 @@
                                         this->alreadyVisible[i] = true;
                                 }
-                                else */draw_face(f); // "visibleFaces.append(f)"
+                                else */addFace(f); // "visibleFaces.append(f)"
                         }
                 }
@@ -150 +151 @@
                         if (!this->isAlreadyVisible(f) && f>=0) 
                         {
-                                        this->draw_face(f);
+                                        this->addFace(f);
                                         this->alreadyVisible[f] = true;
                         }
@@ -161 +162 @@
 
     }//else
+
+while(!this->opal.empty())
+{
+ this->draw_face(this->opal.front());
+  this->opal.pop_front();
+}
+while(!this->trasparent.empty())
+{
+ this->draw_face(this->trasparent.back());
+ this->trasparent.pop_back();
+}
 
 
@@ -190 +202 @@
         if(this->lastTex != curFace.texture)
         {
-        this->bspFile->Materials[curFace.texture]->select();
+        this->bspFile->Materials[curFace.texture].mat->select();
         this->lastTex = curFace.texture;
         }
@@ -239 +251 @@
    // if(this->bspFile->Materials[curFace.texture] != NULL)     
 
-        this->bspFile->Materials[2]->select();
+        this->bspFile->Materials[2].mat->select();
         this->lastTex = 2;
 
@@ -266 +278 @@
                 if(this->lastTex != Face->texture)
                 {
-                this->bspFile->Materials[Face->texture]->select();
+                this->bspFile->Materials[Face->texture].mat->select();
                 this->lastTex = Face->texture;
                 }
@@ -331 +343 @@
         {
                 dist = (node->plane.x * this->cam.x + node->plane.y*this->cam.y + node->plane.z*this->cam.z) - node->d;
-                if(dist > 1.0f)
+                if(dist > 4.0f)
                 {
                  checkCollision(node->left,cam);
                  return;
                 }
-                if(dist < -1.0f)
+                if(dist < -4.0f)
                 {
                  checkCollision(node->right,cam);
                  return;
                 }
-                if(dist<=1.0f && dist >= -1.0f)
+                if(dist<=4.0f && dist >= -4.0f)
                         {
                         checkCollision(node->left,cam);
@@ -357 +369 @@
 
         
-
+/*
         for(int i = 0; i < camLeaf.n_leafbrushes && i < 10; i++ )
         {
@@ -376 +388 @@
                 }
                         
-        }
+        } */
         
         }
@@ -454 +466 @@
    glTexCoord2f(0.005f, 0.995f); glVertex3f(cam->x-1.0f, cam->y+ 1.0f, cam->z -1.0f);
 
-
-
-                glEnd();
-}
+        glEnd();
+}
+
+void BspManager::addFace(int f)
+{
+ face& curFace =  ((face *)(this->bspFile->faces))[f];
+ if(this->bspFile->Materials[curFace.texture].alpha) this->trasparent.push_back(f);
+ else this->opal.push_back(f);
+}