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

Timestamp:

Aug 26, 2008, 5:03:24 PM (16 years ago)

Author:

bknecht

Message:

Only some minor changes in the Trigger. I need to acclimatize to coding first…

File:

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

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

@@ -43 +43 @@
   enum TriggerMode
   {
-    TM_EventTriggerAnd,
-    TM_EventTriggerOr,
-    TM_DelayTrigger,
-    TM_DistanceTrigger,
-    TM_DistanceEventTriggerAnd,
-    TM_DistanceEventTriggerOr,
+    TM_EventTriggerAND,
+    TM_EventTriggerOR,
+    TM_EventTriggerXOR,
+    TM_EventTriggerNOT
   };
 
@@ -55 +53 @@
     public:
       Trigger();
-      Trigger(bool active) { bActive_ = active; }
       ~Trigger();
 
@@ -63 +60 @@
       void addTargets(std::string targets);
       void removeTargets(std::string targets);
+      void setVisibility(int bVisible);
       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) { if(bActive_) this->actualTime_ += dt; }
+      void tick(float dt);
       inline void reset(float time) { this->actualTime_ = 0; this->triggingTime_ = time; }
       inline void reset() { reset(triggingTime_); }
@@ -73 +71 @@
       bool checkAnd();
       bool checkOr();
-      bool checkDelay();
-      bool checkDistance();
+      bool checkXor();
+      bool checkNot();
 
     private:
-      std::set<Trigger*> subTriggers_;
+      std::set<Trigger*> children_;
       TriggerMode mode_;
       float triggingTime_;