Changeset 7514 in orxonox.OLD for branches

Timestamp:

May 3, 2006, 3:02:39 PM (19 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: AtmosphericEngine ticks and draws the different weather effects

Location:

branches/atmospheric_engine/src/lib/graphics/effects

Files:

• atmospheric_engine.cc (modified) (4 diffs)
• atmospheric_engine.h (modified) (2 diffs)

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

@@ -33 +33 @@
 {
   this->setClassID(CL_ATMOSPHERIC_ENGINE, "AtmosphericEngine");
-  // this->bActivated = false;
 }
 
@@ -49 +48 @@
   AtmosphericEngine::singletonRef = NULL;
 
-  this->weatherEffects = ClassList::getList( CL_WEATHER_EFFECT);
+  const std::list<BaseObject*>* weatherEffects = ClassList::getList( CL_WEATHER_EFFECT);
 
-  if (this->weatherEffects != NULL)
+  if (weatherEffects != NULL)
   {
-    //for (unsigned int i = 0; i < weatherEffects.size(); ++i)
-      while(!this->weatherEffects->empty())
-        delete this->weatherEffects->front();
+      while(!weatherEffects->empty())
+        delete weatherEffects->front();
   }
 }
-
-
 
 /**
@@ -98 +94 @@
 
 /**
- *  initializes the graphics effect
- */
-//bool AtmosphericEngine::init()
-//{}
-
-
-
-/**
  * draws the effect, if needed
  */
 void AtmosphericEngine::draw() const
-{}
+{
+  const std::list<BaseObject*>* weatherEffects = ClassList::getList( CL_WEATHER_EFFECT);
+
+  // draw the weather effects
+  if (weatherEffects != NULL)
+  {
+    std::list<BaseObject*>::const_iterator it;
+    for (it = weatherEffects->begin(); it != weatherEffects->end(); it++)
+      dynamic_cast<WeatherEffect*>(*it)->draw();
+  }
+}
 
 
@@ -117 +115 @@
  */
 void AtmosphericEngine::tick(float dt)
-{}
+{
+  const std::list<BaseObject*>* weatherEffects = ClassList::getList( CL_WEATHER_EFFECT);
+
+  // tick the weather effects
+  if (weatherEffects != NULL)
+  {
+    std::list<BaseObject*>::const_iterator it;
+    for (it = weatherEffects->begin(); it != weatherEffects->end(); it++)
+      dynamic_cast<WeatherEffect*>(*it)->tick(dt);
+  }
+}

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

@@ -22 +22 @@
     void loadParams(const TiXmlElement* root);
 
-    // bool init();
+    void init();
 
     void draw() const;
@@ -37 +37 @@
 
     static AtmosphericEngine*     singletonRef;       //!< Pointer to the only instance of this Class
-    const std::list<BaseObject*>* weatherEffects;   //!< list of weather effects
-
-  //protected:
-  //  bool              bActivated;
 };