Changeset 5890 for code/branches/core5

Timestamp:

Oct 6, 2009, 5:29:39 AM (15 years ago)

Author:

landauf

Message:

Using target= instead of name= to define the target-object in EventTarget. This avoids possible loops if more than one EventTarget point to the same object, because the other EventTarget becomes a target itself, passing the event back and forth.

Location:

code/branches/core5

Files:

• data/levels/events.oxw (modified) (2 diffs)
• data/levels/old/physicstest2.oxw (modified) (1 diff)
• data/levels/old/princessaeryn.oxw (modified) (1 diff)
• data/levels/old/sample4.oxw (modified) (1 diff)
• data/levels/presentation.oxw (modified) (1 diff)
• data/levels/presentation09b.oxw (modified) (2 diffs)
• data/levels/princessaeryn.oxw (modified) (1 diff)
• src/modules/objects/eventsystem/EventTarget.cc (modified) (4 diffs)
• src/modules/objects/eventsystem/EventTarget.h (modified) (1 diff)

code/branches/core5/data/levels/events.oxw

@@ -96 +96 @@
     <Billboard name="bb3" position="100,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
     <Billboard name="bb3" position="100,150,100" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
-    <EventTarget name="bb3">
+    <EventTarget target="bb3">
       <events>
         <visibility>
@@ -144 +144 @@
     <EventDispatcher>
       <targets>
-        <EventTarget name="bb5" />
+        <EventTarget target="bb5" />
       </targets>
       <events>

code/branches/core5/data/levels/old/physicstest2.oxw

@@ -243 +243 @@
     <!--EventDispatcher>
       <targets>
-        <EventTarget name=fireright />
-        <EventTarget name=firecenter />
-        <EventTarget name=fireleft />
+        <EventTarget target=fireright />
+        <EventTarget target=firecenter />
+        <EventTarget target=fireleft />
       </targets>
       <events>

code/branches/core5/data/levels/old/princessaeryn.oxw

@@ -264 +264 @@
             <EventDispatcher>
                 <targets>
-                    <EventTarget name=trail />
+                    <EventTarget target=trail />
                 </targets>
                 <events>

code/branches/core5/data/levels/old/sample4.oxw

@@ -123 +123 @@
     <EventDispatcher>
       <targets>
-        <EventTarget name=fireright />
-        <EventTarget name=firecenter />
-        <EventTarget name=fireleft />
+        <EventTarget target=fireright />
+        <EventTarget target=firecenter />
+        <EventTarget target=fireleft />
       </targets>
       <events>

code/branches/core5/data/levels/presentation.oxw

@@ -151 +151 @@
     <EventDispatcher>
       <targets>
-        <EventTarget name=fireright />
-        <EventTarget name=firecenter />
-        <EventTarget name=fireleft />
+        <EventTarget target=fireright />
+        <EventTarget target=firecenter />
+        <EventTarget target=fireleft />
       </targets>
       <events>

code/branches/core5/data/levels/presentation09b.oxw

@@ -111 +111 @@
     <EventDispatcher>
       <targets>
-        <EventTarget name=pirates />
+        <EventTarget target=pirates />
       </targets>
       <events>
@@ -163 +163 @@
     <EventDispatcher>
       <targets>
-        <EventTarget name=attacker />
+        <EventTarget target=attacker />
       </targets>
       <events>

code/branches/core5/data/levels/princessaeryn.oxw

@@ -227 +227 @@
             <EventDispatcher>
                 <targets>
-                    <EventTarget name=trail />
+                    <EventTarget target=trail />
                 </targets>
                 <events>

code/branches/core5/src/modules/objects/eventsystem/EventTarget.cc

@@ -38 +38 @@
     {
         RegisterObject(EventTarget);
+
+        this->bActive_ = false;
     }
 
@@ -48 +50 @@
         SUPER(EventTarget, XMLPort, xmlelement, mode);
 
+        XMLPortParam(EventTarget, "target", setTargetName, getTargetName, xmlelement, mode);
+
         // since we need event sources mapped to any state, we have to parse XML by ourselves
         this->loadAllEventStates(xmlelement, mode, this, Class(EventTarget));
@@ -54 +58 @@
     void EventTarget::processEvent(Event& event)
     {
+        if (this->bActive_)
+        {
+            COUT(2) << "Warning: Detected Event loop in EventTarget \"" << this->getName() << "\"" << std::endl;
+            return;
+        }
+
+        this->bActive_ = true;
         this->fireEvent(event);
+        this->bActive_ = false;
     }
 
-    void EventTarget::changedName()
+    void EventTarget::setTargetName(const std::string& name)
     {
-        SUPER(EventTarget, changedName);
-
+        this->target_ = name;
+        
         for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); ++it)
-            if (it->getName() == this->getName())
+            if (it->getName() == this->target_)
                 this->addEventTarget(*it);
     }
@@ -68 +80 @@
     void EventTarget::loadedNewXMLName(BaseObject* object)
     {
-        if (this->getName() == "")
+        if (this->target_ == "")
             return;
 
-        if (object->getName() == this->getName())
+        if (object->getName() == this->target_)
             this->addEventTarget(object);
     }

code/branches/core5/src/modules/objects/eventsystem/EventTarget.h

@@ -47 +47 @@
             virtual void processEvent(Event& event);
 
-            virtual void changedName();
+            void setTargetName(const std::string& name);
+            inline const std::string& getTargetName() const
+                { return this->target_; }
 
         private:
             virtual void loadedNewXMLName(BaseObject* object);
             void addEventTarget(BaseObject* object);
+            
+            std::string target_;
+            bool bActive_;
     };
 }