Changeset 8376 in orxonox.OLD for trunk/src/lib/graphics/importer/material.h

Timestamp:

Jun 14, 2006, 12:13:16 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: no more seg-fault when copying a Texture

File:

• trunk/src/lib/graphics/importer/material.h (modified) (4 diffs)

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

@@ -17 +17 @@
 #include <vector>
 #include "texture.h"
+#include "color.h"
 
 // FORWARD DECLARATIONS //
@@ -35 +36 @@
     void setIllum (int illum);
     int getIllumModel() const { return this->illumModel; };
+
     void setDiffuse (float r, float g, float b);
     void setAmbient (float r, float g, float b);
@@ -42 +44 @@
     void setBlendFunc(GLenum sFactor, GLenum tFactor) { this->sFactor = sFactor; this->tFactor = tFactor; };
 
-    void getDiffuseColor(float& r, float& g, float& b) const { r = diffuse[0], g = diffuse[1], b = diffuse[2]; }
+    const Color& getDiffuseColor() const { return diffuse; };
 
     // MAPPING //
@@ -66 +68 @@
 
     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.
+    Color            diffuse;          //!< The diffuse color of the Material. (also transparency.)
+    Color            ambient;          //!< The ambient color of the Material.
+    Color            specular;         //!< The specular color of the Material.
     float            shininess;        //!< The shininess of the Material.
-    float            transparency;     //!< The transperency of the Material.
     GLenum           sFactor;          //!< The Blending Factor for the Source.
     GLenum           tFactor;          //!< The Blending Factor for the Destination.