Changeset 7574 in orxonox.OLD for branches/bsp_model/src

Timestamp:

May 10, 2006, 3:43:27 PM (19 years ago)

Author:

stefalie

Message:

check in material changes

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

• material.cc (modified) (3 diffs)
• material.h (modified) (1 diff)

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

@@ -77 +77 @@
 
 
-Material* Material::selectedMaterial = NULL;
+const Material* Material::selectedMaterial = NULL;
 
 const GLenum Material::glTextureArbs[] =
 {
-  GL_TEXTURE0_ARB,
-  GL_TEXTURE1_ARB,
-  GL_TEXTURE2_ARB,
-  GL_TEXTURE3_ARB,
-  GL_TEXTURE4_ARB,
-  GL_TEXTURE5_ARB,
-  GL_TEXTURE6_ARB,
-  GL_TEXTURE7_ARB
+  GL_TEXTURE0,
+  GL_TEXTURE1,
+  GL_TEXTURE2,
+  GL_TEXTURE3,
+  GL_TEXTURE4,
+  GL_TEXTURE5,
+  GL_TEXTURE6,
+  GL_TEXTURE7
 };
 
@@ -158 +158 @@
         glActiveTexture(Material::glTextureArbs[i]);
         glBindTexture(GL_TEXTURE_2D, 0);
+        glDisable(GL_TEXTURE_2D);
     }
   }
@@ -174 +175 @@
     }
   }
+  Material::selectedMaterial = this;
 
   /*  if (this->diffuseTexture != NULL)

branches/bsp_model/src/lib/graphics/importer/material.h

@@ -69 +69 @@
 
   private:
-    static Material* selectedMaterial; //!< The currently selected material.
+    static const Material* selectedMaterial; //!< The currently selected material.
 
     int              illumModel;       //!< The IlluminationModel is either flat or smooth.