Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/graphics_engine.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/graphics/graphics_engine.cc (modified) (8 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -17 +17 @@
 
 #include "graphics_engine.h"
-#include "util/loading/resource_manager.h"
 #include "state.h"
 
@@ -28 +27 @@
 #include "debug.h"
 
-#include "util/preferences.h"
+#include "parser/preferences/preferences.h"
 #include "substring.h"
 #include "text.h"
@@ -35 +34 @@
 #include "texture.h"
 
-#include "effects/graphics_effect.h"
-#include "effects/fog_effect.h"
-#include "effects/lense_flare.h"
+#include "graphics_effect.h"
 
 #include "shell_command.h"
-
+#include "loading/load_param_xml.h"
 
 #include "parser/tinyxml/tinyxml.h"
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
-#include "class_list.h"
 
 #ifdef __WIN32__
@@ -54 +50 @@
 SHELL_COMMAND(fps, GraphicsEngine, toggleFPSdisplay);
 
+ObjectListDefinition(GraphicsEngine);
+
 /**
  * @brief standard constructor
@@ -59 +57 @@
 GraphicsEngine::GraphicsEngine ()
 {
-  this->setClassID(CL_GRAPHICS_ENGINE, "GraphicsEngine");
+  this->registerObject(this, GraphicsEngine::_objectList);
   this->setName("GraphicsEngine");
 
@@ -117 +115 @@
 {
   LoadParamXML(root, "GraphicsEffect", this, GraphicsEngine, loadGraphicsEffects)
-  .describe("loads a graphics effect");
+   .describe("loads a graphics effect");
 }
 
@@ -590 +588 @@
 
   // tick the graphics effects
-  if (this->graphicsEffects != NULL || (this->graphicsEffects = ClassList::getList(CL_GRAPHICS_EFFECT)) != NULL)
-  {
-    std::list<BaseObject*>::const_iterator it;
-    for (it = this->graphicsEffects->begin(); it != this->graphicsEffects->end(); it++)
-      dynamic_cast<GraphicsEffect*>(*it)->tick(dt);
-  }
+  for (ObjectList<GraphicsEffect>::const_iterator it = GraphicsEffect::objectList().begin();
+       it != GraphicsEffect::objectList().end();
+       ++it)
+    (*it)->tick(dt);
 }
 
@@ -688 +684 @@
   {
     case EV_VIDEO_RESIZE:
-      this->resolutionChanged(event.resize);
-      break;
-  }
-}
+    this->resolutionChanged(event.resize);
+    break;
+  }
+}