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

Timestamp:

May 1, 2006, 9:08:19 PM (18 years ago)

Author:

bottac

Message:

Experimental lightmapping. Screenshots: ​http://people.ee.ethz.ch/~bottac/lightmap_test/

File:

• branches/bsp_model/src/lib/graphics/importer/material.cc (modified) (2 diffs)

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

@@ -89 +89 @@
   this->setName(m.getName());
 }
-
+ 
+bool Material::select0() const
+{
+  glActiveTextureARB(GL_TEXTURE0_ARB);
+  glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
+  glEnable(GL_TEXTURE_2D); 
+  
+}
 
 /**
@@ -162 +169 @@
 /**
  *  Sets the Material Diffuse Color.
- * @param r Red Color Channel.
+ * @param r Red Color Channel.a
  * @param g Green Color Channel.
  * @param b Blue Color Channel.