Changeset 7510 in orxonox.OLD for branches/bsp_model/src/lib/graphics/importer/bsp_file.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_file.cc (modified) (13 diffs)

branches/bsp_model/src/lib/graphics/importer/bsp_file.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
@@ -222 +222 @@
       PRINTF(4)("BSP FILE: Texture 0: %s. \n", &this->textures[8+ 72*i]);
     this->load_textures();
-    
+
     // Load the lightMaps
     this->glLightMapTextures = new GLuint[this->numLightMaps];
     for(int i = 0; i < this->numLightMaps; i++)
       this->glLightMapTextures[i] = this->loadLightMapToGL(this->lightMaps[i]);
-    
+
     //Create white texture for if no lightmap specified
     glGenTextures(1, &this->whiteLightMap);
     glBindTexture(GL_TEXTURE_2D, this->whiteLightMap);
-        //Create texture
+        //Create texture
     this->whiteTexture[0]=255;
     this->whiteTexture[1]=255;
     this->whiteTexture[2]=255;
-    
+
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_REPEAT);
@@ -244 +244 @@
 
 
-  
+
     /* control the mipmap levels */
     glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, 5);
@@ -260 +260 @@
                  (const GLvoid *)&(this->whiteTexture));
 
-    gluBuild2DMipmaps(  GL_TEXTURE_2D, GL_RGBA8, 1, 1,
+    gluBuild2DMipmaps(  GL_TEXTURE_2D, GL_RGBA8, 1, 1,
                        GL_RGB, GL_FLOAT,(const GLvoid *) &(this->whiteTexture));
-    
-    
+
+
 
     // Get the number of patches
@@ -324 +324 @@
   float z1 =(((plane *) this->planes) [planeIndex]).z;
   thisNode->leafIndex = 0;
-  thisNode->d          = (((plane *) this->planes) [planeIndex]).d;
+  thisNode->d          = (((plane *) this->planes) [planeIndex]).d;
 
   thisNode->plane = Vector(x1,y1,z1);
@@ -464 +464 @@
       PRINTF(0)("BSP FILE: gefunden . \n");
       this->Materials[i] =this->loadMat(fileName);
-      
+
     }
 
@@ -480 +480 @@
       continue;
     }
-    //  Default Material
+    //  Default Material
     this->Materials[i].mat = new Material();
     this->Materials[i].mat->setDiffuse(0.1,0.1,0.1);
@@ -503 +503 @@
   if(this->testSurf != NULL) {
     if(this->testSurf->format->Amask != 0 ) tmpAMat.alpha = true;
-    else                                       tmpAMat.alpha = false;
+    else                                       tmpAMat.alpha = false;
   } else   tmpAMat.alpha = false;
 
@@ -510 +510 @@
   tmp->setAmbient(1.0,1.0,1.0 );
   tmp->setSpecular(1.0,1.0,1.0);
-  //    tmp->setShininess(.5);
-  //    tmp->setTransparency(1.0);
+  //    tmp->setShininess(.5);
+  //    tmp->setTransparency(1.0);
 
   tmp->setDiffuseMap(mat);
@@ -539 +539 @@
   scale*=255.0;
   sc*=scale;
-    ((unsigned char *)(&lightMapTexture))[i] = (unsigned char)sc; 
-    
-  
+    ((unsigned char *)(&lightMapTexture))[i] = (unsigned char)sc;
+
+
   }
-  
+
   glGenTextures(1, &lightMap);
   glBindTexture(GL_TEXTURE_2D,  lightMap);
@@ -569 +569 @@
                    (const GLvoid *)&lightMapTexture);
 
-   
+
    // build the MipMaps automaticaly
    errorCode = gluBuild2DMipmaps(GL_TEXTURE_2D,
@@ -579 +579 @@
                                  (const GLvoid *)&lightMapTexture
                                 );
-   
+
 
 
@@ -715 +715 @@
 
 
-          //Vertice[u*(tesselation+1)+v]=       temp[0]*((1.0f-px)*(1.0f-px))+ temp[1]*((1.0f-px)*px*2)+ temp[2]*(px*px);
+          //Vertice[u*(tesselation+1)+v]=       temp[0]*((1.0f-px)*(1.0f-px))+ temp[1]*((1.0f-px)*px*2)+ temp[2]*(px*px);
           Vertice[u*(level1)+v].position[0]=temp[0].position[0]*((1.0f-px)*(1.0f-px))+temp[1].position[0]*((1.0f-px)*px*2)+temp[2].position[0]*(px*px);
           Vertice[u*(level1)+v].position[1]=temp[0].position[1]*((1.0f-px)*(1.0f-px))+temp[1].position[1]*((1.0f-px)*px*2)+temp[2].position[1]*(px*px);