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

Timestamp:

May 28, 2006, 3:48:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

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

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

@@ -16 +16 @@
 
 #include <vector>
-#include "SDL_image.h"
-
 #include "texture.h"
 
@@ -51 +49 @@
     void setTransparency (char* trans);
 
+    void getDiffuseColor(float& r, float& g, float& b) const { r = diffuse[0], g = diffuse[1], b = diffuse[2]; }
 
     // MAPPING //