Changeset 8448 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Jun 15, 2006, 12:48:26 PM (18 years ago)

Author:

bensch

Message:

merged gui back to the trunk
merged with command
merge -r8377:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .

File:

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

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

@@ -38 +38 @@
 
     void setDiffuse (float r, float g, float b);
+    void setDiffuseColor(const Color& diffuseColor) { this->diffuse = diffuseColor; };
     void setAmbient (float r, float g, float b);
     void setSpecular (float r, float g, float b);