Changeset 7513 in orxonox.OLD

Timestamp:

May 3, 2006, 3:02:32 PM (18 years ago)

Author:

bensch

Message:

material updated, so now select first deselects tho old Material

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

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

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

@@ -71 +71 @@
   if (this->specularTexture != NULL)
     ResourceManager::getInstance()->unload(this->specularTexture);
-}
+
+  if (this == Material::selectedMaterial)
+    Material::selectedMaterial = NULL;
+}
+
+
+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
+};
 
 
@@ -94 +112 @@
 // }
 
-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
-  };
 
 
@@ -112 +119 @@
 bool Material::select() const
 {
+  if (unlikely(this == Material::selectedMaterial))
+      return true;
+
+
   // setting diffuse color
   glColor4f (diffuse[0], diffuse[1], diffuse[2], this->transparency);
@@ -141 +152 @@
     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);
+    }
+  }
 
   for(unsigned int i = 0; i < this->textures.size(); ++i)

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

@@ -67 +67 @@
 
   private:
-    int         illumModel;       //!< The IlluminationModel is either flat or smooth.
-    float       diffuse [4];      //!< The diffuse color of the Material.
-    float       ambient [4];      //!< The ambient color of the Material.
-    float       specular [4];     //!< The specular color of the Material.
-    float       shininess;        //!< The shininess of the Material.
-    float       transparency;     //!< The transperency of the Material.
-    GLenum      sFactor;
-    GLenum      tFactor;
+    static Material* selectedMaterial; //!< The currently selected material.
 
-    std::vector<Texture*> textures; //!< An Array of Textures.
+    int              illumModel;       //!< The IlluminationModel is either flat or smooth.
+    float            diffuse [4];      //!< The diffuse color of the Material.
+    float            ambient [4];      //!< The ambient color of the Material.
+    float            specular [4];     //!< The specular color of the Material.
+    float            shininess;        //!< The shininess of the Material.
+    float            transparency;     //!< The transperency of the Material.
+    GLenum           sFactor;
+    GLenum           tFactor;
 
-    Texture*    ambientTexture;   //!< The ambient texture of the Material.
-    Texture*    specularTexture;  //!< The specular texture of the Material.
+    std::vector<Texture*> textures;    //!< An Array of Textures.
+
+    Texture*         ambientTexture;   //!< The ambient texture of the Material.
+    Texture*         specularTexture;  //!< The specular texture of the Material.