Changeset 3597 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Mar 17, 2005, 11:04:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Light is now a World-entity.

Location:

orxonox/trunk/src/story_entities

Files:

• world.cc (modified) (2 diffs)
• world.h (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -73 +73 @@
   delete this->nullParent;
   delete this->entities;
-  delete this->light;
+  delete this->lightMan;
   delete this->trackManager;
 }
@@ -297 +297 @@
   this->spawn(terrain);
   // LIGHT initialisation
-  light = Light::getInstance();
-  light->setAmbientColor(.1,.1,.1);
-  light->addLight();
-  light->setAttenuation(QUADRATIC, 1.0);
-  light->setAttenuation(CONSTANT, 2.0);
-  light->setAttenuation(QUADRATIC, 1.0);
-  light->setPosition(10.0, 30.0, 10.0);
-  light->setDiffuseColor(1,1,1);
-  //  light->addLight(1);
-  //  light->setPosition(20, 10, -20);
-  //  light->setDiffuseColor(0,0,0);
-  light->debug();
+  lightMan = LightManager::getInstance();
+  lightMan->setAmbientColor(.1,.1,.1);
+  lightMan->addLight();
+  lightMan->setPosition(10.0, 30.0, 10.0);
+  lightMan->setAttenuation(1.0, 0, 0);
+  lightMan->setDiffuseColor(1,1,1);
+  //  lightMan->addLight(1);
+  //  lightMan->setPosition(20, 10, -20);
+  //  lightMan->setDiffuseColor(0,0,0);
+  lightMan->debug();
 
 

orxonox/trunk/src/story_entities/world.h

@@ -17 +17 @@
 class GLMenuImageScreen;
 class Skysphere;
-class Light;
+class LightManager;
 class FontSet;
 class Terrain;
@@ -72 +72 @@
 
   PNode* nullParent;            //!< The zero-point, that everything has as its parent.
-  TrackManager* trackManager;  //!< The reference of the TrackManager that handles the course through the Level.
-  Camera* localCamera;         //!< The current Camera
+  TrackManager* trackManager;   //!< The reference of the TrackManager that handles the course through the Level.
+  Camera* localCamera;          //!< The current Camera
   Skysphere* skySphere;         //!< The Environmental Heaven of orxonox \todo insert this to environment insted
-  Light* light;                 //!< The Lights of the Level
+  LightManager* lightMan;       //!< The Lights of the Level
   Terrain* terrain;             //!< The Terrain of the World.