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

Timestamp:

May 3, 2006, 5:20:13 PM (18 years ago)

Author:

stefalie

Message:

branches/bsp_model: setSDLSurfaceDiffuseMap added to Material

File:

• branches/bsp_model/src/lib/graphics/importer/material.h (modified) (3 diffs)

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

@@ -10 +10 @@
 #include "base_object.h"
 
+
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -15 +16 @@
 
 #include <vector>
-
+#include "SDL_image.h"
 
 #include "texture.h"
@@ -53 +54 @@
     // MAPPING //
     void setDiffuseMap(const std::string& dMap, GLenum target = GL_TEXTURE_2D, unsigned int textureNumber = 0);
+    void setSDLDiffuseMap(SDL_Surface *surface, GLenum target = GL_TEXTURE_2D, unsigned int textureNumber = 0);
 
     void setAmbientMap(const std::string& aMap, GLenum target = GL_TEXTURE_2D);