Changeset 6467 in orxonox.OLD for trunk/src/lib/graphics/importer/material.cc

Timestamp:

Jan 11, 2006, 11:46:52 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: Texture loading with GL_TEXTURE_* in ResourceManager and Material

File:

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

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

@@ -274 +274 @@
  * @param dMap the Name of the Image to Use
 */
-void Material::setDiffuseMap(const char* dMap)
+void Material::setDiffuseMap(const char* dMap, GLenum target)
 {
   PRINTF(5)("setting Diffuse Map %s\n", dMap);
@@ -283 +283 @@
   //! @todo Textures from .mtl-file need special care.
   if (dMap!= NULL)
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME);
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (void*)&target);
   else
     this->diffuseTexture = NULL;
@@ -293 +293 @@
    @todo implement this
 */
-void Material::setAmbientMap(const char* aMap)
+void Material::setAmbientMap(const char* aMap, GLenum target)
 {
   SDL_Surface* ambientMap;
@@ -304 +304 @@
    @todo implement this
 */
-void Material::setSpecularMap(const char* sMap)
+void Material::setSpecularMap(const char* sMap, GLenum target)
 {
   SDL_Surface* specularMap;