Changeset 7503 in orxonox.OLD

Timestamp:

May 3, 2006, 1:46:38 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: killing the weather effects works

Location:

branches/atmospheric_engine/src

Files:

• lib/graphics/effects/atmospheric_engine.cc (modified) (1 diff)
• lib/graphics/effects/atmospheric_engine.h (modified) (1 diff)
• lib/graphics/effects/fog_effect.cc (modified) (2 diffs)
• story_entities/game_world_data.cc (modified) (1 diff)

branches/atmospheric_engine/src/lib/graphics/effects/atmospheric_engine.cc

@@ -48 +48 @@
 {
   AtmosphericEngine::singletonRef = NULL;
+
+  this->weatherEffects = ClassList::getList( CL_WEATHER_EFFECT);
+
+  if (this->weatherEffects != NULL)
+  {
+    list<BaseObject*>::const_iterator it;
+    for (it = this->weatherEffects->begin(); it != this->weatherEffects->end(); it++)
+      dynamic_cast<WeatherEffect*>(*it)->deactivate();
+  }
+
 }
 

branches/atmospheric_engine/src/lib/graphics/effects/atmospheric_engine.h

@@ -37 +37 @@
 
     static AtmosphericEngine*     singletonRef;       //!< Pointer to the only instance of this Class
+    const std::list<BaseObject*>* weatherEffects;   //!< list of weather effects
 
   //protected:

branches/atmospheric_engine/src/lib/graphics/effects/fog_effect.cc

@@ -33 +33 @@
 {
   this->setClassID(CL_FOG_EFFECT, "FogEffect");
-
+  
   this->fogMode = GL_LINEAR;
   this->fogDensity = 0.001f;
@@ -95 +95 @@
 bool FogEffect::deactivate()
 {
-  PRINTF(0)("Deactivating Fog Effect");
+  PRINTF(0)("Deactivating Fog Effect\n");
         glDisable(GL_FOG);
 }

branches/atmospheric_engine/src/story_entities/game_world_data.cc

@@ -349 +349 @@
   /* delete some garphics and scene eingines */
   delete LightManager::getInstance();
+  delete AtmosphericEngine::getInstance();
 
   if (this->music != NULL)