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

Timestamp:

May 24, 2006, 3:57:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Weather effects back here

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (3 diffs)
• game_world_data.cc (modified) (3 diffs)

trunk/src/story_entities/game_world.cc

@@ -43 +43 @@
 
 #include "graphics_engine.h"
+#include "effects/atmospheric_engine.h"
 #include "event_handler.h"
 #include "sound_engine.h"
@@ -384 +385 @@
 
     GraphicsEngine::getInstance()->tick(this->dtS);
+    AtmosphericEngine::getInstance()->tick(this->dtS);
 
     if( likely(this->dataTank->gameRule != NULL))
@@ -524 +526 @@
   GraphicsEngine* engine = GraphicsEngine::getInstance();
 
+  AtmosphericEngine::getInstance()->draw();
+
   // set camera
   this->dataTank->localCamera->apply ();

trunk/src/story_entities/game_world_data.cc

@@ -45 +45 @@
 
 #include "graphics_engine.h"
+#include "effects/atmospheric_engine.h"
 #include "event_handler.h"
 #include "sound_engine.h"
@@ -322 +323 @@
   LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
   LoadParamXML(root, "GraphicsEngine", GraphicsEngine::getInstance(), GraphicsEngine, loadParams);
+  LoadParamXML(root, "AtmosphericEngine", AtmosphericEngine::getInstance(), AtmosphericEngine, loadParams);
 
   LoadParam(root, "Music", this, GameWorldData, setSoundTrack);
@@ -346 +348 @@
   /* delete some garphics and scene eingines */
   delete LightManager::getInstance();
+  delete AtmosphericEngine::getInstance();
 
   if (this->music != NULL)