Changeset 3440 in orxonox.OLD

Timestamp:

Mar 1, 2005, 8:55:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Light: added ambientColor, removed fancy effects

Location:

orxonox/trunk/src

Files:

• light.cc (modified) (2 diffs)
• light.h (modified) (3 diffs)
• world.cc (modified) (1 diff)

orxonox/trunk/src/light.cc

@@ -35 +35 @@
 
   glEnable (GL_LIGHTING);
+  this->setAmbientColor(.3, .3, .3);
   this->lights = new LightValue*[NUMBEROFLIGHTS];
   for (int i = 0; i < NUMBEROFLIGHTS; i++)
@@ -248 +249 @@
 }
 
+/**
+   \brief sets the ambient Color of the Scene
+   \param r red
+   \param g green
+   \param b blue
+*/
+void Light::setAmbientColor(GLfloat r, GLfloat g, GLfloat b)
+{
+  this->ambientColor[0] = r;
+  this->ambientColor[1] = g;
+  this->ambientColor[2] = b;
+  this->ambientColor[3] = 1.0;
+
+  glLightfv (GL_LIGHT0, GL_AMBIENT, this->ambientColor);
+
+}
+
 // get Attributes
 

orxonox/trunk/src/light.h

@@ -34 +34 @@
     GLfloat diffuseColor[4];    //!< The Diffuse Color this Light emmits.
     GLfloat specularColor[4];   //!< The specular Color of this Light.
+    GLint attenuationType;      //!< The AttenuationType of this Light. \todo implements this;
 
     LightValue* next;
@@ -39 +40 @@
 
   static Light* singletonRef;    //!< This is the LightHandlers Reference.
+  GLfloat ambientColor[4];       //!< The ambient Color of the scene.
+
+
   Light(void);
 
@@ -60 +64 @@
   void setDiffuseColor(GLfloat r, GLfloat g, GLfloat b);
   void setSpecularColor(GLfloat r, GLfloat g, GLfloat b);
+  void setAmbientColor(GLfloat r, GLfloat g, GLfloat b);
   // get Attributes
   Vector getPosition(void);

orxonox/trunk/src/world.cc

@@ -878 +878 @@
       this->localCamera->timeSlice(dt);
       this->trackManager->tick(dt);
-      this->light->setPosition(10*cos((double)currentFrame/1000),10, 10*sin((double)currentFrame/1000));
-      this->light->setDiffuseColor(.5-.5*cos((double)currentFrame/1000), .5+sin((double)currentFrame/1000), .5+sin((double)currentFrame/1000));
-      this->light->setSpecularColor(.5-.5*sin((double)currentFrame/1000), .5+sin((double)currentFrame/1000), .5+cos((double)currentFrame/1000));
     }
   this->lastFrame = currentFrame;