Changeset 7601 for code/trunk/src/modules/objects/triggers

Timestamp:

Oct 30, 2010, 1:54:49 PM (14 years ago)

Author:

dafrick

Message:

Adding all classes in modules/objects to Objects module (in doxygen).
Created TriggerBase which is the base class of Trigger and MultiTrigger and now provides the shared functionality and data.
Updated some of the documentation in MultiTrigger and Script.

Location:

code/trunk/src/modules/objects/triggers

Files:

• CMakeLists.txt (modified) (1 diff)
• CheckPoint.cc (modified) (1 diff)
• CheckPoint.h (modified) (2 diffs)
• DistanceMultiTrigger.cc (modified) (3 diffs)
• DistanceMultiTrigger.h (modified) (5 diffs)
• DistanceTrigger.cc (modified) (2 diffs)
• DistanceTrigger.h (modified) (2 diffs)
• DistanceTriggerBeacon.cc (modified) (1 diff)
• DistanceTriggerBeacon.h (modified) (2 diffs)
• EventMultiTrigger.cc (modified) (1 diff)
• EventMultiTrigger.h (modified) (4 diffs)
• EventTrigger.cc (modified) (1 diff)
• EventTrigger.h (modified) (2 diffs)
• MultiTrigger.cc (modified) (23 diffs)
• MultiTrigger.h (modified) (12 diffs)
• MultiTriggerContainer.cc (modified) (2 diffs)
• MultiTriggerContainer.h (modified) (3 diffs)
• Trigger.cc (modified) (11 diffs)
• Trigger.h (modified) (5 diffs)
• TriggerBase.cc (added)
• TriggerBase.h (added)

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

@@ -9 +9 @@
   MultiTriggerContainer.cc
   Trigger.cc
+  TriggerBase.cc
 )

code/trunk/src/modules/objects/triggers/CheckPoint.cc

@@ -26 +26 @@
  *
  */
+
+/**
+    @file CheckPoint.cc
+    @brief Implementation of the CheckPoint class.
+    @ingroup NormalTrigger
+*/
 
 #include "CheckPoint.h"

code/trunk/src/modules/objects/triggers/CheckPoint.h

@@ -28 +28 @@
 
 /**
-    @file
-    @brief
+    @file CheckPoint.h
+    @brief Definition of the CheckPoint class.
+    @ingroup NormalTrigger
 */
 
