Changeset 1550

Timestamp:

Jun 6, 2008, 12:03:56 AM (16 years ago)

Author:

bknecht

Message:

Trigger is now represented by a flare when Debug is on also XML support is enabled (not tested yet though)

Location:

code/branches/script_trigger/src/orxonox/objects

Files:

• Trigger.cc (modified) (5 diffs)
• Trigger.h (modified) (4 diffs)

code/branches/script_trigger/src/orxonox/objects/Trigger.cc

@@ -29 +29 @@
 #include "Trigger.h"
 
+#include "core/Debug.h"
+
 #include "core/CoreIncludes.h"
 
@@ -40 +42 @@
 
     targetMask_.exclude(Class(BaseObject));
+
+    if (getSoftDebugLevel() >= ORX_DEBUG)
+    {
+      debugBillboard_.setBillboardSet("Examples/Flare", ColourValue(1.0, 0.0, 0.0), 1);
+      this->getNode()->attachObject(debugBillboard_.getBillboardSet());
+    }
   }
 
@@ -85 +93 @@
   }
 
+  void Trigger::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+  {
+    WorldEntity::XMLPort(xmlelement, mode);
+  }
+
   void Trigger::addTrigger(Trigger* trig)
   {
     if (this != trig)
-      this->triggers_.insert(trig);
+      this->subTriggers_.insert(trig);
   }
 
@@ -99 +112 @@
   }
 
+  void Trigger::removeTargets(std::string targets)
+  {
+    Identifier* targetId = ID(targets);
+    targetMask_.exclude(targetId);
+  }
+
   bool Trigger::checkAnd()
   {
     std::set<Trigger*>::iterator it;
-    for(it = this->triggers_.begin(); it != this->triggers_.end(); it++)
+    for(it = this->subTriggers_.begin(); it != this->subTriggers_.end(); it++)
     {
       if(!((*it)->isTriggered()))
@@ -113 +132 @@
   {
     std::set<Trigger*>::iterator it;
-    for(it = this->triggers_.begin(); it != this->triggers_.end(); it++)
+    for(it = this->subTriggers_.begin(); it != this->subTriggers_.end(); it++)
     {
       if((*it)->isTriggered())

code/branches/script_trigger/src/orxonox/objects/Trigger.h

@@ -37 +37 @@
 #include "core/BaseObject.h"
 #include "core/ClassTreeMask.h"
+#include "../tools/BillboardSet.h"
 
 namespace orxonox {
@@ -54 +55 @@
     public:
       Trigger();
+      Trigger(bool active) { bActive_ = active; }
       ~Trigger();
 
@@ -60 +62 @@
       void addTrigger(Trigger* trig);
       void addTargets(std::string targets);
+      void removeTargets(std::string targets);
+      virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
       inline TriggerMode getMode() { return mode_; }
       inline void setMode(TriggerMode mode) { this->mode_ = mode; }
-      inline void tick(float dt) { this->actualTime_ += dt; }
+      inline void tick(float dt) { if(bActive_) this->actualTime_ += dt; }
+      inline void reset(float time) { this->actualTime_ = 0; this->triggingTime_ = time; }
+      inline void reset() { reset(triggingTime_); }
 
     private:
@@ -71 +77 @@
 
     private:
-      std::set<Trigger*> triggers_;
+      std::set<Trigger*> subTriggers_;
       TriggerMode mode_;
       float triggingTime_;
       float actualTime_;
       float radius_;
+      bool bActive_;
       ClassTreeMask targetMask_;
+      BillboardSet debugBillboard_;
   };