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

Timestamp:

May 5, 2006, 8:23:48 PM (19 years ago)

Author:

bottac

Message:

bsp_file looks now in the orxonox data-directory for textures.

File:

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

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

@@ -189 +189 @@
   }
   if(curFace.type == 3) return;
-  // if(this->bspFile->Materials[curFace.texture] != NULL)
-  //if(this->lastTex != curFace.texture) {
+//  if(this->bspFile->Materials[curFace.texture] != NULL)
+    
+  if(this->lastTex != curFace.texture) {
     this->bspFile->Materials[curFace.texture].mat->select();
-  //   this->lastTex = curFace.texture;
-  //}
+     this->lastTex = curFace.texture;
+  }
     
     if(curFace.lm_index < 0) 
@@ -208 +209 @@
     }
     
-    glColor4f(3.0,3.0,3.0,0.9);
-  glEnableClientState(GL_VERTEX_ARRAY );  
-  //glEnableClientState(GL_TEXTURE_COORD_ARRAY );
+    glColor4f(3.0,3.0,3.0,1.0);
+  glEnableClientState(GL_VERTEX_ARRAY );
+  glEnableClientState(GL_TEXTURE_COORD_ARRAY );
   glEnableClientState(GL_NORMAL_ARRAY );
   //  glEnableClientState(GL_COLOR_ARRAY);
@@ -223 +224 @@
   glClientActiveTextureARB(GL_TEXTURE1_ARB);
   glTexCoordPointer(2, GL_FLOAT, stride, &(curVertex[offset].texcoord[1]));
-  glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+  //glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
   
@@ -287 +288 @@
 void BspManager::draw_patch(face* Face)
 {
-  //if(this->lastTex != Face->texture) {
+  if(this->lastTex != Face->texture) {
     this->bspFile->Materials[Face->texture].mat->select();
-    //this->lastTex = Face->texture;
-  //}
+    this->lastTex = Face->texture;
+  }
   
   
@@ -306 +307 @@
     glEnable(GL_TEXTURE_2D);
 }
-    glColor4f(3.0,3.0,3.0,0.9);
+    glColor4f(3.0,3.0,3.0,1.0);
   
   glEnable( GL_AUTO_NORMAL);
@@ -328 +329 @@
     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);
+    //glEnableClientState(GL_TEXTURE_COORD_ARRAY);