Changeset 7982 in orxonox.OLD for branches/water/src/lib

Timestamp:

May 30, 2006, 3:30:47 PM (18 years ago)

Author:

stefalie

Message:

branches/water: light!

Location:

branches/water/src/lib/graphics

Files:

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

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

@@ -107 +107 @@
   if (unlikely(this == Material::selectedMaterial))
       return true;
+  else if (likely(Material::selectedMaterial != NULL))
+  {
+  Material::unselect();
+//     for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
+//     {
+//         glActiveTexture(Material::glTextureArbs[i]);
+//         glBindTexture(GL_TEXTURE_2D, 0);
+//         glDisable(GL_TEXTURE_2D);
+//     }
+  }
 
 
@@ -137 +147 @@
   else if (this->illumModel >= 2)
     glShadeModel(GL_SMOOTH);
-
-  if (likely(Material::selectedMaterial != NULL))
-  {
-    for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
-    {
-        glActiveTexture(Material::glTextureArbs[i]);
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glDisable(GL_TEXTURE_2D);
-    }
-  }
 
   for(unsigned int i = 0; i < this->textures.size(); ++i)
@@ -172 +172 @@
 }
 
+void Material::unselect()
+{
+  Material::selectedMaterial = NULL;
+    for(unsigned int i = 0; i < 8; ++i)
+    {
+        glActiveTexture(Material::glTextureArbs[i]);
+        glBindTexture(GL_TEXTURE_2D, 0);
+        glDisable(GL_TEXTURE_2D);
+    }
+}
+
 /**
  *  Sets the Material Illumination Model.

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

@@ -32 +32 @@
 
     bool select () const;
+    static void unselect();
 
     void setIllum (int illum);

branches/water/src/lib/graphics/shader.h

@@ -23 +23 @@
   {
   public:
-    Uniform(const Shader* shader, const std::string& location) { glGetUniformLocationARB(shader->getProgram(), location.c_str()) ; }
-    Uniform(const Shader& shader, const std::string& location) { glGetUniformLocation(shader.getProgram(), location.c_str()) ; };
-    Uniform(GLhandleARB shaderProgram, const std::string& location) { glGetUniformLocation(shaderProgram, location.c_str()) ; };
+    Uniform(const Shader* shader, const std::string& location) { this->uniform = glGetUniformLocationARB(shader->getProgram(), location.c_str()) ; }
+    Uniform(const Shader& shader, const std::string& location) { this->uniform = glGetUniformLocation(shader.getProgram(), location.c_str()) ; };
+    Uniform(GLhandleARB shaderProgram, const std::string& location) { this->uniform = glGetUniformLocation(shaderProgram, location.c_str()) ; };
 
     void set(float v0) const { glUniform1f(this->uniform, v0); }