Changeset 2065 for code/branches/objecthierarchy/src/core/Event.h

Timestamp:

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

Author:

landauf

Message:

added two more graphical classes, ParticleEmitter and ParticleSpawner

File:

• code/branches/objecthierarchy/src/core/Event.h (modified) (2 diffs)

code/branches/objecthierarchy/src/core/Event.h

@@ -31 +31 @@
 
 #include "CorePrereqs.h"
-#include "Executor.h"
-
-#define SetEvent(classname, eventname, functionname, event) \
-    SetEventGeneric(eventcontainer##classname##functionname, classname, eventname, orxonox::createExecutor(orxonox::createFunctor(&classname::functionname), std::string( #classname ) + "::" + #functionname), event, BaseObject)
-
-#define SetEventTemplate(classname, eventname, functionname, event, ...) \
-    SetEventGeneric(eventcontainer##classname##functionname, classname, eventname, orxonox::createExecutor(orxonox::createFunctor<classname, __VA_ARGS__ >(&classname::functionname), std::string( #classname ) + "::" + #functionname), event, BaseObject)
-
-#define SetSubclassEvent(classname, eventname, functionname, event, subclassname) \
-    SetEventGeneric(eventcontainer##classname##functionname, classname, eventname, orxonox::createExecutor(orxonox::createFunctor(&classname::functionname), std::string( #classname ) + "::" + #functionname), event, subclassname)
-
-#define SetSubclassEventTemplate(classname, eventname, functionname, event, subclassname, ...) \
-    SetEventGeneric(eventcontainer##classname##functionname, classname, eventname, orxonox::createExecutor(orxonox::createFunctor<classname, __VA_ARGS__ >(&classname::functionname), std::string( #classname ) + "::" + #functionname), event, subclassname)
-
-#define SetEventGeneric(containername, classname, eventname, executor, event, subclassname) \
-    orxonox::EventContainer* containername = this->getEventContainer(eventname); \
-    if (!containername) \
-    { \
-        containername = new orxonox::EventContainer(std::string(eventname), executor, orxonox::ClassIdentifier<subclassname>::getIdentifier()); \
-        this->addEventContainer(eventname, containername); \
-    } \
-    event.castedOriginator_ = dynamic_cast<subclassname*>(event.originator_); \
-    containername->process(this, event)
-
 
 namespace orxonox
@@ -72 +48 @@
         public:
             EventContainer(const std::string& eventname, Executor* eventfunction, Identifier* subclass) : eventname_(eventname), eventfunction_(eventfunction), subclass_(subclass), activeEvents_(0) {}
-            ~EventContainer()
-                { delete this->eventfunction_; }
+            ~EventContainer();
 
             void process(BaseObject* object, const Event& event);