Changeset 9882 in orxonox.OLD

Timestamp:

Oct 12, 2006, 8:25:16 AM (18 years ago)

Author:

bensch

Message:

trunk: gl_multi_texture check in the material. This should resolve the Material::select() bug

Location:

trunk/src

Files:

• lib/graphics/importer/material.cc (modified) (5 diffs)
• lib/graphics/importer/texture.h (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/material.cc

@@ -81 +81 @@
   LoadParam(root, "tex", this, Material, setDiffuseMap);
   LoadParam(root, "blendfunc", this, Material, setBlendFuncS)
-      .defaultValues("ZERO", "ZERO");
+  .defaultValues("ZERO", "ZERO");
 }
 
@@ -123 +123 @@
     for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
     {
-      glActiveTexture(Material::glTextureArbs[i]);
+      if (GLEW_ARB_multitexture)
+        glActiveTexture(Material::glTextureArbs[i]);
       //glBindTexture(GL_TEXTURE_2D, 0);
       glDisable(GL_TEXTURE_2D);
@@ -159 +160 @@
   for(unsigned int i = 0; i < this->textures.size(); ++i)
   {
-    glActiveTexture(Material::glTextureArbs[i]);
+    if (GLEW_ARB_multitexture)
+      glActiveTexture(Material::glTextureArbs[i]);
     glEnable(GL_TEXTURE_2D);
     if(this->textures[i].hasAlpha())
@@ -311 +313 @@
   {
     this->textures[textureNumber] = ResourceTexture(dMap);
-        //dynamic_cast<Texture*>(ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target));
-/*    if (tex != NULL)
-      this->textures[textureNumber] = tex;
-    else
-      this->textures[textureNumber] = Texture();*/
+    //dynamic_cast<Texture*>(ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target));
+    /*    if (tex != NULL)
+          this->textures[textureNumber] = tex;
+        else
+          this->textures[textureNumber] = Texture();*/
   }
   else
@@ -438 +440 @@
 
 const GLenum Material::glTextureArbs[] =
-{
-  GL_TEXTURE0,
-  GL_TEXTURE1,
-  GL_TEXTURE2,
-  GL_TEXTURE3,
-  GL_TEXTURE4,
-  GL_TEXTURE5,
-  GL_TEXTURE6,
-  GL_TEXTURE7
-};
+  {
+    GL_TEXTURE0,
+    GL_TEXTURE1,
+    GL_TEXTURE2,
+    GL_TEXTURE3,
+    GL_TEXTURE4,
+    GL_TEXTURE5,
+    GL_TEXTURE6,
+    GL_TEXTURE7
+  };
 
 

trunk/src/lib/graphics/importer/texture.h

@@ -50 +50 @@
   static void setTextureEnableState(bool texturesEnabled);
   /** @returns true if Textures are enabled */
-  inline static bool getTextureEnableState() { return Texture::texturesEnabled; };
+  static bool getTextureEnableState() { return Texture::texturesEnabled; };
   // Utility functionality:
   static SDL_Surface* prepareSurface(SDL_Surface* input, bool& hasAlpha);

trunk/src/world_entities/environments/mapped_water.cc

@@ -165 +165 @@
 {
   // load shader files
-  shader = ResourceShader( "/shaders/mapped_water.vert", "/shaders/mapped_water.frag");
+  shader = ResourceShader( "shaders/mapped_water.vert", "shaders/mapped_water.frag");
 
   this->shader.activateShader();