@@ -42 +43 @@
 namespace orxonox
 {
+
+    /**
+    @brief
+
+    @author
+        Aurelian Jaggi
+
+    @ingroup NormalTrigger
+    */
     class _ObjectsExport CheckPoint : public DistanceTrigger, public RadarViewable
     {

code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc

@@ -30 +30 @@
     @file DistanceMultiTrigger.cc
     @brief Implementation of the DistanceMultiTrigger class.
+    @ingroup MultiTrigger
 */
 
@@ -36 +37 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+
 #include "DistanceTriggerBeacon.h"
 
@@ -131 +133 @@
             if(this->singleTargetMode_)
             {
-                // If the object that is a target is no DistanceTriggerBeacon, then the DistanceMultiTrigger can't be in single-target-mode.
+                // If the object that is a target is no DistanceTriggerBeacon, then the DistanceMultiTrigger can't be in single-target mode.
                 if(!entity->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()))
                 {

code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h

@@ -30 +30 @@
     @file DistanceMultiTrigger.h
     @brief Definition of the DistanceMultiTrigger class.
+    @ingroup MultiTrigger
 */
 
@@ -37 +38 @@
 #include "objects/ObjectsPrereqs.h"
 
+#include <map>
+
+#include "core/WeakPtr.h"
+
 #include "worldentities/WorldEntity.h"
-#include "core/WeakPtr.h"
-#include <map>
 
 #include "MultiTrigger.h"
@@ -48 +51 @@
     /**
     @brief
-        The DistanceMultiTrigger is a trigger that triggers whenever an object (that is of the specified target type) is in a specified range of the DistanceMultiTrigger. The object can be specified further by adding a DistanceTriggerBeacon (just attaching it) to the objects that can trigger this DistanceMultiTrigger and specify the name of the DistanceTriggerBeacon with the parameter targetname and only objects that have a DistanceTriggerBeacon with that name attached will trigger the DistanceMultiTrigger.
+        The DistanceMultiTrigger is a MultiTrigger that triggers whenever an object (that is of the specified target type) is in a specified range of the DistanceMultiTrigger. The object can be specified further by adding a @ref orxonox::DistanceTriggerBeacon "DistanceTriggerBeacon" (by just attaching it) to the objects that can trigger this DistanceMultiTrigger and specify the name of the @ref orxonox::DistanceTriggerBeacon "DistanceTriggerBeacon" with the parameter <em>targetname</em> and only objects that have a @ref orxonox::DistanceTriggerBeacon "DistanceTriggerBeacon" with that name will trigger the DistanceMultiTrigger.
         Parameters are (additional to the ones of MultiTrigger):
-            'distance', which specifies the maximum distance at which the DistanceMultiTrigger still triggers. Default is 100.
-            'targetname', which, if not left blank, causes the DistancMultiTrigger to be in single-target mode, meaning, that it only reacts to objects that have a DistanceTriggerBeacon (therefore the target has to be set to DistanceTriggerBeacon for it to work), with the name specified by targetname, attached.
+        - @b distance Which specifies the maximum distance at which the DistanceMultiTrigger still triggers. Default is 100.
+        - @b targetname Which, if not left blank, causes the DistancMultiTrigger to be in <em>single-target</em> mode, meaning, that it only reacts to objects that have a @ref orxonox::DistanceTriggerBeacon "DistanceTriggerBeacon" (therefore the target has to be set to @ref orxonox::DistanceTriggerBeacon "DistanceTriggerBeacon" for it to work), with the name specified by <em>targetname</em>, attached.
 
         A simple DistanceMultiTrigger would look like this:
@@ -58 +61 @@
         @endcode
 
-        An implementation that only reacts to objects with a DistanceTriggerBeacon attached would look like this:
+        An implementation that only reacts to objects with a @ref orxonox::DistanceTriggerBeacon "DistanceTriggerBeacon" attached would look like this:
         @code
         <DistanceMultiTrigger position="0,0,0" target="DistanceMultiTrigger" targetname="beacon1" distance="30" />
         @endcode
-        This particular DistanceMultiTrigger would only react if an object was in range, that had a DistanceTriggerBeacon with the name 'beacon1' attached.
-    @see MultiTrigger.h
+        This particular DistanceMultiTrigger would only react if an object was in range, that had a @ref orxonox::DistanceTriggerBeacon "DistanceTriggerBeacon" with the name <em>beacon1</em> attached.
+
+    @see MultiTrigger
         For more information on MultiTriggers.
+
     @author
         Damian 'Mozork' Frick
+
+    @ingroup MultiTrigger
     */
     class _ObjectsExport DistanceMultiTrigger : public MultiTrigger
@@ -106 +113 @@
         private:
             float distance_; //!< The distance at which the DistanceMultiTrigger triggers.
-            std::string targetName_; //!< The target name, used in singleTargetMode.
-            bool singleTargetMode_; //!< To indicate whe the MultiDistanceTrigger is in single-target-mode.
+            std::string targetName_; //!< The target name, used in <em>single-target</em> mode.
+            bool singleTargetMode_; //!< To indicate whe the MultiDistanceTrigger is in <em>single-target</em> mode.
 
             std::map<WorldEntity*, WeakPtr<WorldEntity>* > range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.

code/trunk/src/modules/objects/triggers/DistanceTrigger.cc

@@ -27 +27 @@
  */
 
+/**
+    @file DistanceTrigger.cc
+    @brief Implementation of the DistanceTrigger class.
+    @ingroup NormalTrigger
+*/
+
 #include "DistanceTrigger.h"
 
@@ -46 +52 @@
     this->targetName_ = BLANKSTRING;
     this->singleTargetMode_ = false;
-    this->setForPlayer(false); //!< Normally hasn't just players as targets.
   }
 

code/trunk/src/modules/objects/triggers/DistanceTrigger.h

@@ -27 +27 @@
  */
 
+/**
+    @file DistanceTrigger.h
+    @brief Definition of the DistanceTrigger class.
+    @ingroup NormalTrigger
+*/
+
 #ifndef _DistanceTrigger_H__
 #define _DistanceTrigger_H__
@@ -39 +45 @@
 namespace orxonox
 {
+
+  /**
+  @brief
+
+  @author
+    Benjamin Knecht
+  @author
+    Damian 'Mozork' Frick
+
+  @ingroup NormalTrigger
+  */
   class _ObjectsExport DistanceTrigger : public Trigger, public PlayerTrigger
   {

code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc

@@ -30 +30 @@
     @file DistanceTriggerBeacon.cc
     @brief Implementation of the DistanceTriggerBeacon class.
+    @ingroup Triggers
 */
 

code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h

@@ -30 +30 @@
     @file DistanceTriggerBeacon.h
     @brief Definition of the DistanceTriggerBeacon class.
+    @ingroup Triggers
 */
 
@@ -44 +45 @@
     /**
     @brief
-        A DistanceTriggerBeacon can be used together with a DistanceTrigger or a DistanceMultiTrigger to make them only react to specific objects.
-        This can be done by attaching a DistanceTriggerBeacon to an object, giving it a unique name and setting the targetname in the DistanceTrigger (or DistanceMultiTrigger) to that name and the target to DistanceTriggerBeacon.
+        A DistanceTriggerBeacon can be used together with a @ref orxonox::DistanceTrigger "DistanceTrigger" or a @ref orxonox::DistanceMultiTrigger "DistanceMultiTrigger" to make them only react to specific objects.
+        This can be done by attaching a DistanceTriggerBeacon to an object, giving it a unique name and setting the targetname in the @ref orxonox::DistanceTrigger "DistanceTrigger" (or @ref orxonox::DistanceMultiTrigger "DistanceMultiTrigger") to that name and the target to DistanceTriggerBeacon.
+
     @author
         Damian 'Mozork' Frick
+
+    @ingroup Triggers
     */
     class _ObjectsExport DistanceTriggerBeacon : public StaticEntity

code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc

@@ -30 +30 @@
     @file EventMultiTrigger.cc
     @brief Implementation of the EventMultiTrigger class.
+    @ingroup MultiTrigger
 */
 

code/trunk/src/modules/objects/triggers/EventMultiTrigger.h

@@ -30 +30 @@
     @file EventMultiTrigger.h
     @brief Definition of the EventMultiTrigger class.
+    @ingroup MultiTrigger
 */
 
@@ -44 +45 @@
     /**
     @brief
-        The EventMultiTrigger class is the equivalent of the EventTrigger class for MultiTriggers.
-        Consequentially what it does is it provides a way to have a MultiTrigger triggered by any kinds of events.
-        Events that are not caused by a MultiTrigger or by a MultiTrigger with an originator that is no target of this EventMultiTrigger are broadcasted to all entities that are the target of this EventMultitrigger. Events that are caused by MultiTriggers with an originator that is a target of this EventMultiTrigger just trigger the EventMultiTrigger for the originator that caused the MultiTrigger to trigger. Thus showing the equivalent behavior to the EventTrigger.
+        The EventMultiTrigger class is the equivalent of the @ref orxonox::EventTrigger "EventTrigger" class for MultiTriggers.
+        Consequentially what it does is it provides a way to have a MultiTrigger triggered by any kinds of @ref orxonox::Event "Events".
+        @ref orxonox::Event "Events" that are not caused by a MultiTrigger, or that are caused by a MultiTrigger with an originator that is no target of this EventMultiTrigger, are broadcasted to all entities that are the target of this EventMultiTrigger. @ref orxonox::Event "Events" that are caused by @ref orxonox::MultiTrigger "MultiTriggers" with an originator that is a target of this EventMultiTrigger just trigger the EventMultiTrigger for the originator that caused the MultiTrigger to trigger. Thus showing the equivalent behavior to the @ref orxonox::EventTrigger "EventTrigger".
 
         Example:
@@ -59 +60 @@
         </EventMultiTrigger>
         @endcode
-    @see MultiTrigger.h
+
+    @see MultiTrigger
         For more information on MultiTriggers.
+
     @author
         Damian 'Mozork' Frick
+
+    @ingroup MultiTrigger
     */
     class _ObjectsExport EventMultiTrigger : public MultiTrigger
@@ -75 +80 @@
 
         private:
-            void trigger(bool bTriggered, BaseObject* originator); //!< Method that causes the EventMultiTrigger to trigger upon receiving an event.
+            void trigger(bool bTriggered, BaseObject* originator); //!< Method that causes the EventMultiTrigger to trigger upon receiving an @ref orxonox::Event "Event".
 
     };

code/trunk/src/modules/objects/triggers/EventTrigger.cc

@@ -26 +26 @@
  *
  */
+
+/**
+    @file EventTrigger.cc
+    @brief Implementation of the EventTrigger class.
+    @ingroup NormalTrigger
+*/
 
 #include "EventTrigger.h"

code/trunk/src/modules/objects/triggers/EventTrigger.h

@@ -27 +27 @@
  */
 
+/**
+    @file EventTrigger.h
+    @brief Definition of the EventTrigger class.
+    @ingroup NormalTrigger
+*/
+
 #ifndef _EventTrigger_H__
 #define _EventTrigger_H__
@@ -35 +41 @@
 namespace orxonox
 {
+
+    /**
+    @brief
+
+    @author
+        Fabian 'x3n' Landau
+
+    @ingroup NormalTrigger
+    */
     class _ObjectsExport EventTrigger : public Trigger
     {

code/trunk/src/modules/objects/triggers/MultiTrigger.cc

@@ -30 +30 @@
     @file MultiTrigger.cc
     @brief Implementation of the MultiTrigger class.
+    @ingroup MultiTrigger
 */
 
@@ -41 +42 @@
 namespace orxonox
 {
-
-    // Initialization of some static (magic) variables.
-    /*static*/ const int MultiTrigger::INF_s = -1;
-    /*static*/ const std::string MultiTrigger::and_s = "and";
-    /*static*/ const std::string MultiTrigger::or_s = "or";
-    /*static*/ const std::string MultiTrigger::xor_s = "xor";
 
     CreateFactory(MultiTrigger);
@@ -56 +51 @@
         The creator.
     */
-    MultiTrigger::MultiTrigger(BaseObject* creator) : StaticEntity(creator)
+    MultiTrigger::MultiTrigger(BaseObject* creator) : TriggerBase(creator)
     {
         RegisterObject(MultiTrigger);
 
-        this->bFirstTick_ = true;
-
-        this->delay_ = 0.0f;
-        this->bSwitch_ = false;
-        this->bStayActive_ = false;
-
-        this->remainingActivations_ = INF_s;
         this->maxNumSimultaneousTriggerers_ = INF_s;
 
-        this->bInvertMode_ = false;
-        this->mode_ = MultiTriggerMode::EventTriggerAND;
-
         this->bBroadcast_ = false;
 
-        this->parentTrigger_ = NULL;
-
         this->targetMask_.exclude(Class(BaseObject));
+
+        this->bMultiTrigger_ = true;
 
         this->setSyncMode(0x0);
@@ -105 +90 @@
         SUPER(MultiTrigger, XMLPort, xmlelement, mode);
 
-        XMLPortParam(MultiTrigger, "delay", setDelay, getDelay, xmlelement, mode);
-        XMLPortParam(MultiTrigger, "switch", setSwitch, getSwitch, xmlelement, mode);
-        XMLPortParam(MultiTrigger, "stayactive", setStayActive, getStayActive, xmlelement, mode);
-        XMLPortParam(MultiTrigger, "activations", setActivations, getActivations, xmlelement, mode);
         XMLPortParam(MultiTrigger, "simultaneousTriggerers", setSimultaneousTriggerers, getSimultaneousTriggerers, xmlelement, mode);
-        XMLPortParam(MultiTrigger, "invert", setInvert, getInvert, xmlelement, mode);
-        XMLPortParamTemplate(MultiTrigger, "mode", setMode, getModeString, xmlelement, mode, const std::string&);
         XMLPortParam(MultiTrigger, "broadcast", setBroadcast, getBroadcast, xmlelement, mode);
         XMLPortParamLoadOnly(MultiTrigger, "target", addTargets, xmlelement, mode).defaultValues("Pawn"); //TODO: Remove load only
 
-        XMLPortObject(MultiTrigger, MultiTrigger, "", addTrigger, getTrigger, xmlelement, mode);
-
         COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") created." << std::endl;
     }
@@ -124 +101 @@
     @brief
         A method that is executed each tick.
+        Most of the magic of MultiTriggers happens here.
     @param dt
         The duration of the last tick.
     */
+    //TODO: Segment into some helper methods?
     void MultiTrigger::tick(float dt)
     {
@@ -159 +138 @@
 
                 // The new triggered state dependent on the requested state, the mode and the invert-mode.
-                bool bTriggered = (state->bTriggered & this->isModeTriggered(state->originator)) ^ this->bInvertMode_;
+                bool bTriggered = (state->bTriggered & this->isModeTriggered(state->originator)) ^ this->getInvert();
 
                 // If the 'triggered' state has changed or the MultiTrigger has delay and thus we don't know whether this state will actually change the 'triggered' state, a new state is added to the state queue.
-                if(this->delay_ > 0.0f || bTriggered ^ this->isTriggered(state->originator))
+                if(this->getDelay() > 0.0f || bTriggered ^ this->isTriggered(state->originator))
                 {
                     state->bTriggered = bTriggered;
@@ -192 +171 @@
                 {
                     // If the maximum number of objects simultaneously triggering this MultiTrigger is not exceeded.
-                    if(this->maxNumSimultaneousTriggerers_ == INF_s || this->triggered_.size() < (unsigned int)this->maxNumSimultaneousTriggerers_)
+                    if(this->getSimultaneousTriggerers() == TriggerBase::INF_s || this->triggered_.size() < (unsigned int)this->getSimultaneousTriggerers())
                     {
                         bool bStateChanged = false;
@@ -211 +190 @@
                         bool bActive;
                         // If the MultiTrigger is in switch mode the 'active'-state only changes of the state changed to triggered.
-                        if(this->bSwitch_ && !state->bTriggered)
+                        if(this->getSwitch() && !state->bTriggered)
                             bActive = this->isActive(state->originator);
                         else
@@ -239 +218 @@
                             {
                                 // If the MultiTrigger doesn't stay active or hasn't' exceeded its remaining activations.
-                                if(!this->bStayActive_ || this->remainingActivations_ > 0)
+                                if(!this->getStayActive() || this->remainingActivations_ > 0)
                                     this->active_.erase(state->originator);
                                 else
@@ -249 +228 @@
                             {
                                 // If the MultiTrigger is set to broadcast and has no originator a boradcast is fired.
-                                if(this->bBroadcast_ && state->originator == NULL)
+                                if(this->getBroadcast() && state->originator == NULL)
                                     this->broadcast(bActive);
                                 // Else a normal event is fired.
@@ -267 +246 @@
                                 COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: NULL, active: " << bActive << ", triggered: " << state->bTriggered << "." << std::endl;
 
-                            // If the MultiTrigger has a parent trigger it needs to call a method to notify him, that its activity has changed.
-                            if(this->parentTrigger_ != NULL)
-                                this->parentTrigger_->subTriggerActivityChanged(state->originator);
+                            // If the MultiTrigger has a parent trigger, that is itself a MultiTrigger, it needs to call a method to notify him, that its activity has changed.
+                            if(this->parent_ != NULL && this->parent_->isMultiTrigger())
+                                static_cast<MultiTrigger*>(this->parent_)->childActivityChanged(state->originator);
                         }
 
@@ -302 +281 @@
         Returns true if the MultiTrigger is active, false if not.
     */
-    bool MultiTrigger::isActive(BaseObject* triggerer)
-    {
-        std::set<BaseObject*>::iterator it = this->active_.find(triggerer);
+    bool MultiTrigger::isActive(BaseObject* triggerer) const
+    {
+        std::set<BaseObject*>::const_iterator it = this->active_.find(triggerer);
         if(it == this->active_.end())
             return false;
         return true;
-    }
-
-    /**
-    @brief
-        Set the mode of the MultiTrigger.
-    @param modeName
-        The name of the mode as a string.
-    */
-    void MultiTrigger::setMode(const std::string& modeName)
-    {
-        if (modeName == MultiTrigger::and_s)
-            this->setMode(MultiTriggerMode::EventTriggerAND);
-        else if (modeName == MultiTrigger::or_s)
-            this->setMode(MultiTriggerMode::EventTriggerOR);
-        else if (modeName == MultiTrigger::xor_s)
-            this->setMode(MultiTriggerMode::EventTriggerXOR);
-        else
-            COUT(2) << "Invalid mode '" << modeName << "' in MultiTrigger " << this->getName() << " &(" << this << "). Leaving mode at '" << this->getModeString() << "'." << std::endl;
-    }
-
-    /**
-    @brief
-        Get the mode of the MultiTrigger.
-    @return
-        Returns the mode as a string.
-    */
-    const std::string& MultiTrigger::getModeString() const
-    {
-        if (this->mode_ == MultiTriggerMode::EventTriggerAND)
-            return MultiTrigger::and_s;
-        else if (this->mode_ == MultiTriggerMode::EventTriggerOR)
-            return MultiTrigger::or_s;
-        else if (this->mode_ == MultiTriggerMode::EventTriggerXOR)
-            return MultiTrigger::xor_s;
-        else // This can never happen, but the compiler needs it to feel secure.
-            return MultiTrigger::and_s;
     }
 
@@ -397 +340 @@
     /**
     @brief
-        Adds a MultiTrigger as a sub-trigger to the trigger.
-        Beware: Loops are not prevented and potentially very bad, so just don't create any loops.
-    @param trigger
-        The MultiTrigger to be added.
-    */
-    void MultiTrigger::addTrigger(MultiTrigger* trigger)
-    {
-        if (this != trigger && trigger != NULL)
-            this->subTriggers_.insert(trigger);
-        trigger->addParentTrigger(this);
-    }
-
-    /**
-    @brief
-        Get the sub-trigger of this MultiTrigger at the given index.
-    @param index
-        The index.
-    @return
-        Returns a pointer ot the MultiTrigger. NULL if no such trigger exists.
-    */
-    const MultiTrigger* MultiTrigger::getTrigger(unsigned int index) const
-    {
-        // If the index is greater than the number of sub-triggers.
-        if (this->subTriggers_.size() <= index)
-            return NULL;
-
-        std::set<MultiTrigger*>::const_iterator it;
-        it = this->subTriggers_.begin();
-
-        for (unsigned int i = 0; i != index; ++i)
-            ++it;
-
-        return (*it);
-    }
-
-    /**
-    @brief
         This method is called by the MultiTrigger to get information about new trigger events that need to be looked at.
         This method is the device for the behavior (the conditions under which the MultiTrigger triggers) of any derived class of MultiTrigger.
@@ -456 +362 @@
     {
         MultiTriggerState* state = new MultiTriggerState;
-        state->bTriggered = (!this->isTriggered(originator) & this->isModeTriggered(originator)) ^ this->bInvertMode_;
+        state->bTriggered = (!this->isTriggered(originator) & this->isModeTriggered(originator)) ^ this->getInvert();
         state->originator = originator;
         this->addState(state);
@@ -463 +369 @@
     /**
     @brief
-        This method is called by any sub-trigger to advertise changes in its state to its parent-trigger.
+        This method is called by any child to advertise changes in its state to its parent.
     @param originator
         The object that caused the change in activity.
     */
-    void MultiTrigger::subTriggerActivityChanged(BaseObject* originator)
+    void MultiTrigger::childActivityChanged(BaseObject* originator)
     {
         MultiTriggerState* state = new MultiTriggerState;
-        state->bTriggered = (this->isTriggered(originator) & this->isModeTriggered(originator)) ^ this->bInvertMode_;
+        state->bTriggered = (this->isTriggered(originator) & this->isModeTriggered(originator)) ^ this->getInvert();
         state->originator = originator;
         this->addState(state);
@@ -477 +383 @@
     /**
     @brief
-        Checks whether the sub-triggers are in such a way that, according to the mode of the MultiTrigger, the MultiTrigger is triggered (only considering the sub-triggers, not the state of MultiTrigger itself), for a given object.
-        To make an example: When the mode is 'and', then this would be true or a given object if all the sub-triggers were triggered for the given object.
+        Checks whether the children are in such a way that, according to the mode of the MultiTrigger, the MultiTrigger is triggered (only considering the children, not the state of MultiTrigger itself), for a given object.
+        To make an example: When the mode is <em>and</em>, then this would be true or a given object if all the children were triggered for the given object.
     @param triggerer
         The object.
     @return
-        Returns true if the MultiTrigger is triggered concerning it's sub-triggers.
+        Returns true if the MultiTrigger is triggered concerning it's children.
     */
     bool MultiTrigger::isModeTriggered(BaseObject* triggerer)
     {
-        if(this->subTriggers_.size() != 0)
-        {
-            bool returnVal = false;
+        if(this->children_.size() != 0)
+        {
+            bool triggered = false;
 
             switch(this->mode_)
             {
-                case MultiTriggerMode::EventTriggerAND:
-                    returnVal = checkAnd(triggerer);
+                case TriggerMode::EventTriggerAND:
+                    triggered = checkAnd(triggerer);
                     break;
-                case MultiTriggerMode::EventTriggerOR:
-                    returnVal = checkOr(triggerer);
+                case TriggerMode::EventTriggerOR:
+                    triggered = checkOr(triggerer);
                     break;
-                case MultiTriggerMode::EventTriggerXOR:
-                    returnVal = checkXor(triggerer);
+                case TriggerMode::EventTriggerXOR:
+                    triggered = checkXor(triggerer);
                     break;
                 default: // This will never happen.
-                    returnVal = false;
+                    triggered = false;
                     break;
             }
 
-            return returnVal;
+            return triggered;
         }
 
@@ -585 +491 @@
 
         // Add it ot the state queue with the delay specified for the MultiTrigger.
-        this->stateQueue_.push_back(std::pair<float, MultiTriggerState*>(this->delay_, state));
+        this->stateQueue_.push_back(std::pair<float, MultiTriggerState*>(this->getDelay(), state));
 
         return true;
@@ -592 +498 @@
     /**
     @brief
-        Checks whether the sub-triggers amount to true for the 'and' mode for a given object.
+        Checks whether the children amount to true for the <em>and</em> mode for a given object.
     @param triggerer
         The object.
@@ -600 +506 @@
     bool MultiTrigger::checkAnd(BaseObject* triggerer)
     {
-        for(std::set<MultiTrigger*>::iterator it = this->subTriggers_.begin(); it != this->subTriggers_.end(); ++it)
-        {
-            if(!(*it)->isActive(triggerer))
-                return false;
+        for(std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
+        {
+            TriggerBase* trigger = *it;
+            if(trigger->isMultiTrigger())
+            {
+                if(!static_cast<MultiTrigger*>(trigger)->isActive(triggerer))
+                    return false;
+            }
+            else
+            {
+                if(!trigger->isActive())
+                    return false;
+            }
         }
         return true;
@@ -610 +525 @@
     /**
     @brief
-        Checks whether the sub-triggers amount to true for the 'or' mode for a given object.
+        Checks whether the children amount to true for the <em>or</em> mode for a given object.
     @param triggerer
         The object.
@@ -618 +533 @@
     bool MultiTrigger::checkOr(BaseObject* triggerer)
     {
-        for(std::set<MultiTrigger*>::iterator it = this->subTriggers_.begin(); it != this->subTriggers_.end(); ++it)
-        {
-            if((*it)->isActive(triggerer))
-                return true;
+        for(std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
+        {
+            TriggerBase* trigger = *it;
+            if(trigger->isMultiTrigger())
+            {
+                if(static_cast<MultiTrigger*>(trigger)->isActive(triggerer))
+                    return true;
+            }
+            else
+            {
+                if(trigger->isActive())
+                    return true;
+            }
         }
         return false;
@@ -628 +552 @@
     /**
     @brief
-        Checks whether the sub-triggers amount to true for the 'xor' mode for a given object.
+        Checks whether the children amount to true for the <em>xor</em> mode for a given object.
     @param triggerer
         The object.
@@ -636 +560 @@
     bool MultiTrigger::checkXor(BaseObject* triggerer)
     {
-        bool test = false;
-        for(std::set<MultiTrigger*>::iterator it = this->subTriggers_.begin(); it != this->subTriggers_.end(); ++it)
-        {
-            if(test && (*it)->isActive(triggerer))
-                return false;
-
-            if((*it)->isActive(triggerer))
-                test = true;
-        }
-        return test;
+        bool triggered = false;
+        for(std::set<TriggerBase*>::iterator it = this->children_.begin(); it != this->children_.end(); ++it)
+        {
+            TriggerBase* trigger = *it;
+            if(triggered)
+            {
+                if(trigger->isMultiTrigger())
+                {
+                    if(static_cast<MultiTrigger*>(trigger)->isActive(triggerer))
+                        return false;
+                }
+                else
+                {
+                    if(trigger->isActive())
+                        return false;
+                }
+            }
+
+            if(trigger->isMultiTrigger())
+            {
+                if(static_cast<MultiTrigger*>(trigger)->isActive(triggerer))
+                    triggered = true;
+            }
+            else
+            {
+                if(trigger->isActive())
+                    triggered = true;
+            }
+        }
+        return triggered;
     }
 

code/trunk/src/modules/objects/triggers/MultiTrigger.h

@@ -30 +30 @@
     @file MultiTrigger.h
     @brief Definition of the MultiTrigger class.
+    @ingroup MultiTrigger
 */
 
@@ -43 +44 @@
 #include <deque>
 
-#include "tools/interfaces/Tickable.h"
-#include "worldentities/StaticEntity.h"
+#include "TriggerBase.h"
 
 namespace orxonox
 {
 
-    //! The different modes the MultiTrigger can be in.
-    namespace MultiTriggerMode
-    {
-        enum Value
-        {
-            EventTriggerAND,
-            EventTriggerOR,
-            EventTriggerXOR,
-        };
-    }
-
-    //! Struct to handle MultiTrigger states internally.
+    /**
+    @brief
+    Struct to handle @ref orxonox::MultiTrigger "MultiTrigger" states internally.
+
+    @ingroup MultiTrigger
+    */
     struct MultiTriggerState
     {
@@ -70 +64 @@
     @brief
         The MultiTrigger class implements a trigger that has a distinct state for each object triggering it.
-        In more detail: A Trigger is an object that can either be active or inactive, with a specified behavior how to switch between the two. A MultiTrigger generalizes that behavior for multiple objects triggering the trigger. A MultiTrigger can be active or inactive for any object triggering it, with the state for each object being completely independent of the state for other objects. Each time a switch occurs an Event is fired with as the originator a MultiTriggerContainer, containing a pointer to the MultiTrigger that caused the Event and a pointer to the object that caused the trigger to change it's activity.
+        In more detail: A Trigger is an object that can either be <em>active</em> or <em>inactive</em>, with a specified behavior how to switch between the two. A MultiTrigger generalizes that behavior for multiple objects triggering the trigger. A MultiTrigger can be <em>active</em> or <em>inactive</em> for any object triggering it, with the state for each object being completely independent of the state for other objects. Each time a switch occurs an @ref orxonox::Event "Event" is fired with as the originator a @ref orxonox::MultiTriggerContainer "MultiTriggerContainer", containing a pointer to the MultiTrigger that caused the @ref orxonox::Event "Event" and a pointer to the object that caused the trigger to change it's activity.
 
         MultiTriggers also allow for additional complexity which can be added through the choice of the parameters explained (briefly) below:
-        But first you must understand a small implementational detail. There is a distinction between the MultiTrigger being triggered (there is the state 'triggered' for that) and the MultiTrigger being active (for that is the state 'activity'). From the outside only the activity is visible. The state 'triggered' tells us whether the trigger is actually triggered, but it could pretend (for some reason, some of which we will see shortly) to be triggered (or to the outside, active), while it in fact isn't. The standard behavior is, that the activity changes, when the MultiTrigger transits from being triggered to not being triggered or the other way around.
+        But first you must understand a small implementational detail. There is a distinction between the MultiTrigger being triggered (there is the state <em>triggered</em> for that) and the MultiTrigger being active (for that is the state <em>activity</em>). From the outside only the <em>activity</em> is visible. The state <em>triggered</em> tells us whether the trigger is actually triggered, but it could pretend (for some reason, some of which we will see shortly) to be triggered (or to the outside, active), while it in fact isn't. The standard behavior is, that the <em>activity</em> changes, when the MultiTrigger transits from being triggered to not being triggered or the other way around.
         The parameters are:
-            'delay':                    The delay is the time that the trigger waits until it reacts (i.e. changes it's state) to the triggering condition being fulfilled.
-            'switch':                   Switch is a bool, if true the MultiTrigger is in switch-mode, meaning, that the activity changes only when the trigger is triggered , this means, that now the activity only changes, when the trigger changes from not being triggered to being triggered but not the other way around. The default is false.
-            'stayactive':               Stay active is also a bool, if true the MultiTrigger stays active after it has been activated as many times as specified by the parameter activations. The default is false.
-            'activations':              The number of activations until the trigger can't be triggered anymore. The default is -1, which is infinity.
-            'invert':                   Invert is a bool, if true the trigger is in invert-mode, meaning, that if the triggering condition is fulfilled the MultiTrigger will have the state not triggered and and if the condition is not fulfilled it will have the state triggered. In short it just inverts the behavior of the MultiTrigger. The default is false.
-            'simultaneousTriggerers':   The number of simultaneous triggerers limits the number of objects that are allowed to trigger the MultiTrigger at the same time. Or more precisely, the number of distinct objects the MultiTrigger has 'triggered' states for, at each point in time. The default is -1, which denotes infinity.
-            'mode':                     The mode describes how the MultiTrigger acts in relation to all the MultiTriggers, that are appended to it. There are 3 modes: 'and', meaning that the MultiTrigger can only be triggered if all the appended MultiTriggers are active. 'or', meaning that the MultiTrigger can only triggered if at least one of the appended MultiTriggers is active. And 'xor', meaning that the MultiTrigger can only be triggered if one and only one appended MultiTrigger is active. Note, that I wrote 'can only be active', that implies, that there is an additional condition to the activity of the MultiTrigger and that is the fulfillment of the triggering condition (the MultiTrigger itself doesn't have one, but all derived classes should). Also bear in mind, that the activity of a MultiTrigger is still coupled to the object that triggered it. The default is 'and'.
-            'broadcast'                 Broadcast is a bool, if true the MutliTrigger is in broadcast-mode, meaning, that all trigger events that are caused by no originator (originator is NULL) are broadcast as having come from every possible originator, or more precisely as having come from all objects that are specified targets of this MultiTrigger. The default is false.
-            'target':                   The target describes the kind of objects that are allowed to trigger this MultiTrigger. The default is 'Pawn'.
-            Also there is the possibility of appending MultiTriggers to the MultiTrigger just by adding them as sub-objects in the XML description of your MultiTrigger.
+        - @b delay The delay is the time that the trigger waits until it reacts (i.e. changes it's state) to the triggering condition being fulfilled.
+        - @b switch Switch is a boolean, if true the MultiTrigger is in switch-mode, meaning, that the <em>activity</em> changes only when the trigger is triggered, this means, that now the <em>activity</em> only changes, when the trigger changes from not being triggered to being triggered but not the other way around. The default is false.
+        - @b stayactive Stay active is also a boolean, if true the MultiTrigger stays active after it has been activated as many times as specified by the parameter activations. The default is false.
+        - @b activations The number of activations until the trigger can't be triggered anymore. The default is -1, which is infinity.
+        - @b invert Invert is a boolean, if true the trigger is in <em>invert-mode</em>, meaning, that if the triggering condition is fulfilled the MultiTrigger will have the state not triggered and and if the condition is not fulfilled it will have the state triggered. In short it just inverts the behavior of the MultiTrigger. The default is false.
+        - @b simultaneousTriggerers The number of simultaneous triggerers limits the number of objects that are allowed to trigger the MultiTrigger at the same time. Or more precisely, the number of distinct objects the MultiTrigger has <em>triggered</em> states for, at each point in time. The default is -1, which denotes infinity.
+        - @b mode The mode describes how the MultiTrigger acts in relation to all the triggers, that are appended to it. There are 3 modes: <em>and</em>, meaning that the MultiTrigger can only be triggered if all the appended triggers are active. <em>or</em>, meaning that the MultiTrigger can only triggered if at least one of the appended triggers is active. And <em>xor</em>, meaning that the MultiTrigger can only be triggered if one and only one appended trigger is active. Note, that I wrote <em>can only be active</em>, that implies, that there is an additional condition to the activity of the MultiTrigger and that is the fulfillment of the triggering condition (the MultiTrigger itself doesn't have one, but all derived classes should). Also bear in mind, that the activity of a MultiTrigger is still coupled to the object that triggered it. The default is <em>and</em>.
+        - @b broadcast Broadcast is a boolean, if true the MutliTrigger is in <em>broadcast-mode</em>, meaning, that all trigger events that are caused by no originator (originator is NULL) are broadcast as having come from every possible originator, or more precisely as having come from all objects that are specified targets of this MultiTrigger. The default is false.
+        - @b target The target describes the kind of objects that are allowed to trigger this MultiTrigger. The default is @ref orxonox::Pawn "Pawn".
+        - Also there is the possibility of appending triggers (as long as they inherit from TriggerBase) to the MultiTrigger just by adding them as children in the XML description of your MultiTrigger.
 
         An example of a MultiTrigger created through XML would look like this:
         @code
         <MultiTrigger position="0,0,0" delay="1.3" switch="true" stayactive="true" activations="7" invert="true" simultaneousTriggerers="2" mode="xor" broadcast="false" target="Pawn">
-            <MultiTrigger />
+            <TriggerBase />
             ...
-            <MultiTrigger />
+            <TriggerBase />
         </MultiTrigger>
         @endcode
@@ -97 +91 @@
     @author
         Damian 'Mozork' Frick
-        Many concepts and loads of inspiration from the Trigger class by Benjamin Knecht.
+
+        Many concepts and loads of inspiration from the @ref orxonox::Trigger "Trigger" class by Benjamin Knecht.
+
+    @ingroup MultiTrigger
     */
-    class _ObjectsExport MultiTrigger : public StaticEntity, public Tickable
+    class _ObjectsExport MultiTrigger : public TriggerBase
     {
         public:
@@ -108 +105 @@
             virtual void tick(float dt); //!< A method that is executed each tick.
 
-            bool isActive(BaseObject* triggerer = NULL); //!< Get whether the MultiTrigger is active for a given object.
-
-            /**
-            @brief Set the delay of the MultiTrigger.
-            @param delay The delay to be set.
-            */
-            inline void setDelay(float delay)
-                { if(delay > 0.0f) this->delay_= delay; }
-            /**
-            @brief Get the delay of the MultiTrigger.
-            @return The delay.
-            */
-            inline float getDelay(void) const
-                { return this->delay_; }
-
-            /**
-            @brief Set switch-mode of the MultiTrigger.
-            @param bSwitch If true the MultiTrigger is set to switched.
-            */
-            inline void setSwitch(bool bSwitch)
-                { this->bSwitch_ = bSwitch; }
-            /**
-            @brief Get the switch-mode of the MultiTrigger.
-            @return Returns true if the MultiTriger is in switch-mode.
-            */
-            inline bool getSwitch(void) const
-                { return this->bSwitch_; }
-
-            /**
-            @brief Set the stay-active-mode of the MultiTrigger.
-            @param bStayActive If true the MultiTrigger is set to stay active.
-            */
-            inline void setStayActive(bool bStayActive)
-                { this->bStayActive_ = bStayActive; }
-            /**
-            @brief Get the stay-active-mode of the MultiTrigger.
-            @return Returns true if the MultiTrigger stays active.
-            */
-            inline bool getStayActive(void) const
-                { return this->bStayActive_; }
-
-            /**
-            @brief Get the number of remaining activations of the MultiTrigger.
-            @return The number of activations. -1 denotes infinity.
-            */
-            inline int getActivations(void) const
-                { return this->remainingActivations_; }
+            /**
+            @brief Check whether the MultiTrigger is active.
+            @return Returns if the MultiTrigger is active.
+            */
+            inline bool isActive(void) const
+                { return this->isActive(NULL); }
+            bool isActive(BaseObject* triggerer = NULL) const; //!< Get whether the MultiTrigger is active for a given object.
 
             /**
@@ -161 +118 @@
             */
             inline void setSimultaneousTriggerers(int triggerers)
-                { if(triggerers >= 0 || triggerers == INF_s) this->maxNumSimultaneousTriggerers_ = triggerers; }
+                { if(triggerers >= 0 || triggerers == TriggerBase::INF_s) this->maxNumSimultaneousTriggerers_ = triggerers; }
             /**
             @brief Get the number of objects that are allowed to simultaneously trigger this MultiTriggger.
@@ -168 +125 @@
             inline int getSimultaneousTriggerers(void)
                 { return this->maxNumSimultaneousTriggerers_; }
-
-            /**
-            @brief Set the invert-mode of the MultiTrigger.
-            @param bInvert If true the MultiTrigger is set to invert.
-            */
-            inline void setInvert(bool bInvert)
-                { this->bInvertMode_ = bInvert; }
-            /**
-            @brief Get the invert-mode of the MultiTrigger.
-            @return Returns true if the MultiTrigger is set to invert.
-            */
-            inline bool getInvert(void) const
-                { return this->bInvertMode_; }
-
-            void setMode(const std::string& modeName); //!< Set the mode of the MultiTrigger.
-            /**
-            @brief Set the mode of the MultiTrigger.
-            @param mode The mode of the MultiTrigger.
-            */
-            inline void setMode(MultiTriggerMode::Value mode) //!< Get the mode of the MultiTrigger.
-                { this->mode_ = mode; }
-            const std::string& getModeString(void) const;
-            /**
-            @brief Get the mode of the MultiTrigger.
-            @return Returns and Enum for the mode of the MultiTrigger.
-            */
-            inline MultiTriggerMode::Value getMode() const
-                { return mode_; }
 
             /**
@@ -218 +147 @@
                 { if(target == NULL) return true; else return targetMask_.isIncluded(target->getIdentifier()); }
 
-            void addTrigger(MultiTrigger* trigger); //!< Adds a MultiTrigger as a sub-trigger to the trigger.
-            const MultiTrigger* getTrigger(unsigned int index) const; //!< Get the sub-trigger of this MultiTrigger at the given index.
-
         protected:
             virtual std::queue<MultiTriggerState*>* letTrigger(void); //!< This method is called by the MultiTrigger to get information about new trigger events that need to be looked at.
@@ -226 +152 @@
             void changeTriggered(BaseObject* originator = NULL); //!< This method can be called by any class inheriting from MultiTrigger to change it's triggered status for a specified originator.
 
-            bool isModeTriggered(BaseObject* triggerer = NULL); //!< Checks whetherx the MultiTrigger is triggered concerning it's sub-triggers.
+            bool isModeTriggered(BaseObject* triggerer = NULL); //!< Checks whether the MultiTrigger is triggered concerning it's children.
             bool isTriggered(BaseObject* triggerer = NULL); //!< Get whether the MultiTrigger is triggered for a given object.
 
@@ -232 +158 @@
             void broadcast(bool status); //!< Helper method. Broadcasts an Event for every object that is a target.
 
-            /**
-            @brief Set the number of activations the MultiTrigger can go through.
-            @param activations The number of activations. -1 denotes infinitely many activations.
-            */
-            inline void setActivations(int activations)
-                { if(activations >= 0 || activations == INF_s) this->remainingActivations_ = activations; }
-
             void addTargets(const std::string& targets); //!< Add some target to the MultiTrigger.
             void removeTargets(const std::string& targets); //!< Remove some target from the MultiTrigger.
 
             /**
-            @brief Adds the parent of a MultiTrigger.
-            @param parent A pointer to the parent MultiTrigger.
-            */
-            inline void addParentTrigger(MultiTrigger* parent)
-                { this->parentTrigger_ = parent; }
-
-            /**
             @brief Get the target mask used to identify the targets of this MultiTrigger.
             @return Returns the target mask.
@@ -257 +169 @@
 
         private:
-            static const int INF_s; //!< Magic number for infinity.
-            //! Magic strings for the mode.
-            static const std::string and_s;
-            static const std::string or_s;
-            static const std::string xor_s;
-
-            void subTriggerActivityChanged(BaseObject* originator); //!< This method is called by any sub-trigger to advertise changes in it's state to it's parent-trigger.
+            void childActivityChanged(BaseObject* originator); //!< This method is called by any child to advertise changes in it's state to it's parent.
 
             bool addState(MultiTriggerState* state); //!< Helper method. Adds a state to the state queue, where the state will wait to become active.
 
-            bool checkAnd(BaseObject* triggerer); //!< Checks whether the sub-triggers amount to true for the 'and' mode for a given object.
-            bool checkOr(BaseObject* triggerer); //!< Checks whether the sub-triggers amount to true for the 'or' mode for a given object.
-            bool checkXor(BaseObject* triggerer); //!< Checks whether the sub-triggers amount to true for the 'xor' mode for a given object.
+            bool checkAnd(BaseObject* triggerer); //!< Checks whether the children amount to true for the <em>and</em> mode for a given object.
+            bool checkOr(BaseObject* triggerer); //!< Checks whether the children amount to true for the <em>or</em> mode for a given object.
+            bool checkXor(BaseObject* triggerer); //!< Checks whether the children amount to true for the <em>xor</em> mode for a given object.
 
             /**
@@ -278 +184 @@
                 { return this->active_; }
 
-            bool bFirstTick_; //!< Bool to distinguish the first tick form all the following.
-
-            float delay_; //!< The delay that is imposed on all new trigger events.
-            bool bSwitch_; //!< Bool for the switch-mode, if true the MultiTrigger behaves like a switch.
-            bool bStayActive_; //!< Bool for the stay-active-mode, if true the MultiTrigger stays active after its last activation.;
-
-            int remainingActivations_; //!< The remaining activations of this MultiTrigger.
             int maxNumSimultaneousTriggerers_; //!< The maximum number of objects simultaneously trigggering this MultiTrigger.
 
-            bool bInvertMode_; //!< Bool for the invert-mode, if true the MultiTrigger is inverted.
-            MultiTriggerMode::Value mode_; //!< The mode of the MultiTrigger.
-
             bool bBroadcast_; //!< Bool for the broadcast-mode, if true all triggers go to all possible targets.
-
-            MultiTrigger* parentTrigger_; //!< The parent-trigger of theis MultiTrigger.
-            std::set<MultiTrigger*> subTriggers_; //!< The sub-triggers of this MultiTrigger.
 
             std::set<BaseObject*> active_; //!< The set of all objects the MultiTrigger is active for.

code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc

@@ -30 +30 @@
     @file MultiTriggerContainer.cc
     @brief Implementation of the MultiTriggerContainer class.
+    @ingroup MultiTrigger
 */
 
@@ -35 +36 @@
 
 #include "core/CoreIncludes.h"
+
 #include "worldentities/pawns/Pawn.h"
 

code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h

@@ -30 +30 @@
     @file MultiTriggerContainer.h
     @brief Definition of the MultiTriggerContainer class.
+    @ingroup MultiTrigger
 */
 
@@ -38 +39 @@
 
 #include "core/BaseObject.h"
+
 #include "interfaces/PlayerTrigger.h"
 
@@ -45 +47 @@
     /**
     @brief
-        This class is used by the MultiTrigger class to transport additional data via Events.
+        This class is used by the MultiTrigger class to transport additional data via @ref orxonox::Event "Events".
+
     @author
         Damian 'Mozork' Frick
+
+    @ingroup MultiTrigger
     */
     class _ObjectsExport MultiTriggerContainer : public BaseObject, public PlayerTrigger

code/trunk/src/modules/objects/triggers/Trigger.cc

@@ -26 +26 @@
  *
  */
+
+/**
+    @file Trigger.cc
+    @brief Implementation of the Trigger class.
+    @ingroup NormalTrigger
+*/
 
 #include "Trigger.h"
@@ -42 +48 @@
   CreateFactory(Trigger);
 
-  Trigger::Trigger(BaseObject* creator) : StaticEntity(creator)
+  Trigger::Trigger(BaseObject* creator) : TriggerBase(creator)
   {
     RegisterObject(Trigger);
 
-    this->mode_ = TriggerMode::EventTriggerAND;
-
-    this->bFirstTick_ = true;
     this->bActive_ = false;
     this->bTriggered_ = false;
     this->latestState_ = 0x0;
 
-    this->bInvertMode_ = false;
-    this->bSwitch_ = false;
-    this->bStayActive_ = false;
-    this->delay_ = 0.0f;
     this->remainingTime_ = 0.0f;
     this->timeSinceLastEvent_ = 0.0f;
-    this->remainingActivations_ = -1;
 
 //    this->bUpdating_ = false;
@@ -82 +80 @@
   {
     SUPER(Trigger, XMLPort, xmlelement, mode);
-
-    XMLPortParam(Trigger, "delay",       setDelay,       getDelay,       xmlelement, mode).defaultValues(0.0f);
-    XMLPortParam(Trigger, "switch",      setSwitch,      getSwitch,      xmlelement, mode).defaultValues(false);
-    XMLPortParam(Trigger, "stayactive",  setStayActive,  getStayActive,  xmlelement, mode).defaultValues(false);
-    XMLPortParam(Trigger, "activations", setActivations, getActivations, xmlelement, mode).defaultValues(-1);
-    XMLPortParam(Trigger, "invert",      setInvert,      getInvert,      xmlelement, mode).defaultValues(false);
-    XMLPortParamTemplate(Trigger, "mode", setMode, getModeString, xmlelement, mode, const std::string&).defaultValues("or");
-
-    XMLPortObject(Trigger, Trigger, "", addTrigger, getTrigger, xmlelement, mode);
   }
 
   void Trigger::tick(float dt)
   {
-    if (this->bFirstTick_)
+    if(this->bFirstTick_)
     {
       this->bFirstTick_ = false;
@@ -107 +96 @@
     SUPER(Trigger, tick, dt);
 
-    bool newTriggered = this->isTriggered() ^ this->bInvertMode_;
+    bool newTriggered = this->isTriggered() ^ this->getInvert();
 
     // check if new triggering event is really new
@@ -121 +110 @@
       {
         this->latestState_ &= 0xFE; // set trigger bit to 0
-        if (!this->bSwitch_)
+        if (!this->getSwitch())
           this->switchState();
       }
@@ -145 +134 @@
         this->remainingTime_ = this->stateChanges_.front().first;
       else
-        this->timeSinceLastEvent_ = this->delay_;
+        this->timeSinceLastEvent_ = this->getDelay();
     }
 
@@ -197 +186 @@
   bool Trigger::checkAnd()
   {
-    std::set<Trigger*>::iterator it;
+    std::set<TriggerBase*>::iterator it;
     for(it = this->children_.begin(); it != this->children_.end(); ++it)
     {
@@ -208 +197 @@
   bool Trigger::checkOr()
   {
-    std::set<Trigger*>::iterator it;
+    std::set<TriggerBase*>::iterator it;
     for(it = this->children_.begin(); it != this->children_.end(); ++it)
     {
@@ -219 +208 @@
   bool Trigger::checkXor()
   {
-    std::set<Trigger*>::iterator it;
+    std::set<TriggerBase*>::iterator it;
     bool test = false;
     for(it = this->children_.begin(); it != this->children_.end(); ++it)
@@ -233 +222 @@
   bool Trigger::switchState()
   {
-    if (( (this->latestState_ & 2) && this->bStayActive_ && (this->remainingActivations_ <= 0))
-     || (!(this->latestState_ & 2)                       && (this->remainingActivations_ == 0)))
+    if (( (this->latestState_ & 2) && this->getStayActive() && (this->remainingActivations_ <= 0))
+     || (!(this->latestState_ & 2)                          && (this->remainingActivations_ == 0)))
       return false;
     else
@@ -261 +250 @@
   }
 
-  void Trigger::setDelay(float delay)
-  {
-    this->delay_ = delay;
-    this->timeSinceLastEvent_ = delay;
-  }
-
-  void Trigger::setMode(const std::string& modeName)
-  {
-    if (modeName == "and")
-      this->setMode(TriggerMode::EventTriggerAND);
-    else if (modeName == "or")
-      this->setMode(TriggerMode::EventTriggerOR);
-    else if (modeName == "xor")
-      this->setMode(TriggerMode::EventTriggerXOR);
-  }
-
-  std::string Trigger::getModeString() const
-  {
-    if (this->mode_ == TriggerMode::EventTriggerAND)
-      return "and";
-    else if (this->mode_ == TriggerMode::EventTriggerOR)
-      return "or";
-    else if (this->mode_ == TriggerMode::EventTriggerXOR)
-      return "xor";
-    else
-      return "and";
-  }
-
-  void Trigger::addTrigger(Trigger* trigger)
-  {
-    if (this != trigger)
-      this->children_.insert(trigger);
-  }
-
-  const Trigger* Trigger::getTrigger(unsigned int index) const
-  {
-    if (this->children_.size() <= index)
-      return NULL;
-
-    std::set<Trigger*>::const_iterator it;
-    it = this->children_.begin();
-
-    for (unsigned int i = 0; i != index; ++i)
-      ++it;
-
-    return (*it);
+  void Trigger::delayChanged(void)
+  {
+    this->timeSinceLastEvent_ = this->getDelay();
   }
 

code/trunk/src/modules/objects/triggers/Trigger.h

@@ -27 +27 @@
  */
 
+/**
+    @file Trigger.h
+    @brief Definition of the Trigger class.
+    @ingroup NormalTrigger
+*/
+
 #ifndef _Trigger_H__
 #define _Trigger_H__
@@ -36 +42 @@
 
 #include "tools/BillboardSet.h"
-#include "tools/interfaces/Tickable.h"
-#include "worldentities/StaticEntity.h"
+
+#include "TriggerBase.h"
 
 namespace orxonox
 {
-  namespace TriggerMode
-  {
-    enum Value
-    {
-      EventTriggerAND,
-      EventTriggerOR,
-      EventTriggerXOR,
-    };
-  }
 
-  class _ObjectsExport Trigger : public StaticEntity, public Tickable
+  /**
+  @brief
+    
+  @author
+    Benjamin Knecht
+
+  @ingroup NormalTrigger
+  */
+  class _ObjectsExport Trigger : public TriggerBase
   {
     public:
@@ -60 +65 @@
       virtual void tick(float dt);
 
-      inline bool isActive() const
-        { return bActive_; }
-
-      void addTrigger(Trigger* trigger);
-      const Trigger* getTrigger(unsigned int index) const;
-
-      void setMode(const std::string& modeName);
-      inline void setMode(TriggerMode::Value mode)
-        { this->mode_ = mode; }
-      inline TriggerMode::Value getMode() const
-        { return mode_; }
-
-      inline void setInvert(bool bInvert)
-        { this->bInvertMode_ = bInvert; }
-      inline bool getInvert() const
-        { return this->bInvertMode_; }
-
-      inline void setSwitch(bool bSwitch)
-        { this->bSwitch_ = bSwitch; }
-      inline bool getSwitch() const
-        { return this->bSwitch_; }
-
-      inline void setStayActive(bool bStayActive)
-        { this->bStayActive_ = bStayActive; }
-      inline bool getStayActive() const
-        { return this->bStayActive_; }
-
-      inline void setActivations(int activations)
-        { this->remainingActivations_ = activations; }
-      inline int getActivations() const
-        { return this->remainingActivations_; }
+      inline bool isActive(void) const
+        { return this->bActive_; }
 
       inline void setVisible(bool visibility)
         { this->debugBillboard_.setVisible(visibility); }
 
-      void setDelay(float delay);
-      inline float getDelay() const
-        { return this->delay_; }
+      void delayChanged(void);
 
       bool switchState();
@@ -115 +89 @@
       void setBillboardColour(const ColourValue& colour);
       void storeState();
-      std::string getModeString() const;
 
       bool bActive_;
       bool bTriggered_;
-      bool bFirstTick_;
-
-      TriggerMode::Value mode_;
-      bool bInvertMode_;
-      bool bSwitch_;
-      bool bStayActive_;
-      float delay_;
-      int remainingActivations_;
 
       char latestState_;
@@ -135 +100 @@
       BillboardSet debugBillboard_;
 
-      std::set<Trigger*> children_;
       std::queue<std::pair<float, char> > stateChanges_;
   };