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

Timestamp:

May 3, 2006, 2:37:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/bsp_model: Material should support multiple Textures now

File:

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

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

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
- 
+
    Copyright (C) 2006 orx
- 
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
    ### File Specific:
    main-programmer: bottac@ee.ethz.ch
@@ -51 +51 @@
   // Draw Debug Terrain
   /*
-  this->bspFile->Materials[0]->select(); 
+  this->bspFile->Materials[0]->select();
   for(int i = 0; i <  this->bspFile->numPatches ; i++)
-        {
-                this->bspFile->VertexArrayModels[i]->draw();
-   
-        }
+        {
+                this->bspFile->VertexArrayModels[i]->draw();
+
+        }
   */
 
@@ -103 +103 @@
         if (f >=0 && !this->isAlreadyVisible(f)) {
           this->alreadyVisible[f] = true;
-          /*    if(ActLeaf->leafIndex == i)public final double readLEDouble()
-                {
-                        this->alreadyVisible[i] = false;
-                        this->draw_debug_face(f);
-                        this->alreadyVisible[i] = true;
-                }  
+          /*    if(ActLeaf->leafIndex == i)public final double readLEDouble()
+                {
+                        this->alreadyVisible[i] = false;
+                        this->draw_debug_face(f);
+                        this->alreadyVisible[i] = true;
+                }
                 else */
           addFace(f); // "visibleFaces.append(f)"
@@ -131 +131 @@
       leaf& curLeaf =  (this->bspFile->leaves)[i] ;
       cluster =  curLeaf.cluster;
-      
+
       if(cluster <0) continue;
       v = ((viscluster *  ( ((int *)this->bspFile->visData)[1]) ) + (cluster / 8));
       visSet =((unsigned char*) (this->bspFile->visData))[v+8];
-   
-      
+
+
       if( ((visSet) & ((unsigned char)1 <<(unsigned char) (cluster &  7))) == 0 )
       {
@@ -191 +191 @@
   // if(this->bspFile->Materials[curFace.texture] != NULL)
   //if(this->lastTex != curFace.texture) {
-    this->bspFile->Materials[curFace.texture].mat->select0();
+    this->bspFile->Materials[curFace.texture].mat->select();
   //   this->lastTex = curFace.texture;
   //}
-    
-    if(curFace.lm_index < 0) 
+
+    if(curFace.lm_index < 0)
     {
       glActiveTextureARB(GL_TEXTURE1_ARB);
@@ -207 +207 @@
     glEnable(GL_TEXTURE_2D);
     }
-    
+
     glColor4f(3.0,3.0,3.0,0.9);
   glEnableClientState(GL_VERTEX_ARRAY );
@@ -213 +213 @@
   glEnableClientState(GL_NORMAL_ARRAY );
   //  glEnableClientState(GL_COLOR_ARRAY);
-  
+
 
   glVertexPointer(3, GL_FLOAT, stride, &(curVertex[offset].position[0]));
-  
+
   glClientActiveTextureARB(GL_TEXTURE0_ARB);
   glTexCoordPointer(2, GL_FLOAT, stride, &(curVertex[offset].texcoord[0]));
   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-  
+
   glClientActiveTextureARB(GL_TEXTURE1_ARB);
   glTexCoordPointer(2, GL_FLOAT, stride, &(curVertex[offset].texcoord[1]));
   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
-  
+
   glNormalPointer( GL_FLOAT, stride, &(curVertex[offset].normal[0]));
   // glColorPointer(4, GL_BYTE, stride, &(curVertex[offset].color[0]));
@@ -288 +288 @@
 {
   if(this->lastTex != Face->texture) {
-    this->bspFile->Materials[Face->texture].mat->select0();
+    this->bspFile->Materials[Face->texture].mat->select();
     this->lastTex = Face->texture;
   }
-  
-  
-  
-  if(Face->lm_index < 0) 
+
+
+
+  if(Face->lm_index < 0)
   {
     glActiveTextureARB(GL_TEXTURE1_ARB);
@@ -307 +307 @@
 }
     glColor4f(3.0,3.0,3.0,0.9);
-  
+
   glEnable( GL_AUTO_NORMAL);
   glEnableClientState(GL_VERTEX_ARRAY );
@@ -314 +314 @@
     glFrontFace(GL_CW);
     //PRINTF(0)("BSP Manager: Face->size[0]: %i . \n", Face->size[0]);
-  
- 
+
+
     glEnableClientState(GL_NORMAL_ARRAY );
 
     glVertexPointer(3, GL_FLOAT,44, &((((BspVertex*)(this->bspFile->patchVertice))[8*8*(Face->meshvert+i)]).position[0]));
-    
-    
+
+
     glClientActiveTextureARB(GL_TEXTURE0_ARB);
     glTexCoordPointer(2, GL_FLOAT, 44, &((((BspVertex*)(this->bspFile->patchVertice))[8*8*(Face->meshvert+i)]).texcoord[0][0]));
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
-    
+
     glClientActiveTextureARB(GL_TEXTURE1_ARB);
     glTexCoordPointer(2, GL_FLOAT, 44, &((((BspVertex*)(this->bspFile->patchVertice))[8*8*(Face->meshvert+i)]).texcoord[1][0]));
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
-    
+
     glNormalPointer( GL_FLOAT, 44,&((((BspVertex*)(this->bspFile->patchVertice))[8*8*(Face->meshvert+i)]).normal[0]) );
 
@@ -344 +344 @@
                      & (     (((GLuint*)  (this->bspFile->patchIndexes))[7*8*2*(Face->meshvert+i)+ row*2*8]  ))  );
     }
-   
+
     glFrontFace(GL_CCW);
   }
