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

Timestamp:

May 1, 2006, 9:08:19 PM (18 years ago)

Author:

bottac

Message:

Experimental lightmapping. Screenshots: ​http://people.ee.ethz.ch/~bottac/lightmap_test/

File:

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

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

@@ -87 +87 @@
   this->checkCollision(this->root, &this->cam);   //!< Test Collision Detection
 
-  if ((((int *)(this->bspFile->header))[35] == 0)  || viscluster < 0)  //!< if (sizeof(Visdata) == 0)
+  if (true /*(((int *)(this->bspFile->header))[35] == 0 )  || viscluster < 0*/)  //!< if (sizeof(Visdata) == 0)
   {
     /** Do Frustum culling and draw 'em all **/
 
-    // Iterate through all Leafs
+    // Iterate through all Leafspublic final double readLEDouble()
     for(int i = 0; i <  this->bspFile->numLeafs   ; i++ )
     {
@@ -103 +103 @@
         if (f >=0 && !this->isAlreadyVisible(f)) {
           this->alreadyVisible[f] = true;
-          /*    if(ActLeaf->leafIndex == i)
+          /*    if(ActLeaf->leafIndex == i)public final double readLEDouble()
                 {
                         this->alreadyVisible[i] = false;
@@ -190 +190 @@
   if(curFace.type == 3) return;
   // if(this->bspFile->Materials[curFace.texture] != NULL)
-  if(this->lastTex != curFace.texture) {
-    this->bspFile->Materials[curFace.texture].mat->select();
-    this->lastTex = curFace.texture;
-  }
+  //if(this->lastTex != curFace.texture) {
+    this->bspFile->Materials[curFace.texture].mat->select0();
+  //   this->lastTex = curFace.texture;
+  //}
+    
+    if(curFace.lm_index < 0) 
+    {
+      glActiveTextureARB(GL_TEXTURE1_ARB);
+      glBindTexture(GL_TEXTURE_2D, this->bspFile->glLightMapTextures[this->bspFile->whiteLightMap]);
+      glEnable(GL_TEXTURE_2D);
+    }
+    else
+    {
+    glActiveTextureARB(GL_TEXTURE1_ARB);
+    glBindTexture(GL_TEXTURE_2D, this->bspFile->glLightMapTextures[curFace.lm_index]);
+    glEnable(GL_TEXTURE_2D);
+    }
+    
+    glColor4f(3.0,3.0,3.0,0.9);
   glEnableClientState(GL_VERTEX_ARRAY );
-  glEnableClientState(GL_TEXTURE_COORD_ARRAY );
+  //glEnableClientState(GL_TEXTURE_COORD_ARRAY );
   glEnableClientState(GL_NORMAL_ARRAY );
   //  glEnableClientState(GL_COLOR_ARRAY);
@@ -201 +216 @@
 
   glVertexPointer(3, GL_FLOAT, stride, &(curVertex[offset].position[0]));
-  // glClientActiveTextureARB(GL_TEXTURE0_ARB);
+  
+  glClientActiveTextureARB(GL_TEXTURE0_ARB);
   glTexCoordPointer(2, GL_FLOAT, stride, &(curVertex[offset].texcoord[0]));
-  // glClientActiveTextureARB(GL_TEXTURE1_ARB);
-  // glTexCoordPointer(2, GL_FLOAT, stride, &(curVertex[offset].texcoord[1]));
-
-
+  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]));
@@ -212 +231 @@
                  GL_UNSIGNED_INT, &(((meshvert *)this->bspFile->meshverts) [curFace.meshvert]));
 
-
+  glDisableClientState(GL_TEXTURE0_ARB);
+  glDisableClientState(GL_TEXTURE1_ARB);
   glDisableClientState(GL_VERTEX_ARRAY );
-  glDisableClientState(GL_TEXTURE_COORD_ARRAY );
+  //glDisableClientState(GL_TEXTURE_COORD_ARRAY );
   glDisableClientState(GL_NORMAL_ARRAY );
   // glDisableClientState(GL_COLOR_ARRAY);
@@ -247 +267 @@
   //glEnableClientState(GL_COLOR_ARRAY);
   // glEnableClientState(GL_VERTEX_ARRAY );
-
+  glClientActiveTextureARB(GL_TEXTURE0_ARB);
   glVertexPointer(3, GL_FLOAT, stride, &(curVertex[offset].position[0]));
+  glEnableClientState(GL_TEXTURE_COORD_ARRAY);
   // glClientActiveTextureARB(GL_TEXTURE0_ARB);
+  glClientActiveTextureARB(GL_TEXTURE1_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]));
@@ -265 +288 @@
 {
   if(this->lastTex != Face->texture) {
-    this->bspFile->Materials[Face->texture].mat->select();
+    this->bspFile->Materials[Face->texture].mat->select0();
     this->lastTex = Face->texture;
   }
-
+  
+  
+  
+  if(Face->lm_index < 0) 
+  {
+    glActiveTextureARB(GL_TEXTURE1_ARB);
+    glBindTexture(GL_TEXTURE_2D, this->bspFile->glLightMapTextures[this->bspFile->whiteLightMap]);
+    glEnable(GL_TEXTURE_2D);
+  }
+  else
+  {
+    glActiveTextureARB(GL_TEXTURE1_ARB);
+    glBindTexture(GL_TEXTURE_2D, this->bspFile->glLightMapTextures[Face->lm_index]);
+    glEnable(GL_TEXTURE_2D);
+}
+    glColor4f(3.0,3.0,3.0,0.9);
+  
+  glEnable( GL_AUTO_NORMAL);
+  glEnableClientState(GL_VERTEX_ARRAY );
+  glEnableClientState(GL_TEXTURE_COORD_ARRAY );
   for(int i = 0; i < Face->n_meshverts  ; i++) {
-    //glFrontFace(GL_CW);
+    glFrontFace(GL_CW);
     //PRINTF(0)("BSP Manager: Face->size[0]: %i . \n", Face->size[0]);
-    glEnableClientState(GL_VERTEX_ARRAY );
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY );
+  
+ 
     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]) );
 
@@ -291 +344 @@
                      & (     (((GLuint*)  (this->bspFile->patchIndexes))[7*8*2*(Face->meshvert+i)+ row*2*8]  ))  );
     }
-
-    //glFrontFace(GL_CCW);
-  }
-
+   
+    glFrontFace(GL_CCW);
+  }
+  glDisableClientState(GL_TEXTURE0_ARB);
+  glDisableClientState(GL_TEXTURE1_ARB);
+  glDisable(GL_AUTO_NORMAL);
+  glDisableClientState(GL_VERTEX_ARRAY );
+  glDisableClientState(GL_TEXTURE_COORD_ARRAY );
+  
+  glBegin(GL_QUADS);
+  
+  glEnd();
 }
 
@@ -408 +469 @@
   glNormal3f( 1.0f, 0.0f, 0.0f);  glColor4f(0.2,0.2,0.9,.25);
 
-  glTexCoord2f(0.995f, 0.005f); glVertex3f(cam->x+ 1.0f,cam->y -1.0f, cam->z -1.0f);
+  glTexCoord2f(0.995f, 0.005f); glVertex3f(cam->x+ 1.0f, cam->y -1.0f, cam->z -1.0f);
   glTexCoord2f(0.995f, 0.995f); glVertex3f(cam->x+ 1.0f, cam->y+ 1.0f, cam->z -1.0f);
   glTexCoord2f(0.005f, 0.995f); glVertex3f(cam->x+ 1.0f, cam->y+ 1.0f, cam->z + 1.0f);