Changeset 2071

Timestamp:

Oct 31, 2008, 12:56:29 AM (16 years ago)

Author:

landauf

Message:

• fixed another bug in Trigger
• added EventTrigger which listens on "trigger" events

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/worldentities/triggers/DistanceTrigger.cc (modified) (2 diffs)
• objects/worldentities/triggers/DistanceTrigger.h (modified) (3 diffs)
• objects/worldentities/triggers/EventTrigger.cc (added)
• objects/worldentities/triggers/EventTrigger.h (added)
• objects/worldentities/triggers/Trigger.cc (modified) (2 diffs)
• objects/worldentities/triggers/Trigger.h (modified) (1 diff)

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -68 +68 @@
   objects/worldentities/triggers/Trigger.cc
   objects/worldentities/triggers/DistanceTrigger.cc
+  objects/worldentities/triggers/EventTrigger.cc
 
   objects/worldentities/pawns/Spectator.cc

code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -30 +30 @@
 #include "DistanceTrigger.h"
 
+#include <OgreNode.h>
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
   CreateFactory(DistanceTrigger);
 
@@ -82 +84 @@
     Identifier* targetId = ClassByString(targets);
     if (!targetId)
+    {
+        COUT(1) << "Error: \"" << targets << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << std::endl;
         return;
+    }
 
     this->targetMask_.include(targetId);

code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h

@@ -34 +34 @@
 #include <set>
 
-#include <OgreNode.h>
-
 #include "core/ClassTreeMask.h"
 #include "core/BaseObject.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
   class _OrxonoxExport DistanceTrigger : public Trigger
   {
     public:
       DistanceTrigger(BaseObject* creator);
-      ~DistanceTrigger();
+      virtual ~DistanceTrigger();
 
       virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
@@ -62 +60 @@
 
     protected:
-      bool isTriggered(TriggerMode mode);
+      virtual bool isTriggered(TriggerMode mode);
 
     private:
@@ -69 +67 @@
       float distance_;
   };
-
 }
 
-#endif /* _Trigger_H__ */
+#endif /* _DistanceTrigger_H__ */

code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -58 +58 @@
     this->bSwitch_ = false;
     this->bStayActive_ = false;
-    this->delay_ = 0.0;
+    this->delay_ = 0.0f;
+    this->remainingTime_ = 0.0f;
+    this->timeSinceLastEvent_ = 0.0f;
     this->remainingActivations_ = -1;
 
@@ -98 +100 @@
       this->fireEvent(false);
     }
+
+    // Check if the object is active (this is NOT Trigger::isActive()!)
+    if (!this->BaseObject::isActive())
+        return;
 
     bool newTriggered = this->isTriggered() ^ this->bInvertMode_;

code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h

@@ -52 +52 @@
     public:
       Trigger(BaseObject* creator);
-      ~Trigger();
+      virtual ~Trigger();
 
       virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);