@@ -352 +352 @@
   glDisableClientState(GL_VERTEX_ARRAY );
   glDisableClientState(GL_TEXTURE_COORD_ARRAY );
-  
+
   glBegin(GL_QUADS);
-  
+
   glEnd();
 }
@@ -406 +406 @@
 
     /*
-        for(int i = 0; i < camLeaf.n_leafbrushes && i < 10; i++ )
-        {
-                brush& curBrush = ((brush*)(this->bspFile->brushes))[(camLeaf.leafbrush_first +i)%this->bspFile->numLeafBrushes];
-                if(curBrush.n_brushsides < 0) return;
-                for(int j = 0; j < curBrush.n_brushsides; j++)
-                {
-                float dist = -0.1;
-                brushside& curBrushSide = ((brushside*)(this->bspFile->brushSides))[(curBrush.brushside +j)%this->bspFile->numBrushSides];
-                plane&      testPlane = ((plane*)(this->bspFile->planes))[curBrushSide.plane % this->bspFile->numPlanes];
-                dist = testPlane.x * this->cam.x +  testPlane.y * this->cam.y  +  testPlane.z * this->cam.z   -testPlane.d ; 
-                
-                if(dist < -0.01f) dist = -1.0f *dist;
-                if(dist < 1.0f){
-                                this->drawDebugCube(&this->cam);
-                                return;
-                              }
-                }
-                        
-        } */
+        for(int i = 0; i < camLeaf.n_leafbrushes && i < 10; i++ )
+        {
+                brush& curBrush = ((brush*)(this->bspFile->brushes))[(camLeaf.leafbrush_first +i)%this->bspFile->numLeafBrushes];
+                if(curBrush.n_brushsides < 0) return;
+                for(int j = 0; j < curBrush.n_brushsides; j++)
+                {
+                float dist = -0.1;
+                brushside& curBrushSide = ((brushside*)(this->bspFile->brushSides))[(curBrush.brushside +j)%this->bspFile->numBrushSides];
+                plane&      testPlane = ((plane*)(this->bspFile->planes))[curBrushSide.plane % this->bspFile->numPlanes];
+                dist = testPlane.x * this->cam.x +  testPlane.y * this->cam.y  +  testPlane.z * this->cam.z   -testPlane.d ;
+
+                if(dist < -0.01f) dist = -1.0f *dist;
+                if(dist < 1.0f){
+                                this->drawDebugCube(&this->cam);
+                                return;
+                              }
+                }
+
+        } */
 
   }