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

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.cc (modified) (2 diffs)

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

@@ -167 +167 @@
       glActiveTexture(Material::glTextureArbs[i]);
       glEnable(GL_TEXTURE_2D);
+      if(this->textures[i]->hasAlpha())
+      {
+        glEnable(GL_BLEND);
+      }
       glBindTexture(GL_TEXTURE_2D, this->textures[i]->getTexture());
     }
@@ -355 +359 @@
 
 /**
+ *  Sets the Materials Diffuse Map
+ * @param surface pointer to SDL_Surface which shall be used as texture
+*/
+void Material::setSDLDiffuseMap(SDL_Surface *surface, GLenum target, unsigned int textureNumber)
+{
+  assert(textureNumber < Material::getMaxTextureUnits());
+
+ 
+  if (this->textures.size() > textureNumber && this->textures[textureNumber] != NULL)
+    ResourceManager::getInstance()->unload(this->textures[textureNumber]);
+
+  if (this->textures.size() <= textureNumber)
+    this->textures.resize(textureNumber+1, NULL);
+
+  if(surface != NULL)
+  {
+    this->textures[textureNumber] = &Texture(surface, GL_TEXTURE_2D);
+  }
+  else
+  {
+    this->textures[textureNumber] = NULL;
+  }
+
+}
+
+
+/**
  *  Sets the Materials Ambient Map
  * @param aMap the Name of the Image to Use