Changeset 9685 in orxonox.OLD for branches/new_class_id/src/lib/graphics/effects

Timestamp:

Aug 22, 2006, 1:16:23 PM (18 years ago)

Author:

bensch

Message:

adapted many classes to the new ClassID System, now comes the hard part… Scripting… then Network… wow this will be so bad :/

Location:

branches/new_class_id/src/lib/graphics/effects

Files:

• atmospheric_engine.cc (modified) (7 diffs)
• atmospheric_engine.h (modified) (2 diffs)
• graphics_effect.cc (modified) (2 diffs)
• graphics_effect.h (modified) (1 diff)
• weather_effect.cc (modified) (2 diffs)
• weather_effect.h (modified) (1 diff)

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

@@ -22 +22 @@
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
-#include "class_list.h"
 
-
-
+NewObjectListDefinition(AtmosphericEngine);
 
 /**
  * @param root The XML-element to load the AtmosphericEngine from
  */
-AtmosphericEngine::AtmosphericEngine() {
-    this->setClassID(CL_ATMOSPHERIC_ENGINE, "AtmosphericEngine");
+AtmosphericEngine::AtmosphericEngine()
+{
+  this->registerObject(this, AtmosphericEngine::_objectList);
 }
 
@@ -43 +42 @@
  *  destroys a AtmosphericEngine
  */
-AtmosphericEngine::~AtmosphericEngine() {
-    AtmosphericEngine::singletonRef = NULL;
+AtmosphericEngine::~AtmosphericEngine()
+{
+  AtmosphericEngine::singletonRef = NULL;
 
-    const std::list<BaseObject*>* weatherEffects = ClassList::getList( CL_WEATHER_EFFECT);
-
-    if (weatherEffects != NULL) {
-        while(!weatherEffects->empty())
-            delete weatherEffects->front();
-    }
+  while(!WeatherEffect::objectList().empty())
+    delete WeatherEffect::objectList().front();
 }
 
@@ -57 +53 @@
  * @param root The XML-element to load the AtmosphericEngine from
  */
-void AtmosphericEngine::loadParams(const TiXmlElement* root) {
-    LoadParamXML(root, "WeatherEffect", this, AtmosphericEngine, loadWeatherEffect);
-    LoadParamXML(root, "SunEffect", this, AtmosphericEngine, loadSunEffect);
+void AtmosphericEngine::loadParams(const TiXmlElement* root)
+{
+  LoadParamXML(root, "WeatherEffect", this, AtmosphericEngine, loadWeatherEffect);
+  LoadParamXML(root, "SunEffect", this, AtmosphericEngine, loadSunEffect);
 }
 
@@ -65 +62 @@
  * @param root The XML-element to load WeatherEffects from
  */
-void AtmosphericEngine::loadWeatherEffect(const TiXmlElement* root) {
-    LOAD_PARAM_START_CYCLE(root, element);
-    {
-        PRINTF(4)("element is: %s\n", element->Value());
-        // Factory::fabricate(element);
+void AtmosphericEngine::loadWeatherEffect(const TiXmlElement* root)
+{
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+    PRINTF(4)("element is: %s\n", element->Value());
+    // Factory::fabricate(element);
 
-        BaseObject* bo = Factory::fabricate(element);
-        if( bo == NULL)
-            PRINTF(0)(" Could not create Element %s\n", element->Value());
-    }
-    LOAD_PARAM_END_CYCLE(element);
+    BaseObject* bo = Factory::fabricate(element);
+    if( bo == NULL)
+      PRINTF(0)(" Could not create Element %s\n", element->Value());
+  }
+  LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -81 +79 @@
  * @param root The XML-element to load SunEffects from
  */
-void AtmosphericEngine::loadSunEffect(const TiXmlElement* root) {
-    LOAD_PARAM_START_CYCLE(root, element);
-    {
-        PRINTF(4)("element is: %s\n", element->Value());
-    }
-    LOAD_PARAM_END_CYCLE(element);
+void AtmosphericEngine::loadSunEffect(const TiXmlElement* root)
+{
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+    PRINTF(4)("element is: %s\n", element->Value());
+  }
+  LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -93 +92 @@
  * 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();
-    }
+void AtmosphericEngine::draw() const
+{
+  for (NewObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
+       it != WeatherEffect::objectList().end();
+       ++it)
+    (*it)->draw();
 }
 
@@ -109 +105 @@
  * ticks the effect if there is any time dependancy
  */
-void AtmosphericEngine::tick(float dt) {
-    const std::list<BaseObject*>* weatherEffects = ClassList::getList( CL_WEATHER_EFFECT);
+void AtmosphericEngine::tick(float dt)
+{
 
-    // tick the weather effects
-    if (weatherEffects != NULL) {
-        std::list<BaseObject*>::const_iterator it;
-        for (it = weatherEffects->begin(); it != weatherEffects->end(); it++) {
-            /*      printf("%s::%s \n", (*it)->getClassCName(), (*it)->getName());*/
-            dynamic_cast<WeatherEffect*>(*it)->tick(dt);
-        }
-    }
+  for (NewObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
+       it != WeatherEffect::objectList().end();
+       ++it)
+    (*it)->tick(dt);
 }

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

@@ -1 +1 @@
 /*!
  * @file atmospheric_engine.h
- *  
+ *
  */
 
@@ -14 +14 @@
 class AtmosphericEngine : public BaseObject
 {
+  NewObjectListDeclaration(AtmosphericEngine);
   public:
     ~AtmosphericEngine();

branches/new_class_id/src/lib/graphics/effects/graphics_effect.cc

@@ -22 +22 @@
 #include "util/loading/load_param.h"
 
-
-
-
-
+NewObjectListDefinition(GraphicsEffect);
 
 /**
@@ -33 +30 @@
  */
 GraphicsEffect::GraphicsEffect(const TiXmlElement* root) {
-    this->setClassID(CL_GRAPHICS_EFFECT, "GraphicsEffect");
+  this->registerObject(this, GraphicsEffect::_objectList);
     this->bActivated = false;
 }

branches/new_class_id/src/lib/graphics/effects/graphics_effect.h

@@ -13 +13 @@
 //! A class that handles GraphicsEffects. The GraphicsEffectManager operates on this.
 class GraphicsEffect : public BaseObject {
-public:
+  NewObjectListDeclaration(GraphicsEffect);
+  public:
     GraphicsEffect(const TiXmlElement* root = NULL);
     virtual ~GraphicsEffect();

branches/new_class_id/src/lib/graphics/effects/weather_effect.cc

@@ -20 +20 @@
 #include "util/loading/load_param.h"
 
-
-
-
+NewObjectListDefinition(WeatherEffect);
 
 /**
@@ -29 +27 @@
 WeatherEffect::WeatherEffect(const TiXmlElement* root)
 {
-  this->setClassID(CL_WEATHER_EFFECT, "WeatherEffect");
+  this->registerObject(this, WeatherEffect::_objectList);
   this->bActivated = false;
 }

branches/new_class_id/src/lib/graphics/effects/weather_effect.h

@@ -12 +12 @@
 class WeatherEffect : public BaseObject
 {
+  NewObjectListDeclaration(WeatherEffect);
+
   public:
     WeatherEffect(const TiXmlElement* root = NULL);