Changeset 4469 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 2, 2005, 1:53:08 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: light documented and cleaned up

File:

• orxonox/trunk/src/lib/graphics/light.h (modified) (6 diffs)

orxonox/trunk/src/lib/graphics/light.h

@@ -17 +17 @@
 #define NUMBEROFLIGHTS GL_MAX_LIGHTS
 
+
 // FORWARD DEFINITIONS //
 class Vector;
+
 
 //! A class that handles Lights. The LightManager operates on this.
@@ -29 +31 @@
   void setPosition(Vector position);
   void setPosition(GLfloat x, GLfloat y, GLfloat z);
+  Vector getPosition() const;
+
   void setDiffuseColor(GLfloat r, GLfloat g, GLfloat b);
   void setSpecularColor(GLfloat r, GLfloat g, GLfloat b);
@@ -35 +39 @@
   void setSpotCutoff(GLfloat cutoff);
 
-  Vector getPosition() const;
   /** \returns the lightNumber*/
   int getLightNumber(void) const {return this->lightNumber;}
@@ -45 +48 @@
   // attributes
  private:
-  int lightNumber;            //!< The number of this Light.
-  GLfloat lightPosition[4];   //!< The Position of this Light.
-  GLfloat diffuseColor[4];    //!< The Diffuse Color this Light emmits.
-  GLfloat specularColor[4];   //!< The specular Color of this Light.
-  float constantAttenuation;  //!< The Factor of the the Constant Attenuation.
-  float linearAttenuation;    //!< The Factor of the the Linear Attenuation.
-  float quadraticAttenuation; //!< The Factor of the the Quadratic Attenuation.
-  GLfloat spotDirection[4];   //!< The direction of the Spot Light.
-  GLfloat spotCutoff;         //!< The cutoff Angle of the Light Source
+  int              lightNumber;               //!< The number of this Light.
+  GLfloat          lightPosition[4];          //!< The Position of this Light.
+  GLfloat          diffuseColor[4];           //!< The Diffuse Color this Light emmits.
+  GLfloat          specularColor[4];          //!< The specular Color of this Light.
+  float            constantAttenuation;       //!< The Factor of the the Constant Attenuation.
+  float            linearAttenuation;         //!< The Factor of the the Linear Attenuation.
+  float            quadraticAttenuation;      //!< The Factor of the the Quadratic Attenuation.
+  GLfloat          spotDirection[4];          //!< The direction of the Spot Light.
+  GLfloat          spotCutoff;                //!< The cutoff Angle of the Light Source
 };
+
+
 
 //! A class that handles Lights
@@ -98 +103 @@
 class LightManager : public BaseObject
 {
- private:
-  LightManager(void);
-  void initLight(int LightNumber);
-  
-  static LightManager* singletonRef;    //!< This is the LightHandlers Reference.
-  GLfloat ambientColor[4];       //!< The ambient Color of the scene.
 
-  Light** lights;                //!< An array of Lenght NUMBEROFLIGHTS, that holds pointers to all LightValues.
-  Light* currentLight;           //!< The current Light, we are working with.
-  
  public:
+  virtual ~LightManager(void);
   static LightManager* getInstance();
-  virtual ~LightManager(void);
 
   // set Attributes
@@ -139 +135 @@
   
   void debug(void) const;
+
+
+ private:
+  LightManager(void);
+  void initLight(int LightNumber);
+  
+
+ private:
+  static LightManager*    singletonRef;       //!< This is the LightHandlers Reference.
+  GLfloat                 ambientColor[4];    //!< The ambient Color of the scene.
+
+  Light**                 lights;             //!< An array of Lenght NUMBEROFLIGHTS, that holds pointers to all LightValues.
+  Light*                  currentLight;       //!< The current Light, we are working with.
+  
 };