Changeset 7513 in orxonox.OLD for branches/bsp_model/src/lib/graphics/importer/material.h

Timestamp:

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

Author:

bensch

Message:

material updated, so now select first deselects tho old Material

File:

• branches/bsp_model/src/lib/graphics/importer/material.h (modified) (1 diff)

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.