Changeset 1541 for code/branches/script_trigger/src/orxonox/objects/Trigger.h

Timestamp:

Jun 5, 2008, 10:59:49 AM (16 years ago)

Author:

bknecht

Message:

Some updates on the trigger:

• Reacts on defined sub classes of WorldEntity
• List of other triggers (no check on them, yet)
• tick function for delay triggers (have to add a startCounting() function)

etc.

File:

• code/branches/script_trigger/src/orxonox/objects/Trigger.h (modified) (3 diffs)

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

@@ -30 +30 @@
 #define _Trigger_H__
 
-#include <list>
+#include <set>
 
 #include "OrxonoxPrereqs.h"
@@ -36 +36 @@
 #include "WorldEntity.h"
 #include "core/BaseObject.h"
+#include "core/ClassTreeMask.h"
 
 namespace orxonox {
@@ -56 +57 @@
 
       bool isTriggered();
+      bool isTriggered(TriggerMode mode);
       void addTrigger(Trigger* trig);
+      void addTargets(std::string targets);
       inline TriggerMode getMode() { return mode_; }
       inline void setMode(TriggerMode mode) { this->mode_ = mode; }
+      inline void tick(float dt) { this->actualTime_ += dt; }
+
+    private:
+      bool checkAnd();
+      bool checkOr();
+      bool checkDelay();
+      bool checkDistance();
 
     private:
       std::set<Trigger*> triggers_;
       TriggerMode mode_;
-
+      float triggingTime_;
+      float actualTime_;
+      float radius_;
+      ClassTreeMask targetMask_;
   };