Changeset 6763 in orxonox.OLD

Timestamp:

Jan 26, 2006, 3:20:27 AM (18 years ago)

Author:

bensch

Message:

trunk: setting lighting

Location:

trunk/src/lib/graphics

Files:

• importer/material.cc (modified) (1 diff)
• light.cc (modified) (2 diffs)

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

@@ -95 +95 @@
 {
   // setting diffuse color
-  glColor3f (diffuse[0], diffuse[1], diffuse[2]);
-  glMaterialfv(GL_FRONT, GL_DIFFUSE, this->diffuse);
+  glColor4f (diffuse[0], diffuse[1], diffuse[2], this->transparency);
+//  glMaterialfv(GL_FRONT, GL_DIFFUSE, this->diffuse);
 
   // setting ambient color

trunk/src/lib/graphics/light.cc

@@ -221 +221 @@
 
   glEnable (GL_LIGHTING);
+  glEnable ( GL_COLOR_MATERIAL ) ;
+  glColorMaterial ( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE ) ;
+
   this->setAmbientColor(.3, .3, .3);
   this->lights = new Light*[NUMBEROFLIGHTS];
@@ -238 +241 @@
 LightManager::~LightManager ()
 {
+  glDisable(GL_COLOR_MATERIAL);
   glDisable(GL_LIGHTING);
   this->setAmbientColor(.0,.0,.0);