Changeset 5888 for code/branches/core5/src/libraries/core/BaseObject.cc

Timestamp:

Oct 6, 2009, 4:56:42 AM (16 years ago)

Author:

landauf

Message:

Added support for named events (so one object can fire multiple different events).
Added a new class, EventFilter, to filter differently named events and map them to different states.

I've wrapped the event names with a pretty useless macro, but I want to expand this in the future and register possible event names in the Identifier of the corresponding class. This allows us to get the possible event names in a static manner and thus build an editor upon it.

File:

• code/branches/core5/src/libraries/core/BaseObject.cc (modified) (3 diffs)

code/branches/core5/src/libraries/core/BaseObject.cc

@@ -300 +300 @@
         @brief Fires an event (without a state).
     */
-    void BaseObject::fireEvent()
-    {
-        this->fireEvent(true);
-        this->fireEvent(false);
+    void BaseObject::fireEvent(const std::string& name)
+    {
+        this->fireEvent(true, name);
+        this->fireEvent(false, name);
     }
 
@@ -309 +309 @@
         @brief Fires an event which activates or deactivates a state.
     */
-    void BaseObject::fireEvent(bool activate)
-    {
-        this->fireEvent(activate, this);
+    void BaseObject::fireEvent(bool activate, const std::string& name)
+    {
+        this->fireEvent(activate, this, name);
     }
 
@@ -317 +317 @@
         @brief Fires an event which activates or deactivates a state with agiven originator (the object which triggered the event).
     */
-    void BaseObject::fireEvent(bool activate, BaseObject* originator)
-    {
-        Event event(activate, originator);
+    void BaseObject::fireEvent(bool activate, BaseObject* originator, const std::string& name)
+    {
+        Event event(activate, originator, name);
 
         for (std::set<BaseObject*>::iterator it = this->eventListeners_.begin(); it != this->eventListeners_.end(); ++it)