Changeset 2065 for code/branches/objecthierarchy/src/core/BaseObject.cc

Timestamp:

Oct 30, 2008, 2:44:48 AM (16 years ago)

Author:

landauf

Message:

added two more graphical classes, ParticleEmitter and ParticleSpawner

File:

• code/branches/objecthierarchy/src/core/BaseObject.cc (modified) (5 diffs)

code/branches/objecthierarchy/src/core/BaseObject.cc

@@ -35 +35 @@
 #include "tinyxml/tinyxml.h"
 #include "CoreIncludes.h"
+#include "EventIncludes.h"
 #include "XMLPort.h"
 #include "XMLFile.h"
@@ -79 +80 @@
     BaseObject::~BaseObject()
     {
+        for (std::list<BaseObject*>::const_iterator it = this->events_.begin(); it != this->events_.end(); ++it)
+            (*it)->eventListeners_.erase(this);
     }
 
@@ -184 +187 @@
     void BaseObject::addEvent(BaseObject* event, const std::string& sectionname)
     {
-        this->eventListeners_.insert(std::pair<std::string, BaseObject*>(sectionname, event));
+        event->eventListeners_[this] = sectionname;
+        this->events_.push_back(event);
     }
 
@@ -190 +194 @@
     {
         unsigned int i = 0;
-        for (std::set<std::pair<std::string, BaseObject*> >::const_iterator it = this->eventListeners_.begin(); it != this->eventListeners_.end(); ++it)
+        for (std::list<BaseObject*>::const_iterator it = this->events_.begin(); it != this->events_.end(); ++it)
         {
             if (i == index)
-                return (*it).second;
+                return (*it);
             ++i;
         }
@@ -230 +234 @@
         Event event(activate, this);
 
-        for (std::set<std::pair<std::string, BaseObject*> >::iterator it = this->eventListeners_.begin(); it != this->eventListeners_.end(); ++it)
-        {
-            event.sectionname_ = (*it).first;
-            (*it).second->processEvent(event);
+        for (std::map<BaseObject*, std::string>::iterator it = this->eventListeners_.begin(); it != this->eventListeners_.end(); ++it)
+        {
+            event.sectionname_ = it->second;
+            it->first->processEvent(event);
         }
     }