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

Timestamp:

Jun 30, 2005, 12:41:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: lights loadable

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (7 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -182 +182 @@
   delete this->nullParent;
   delete this->entities;
-  delete this->lightMan;
+  delete LightManager::getInstance();
   delete this->trackManager;
   delete this->particleEngine;
@@ -289 +289 @@
   this->particleEngine = ParticleEngine::getInstance();
   this->trackManager = TrackManager::getInstance();
-  this->lightMan = LightManager::getInstance();
+  LightManager::getInstance();
   this->nullParent = NullParent::getInstance ();
   this->nullParent->setName ("NullParent");
@@ -414 +414 @@
     //////////////////////////////
 
+    LoadParam<LightManager>(root, "LightManager", LightManager::getInstance(), &LightManager::loadParams);
+
     LoadParam<ParticleEngine>(root, "ParticleEngine", ParticleEngine::getInstance(), &ParticleEngine::loadParams);
     LoadParam<PhysicsEngine>(root, "PhysicsEngine", PhysicsEngine::getInstance(), &PhysicsEngine::loadParams);
@@ -451 +453 @@
 
 
-  lightMan->setAmbientColor(.1,.1,.1);
-  lightMan->addLight();
-  //      lightMan->setAttenuation(1.0, .01, 0.0);
-  //      lightMan->setDiffuseColor(1,1,1);
-  //  lightMan->addLight(1);
-  //  lightMan->setPosition(20, 10, -20);
-  //  lightMan->setDiffuseColor(0,0,0);
-  //lightMan->debug();
-  lightMan->setPosition(-5.0, 50.0, -40.0);
-  lightMan->addLight();
-  lightMan->setPosition(100, 80, 60);
+//   lightMan->setAmbientColor(.1,.1,.1);
+//   lightMan->addLight();
+//   //      lightMan->setAttenuation(1.0, .01, 0.0);
+//   //      lightMan->setDiffuseColor(1,1,1);
+//   //  lightMan->addLight(1);
+//   //  lightMan->setPosition(20, 10, -20);
+//   //  lightMan->setDiffuseColor(0,0,0);
+//   //lightMan->debug();
+//   lightMan->setPosition(-5.0, 50.0, -40.0);
+//   lightMan->addLight();
+//   lightMan->setPosition(100, 80, 60);
 
   //        trackManager->setBindSlave(env);
@@ -625 +627 @@
 
   // LIGHT initialisation
-  lightMan->setAmbientColor(.1,.1,.1);
-  lightMan->addLight();
-  lightMan->debug();
+  LightManager::getInstance()->setAmbientColor(.1,.1,.1);
+  LightManager::getInstance()->addLight();
+  LightManager::getInstance()->debug();
 
   switch(this->debugWorldNr)
@@ -639 +641 @@
     case DEBUG_WORLD_0:
       {
-        lightMan->setPosition(-5.0, 10.0, -40.0);
+        LightManager::getInstance()->getLight()->setAbsCoor(-5.0, 10.0, -40.0);
 
 
@@ -903 +905 @@
 
   TextEngine::getInstance()->draw();
-  lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
+  LightManager::getInstance()->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
 }