Changeset 6800 for code/trunk/src/modules/objects

Timestamp:

Apr 29, 2010, 1:16:16 PM (14 years ago)

Author:

dafrick

Message:

Created a new class of triggers called Multitriggers.
MultiTriggers are triggers which (as opposed to normal triggers) have a state for each object triggering the MultiTrigger, that means, that a MultiTrigger can be triggered for two different Players, while not being triggered for a third.
To go with this MultiTrigger I created a data structure (MultitriggerContainer), which helps relaying important information to the objects, that receive the Events of the trigger.
Also there is a MultiDistanceTrigger, which is just the DistanceTrigger as a MultiTrigger.

To make this work I had to make some adjustements to the eventsystem, namely an EventState can now be either an EventState (as it was before) or an EventSink, which means that every efent arriving at the EventState is processed as opposed to just the ones which change the state.
There is a new makro (XMLPortEventSink) to create an EventState with sink behaviour. It can be used exacly as the XMLPortEventState makro.

Location:

code/trunk/src/modules/objects

Files:

• ObjectsPrereqs.h (modified) (1 diff)
• eventsystem/EventListener.cc (modified) (1 diff)
• triggers/CMakeLists.txt (modified) (1 diff)
• triggers/DistanceMultiTrigger.cc (added)
• triggers/DistanceMultiTrigger.h (added)
• triggers/MultiTrigger.cc (added)
• triggers/MultiTrigger.h (added)
• triggers/MultiTriggerContainer.cc (added)
• triggers/MultiTriggerContainer.h (added)

code/trunk/src/modules/objects/ObjectsPrereqs.h

@@ -85 +85 @@
     // triggers
     class CheckPoint;
+    class DistanceMultiTrigger;
     class DistanceTrigger;
     class EventTrigger;
+    class MultiTrigger;
+    class MultiTriggerContainer;
     class Trigger;
 }

code/trunk/src/modules/objects/eventsystem/EventListener.cc

@@ -61 +61 @@
             return;
         }
+        
+        COUT(4) << "EventListener: Processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << std::endl;
 
         this->bActive_ = true;

code/trunk/src/modules/objects/triggers/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(OBJECTS_SRC_FILES
-  Trigger.cc
+  CheckPoint.cc
+  DistanceMultiTrigger.cc
   DistanceTrigger.cc
   EventTrigger.cc
-  CheckPoint.cc
+  MultiTrigger.cc
+  MultiTriggerContainer.cc
+  Trigger.cc
 )