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

Timestamp:

Sep 28, 2008, 5:15:45 PM (16 years ago)

Author:

bknecht

Message:

LuaBind ↔Script confusion solved (thx Reto for noticing)\n Solved 4 state problem, however a Trigger may return an one tick old state instead of the newest one. This can probably be solved in another way though.

File:

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

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

@@ -54 +54 @@
       ~Trigger();
 
-      inline bool isTriggered() { return this->isTriggered(this->mode_); }
-      virtual bool isTriggered(TriggerMode mode);
+      inline bool isActive() { return bActive_; }
       void addTrigger(Trigger* trig);
       void setVisibility(bool bVisible);
@@ -63 +62 @@
       inline TriggerMode getMode() { return mode_; }
       inline void setMode(TriggerMode mode) { this->mode_ = mode; }
+      inline void setStayTriggered(float stayTriggered) { if (stayTriggered == 1.0) this->bStayTriggered_ = true; else this->bStayTriggered_ = false; }
+      inline void setActivations(int activations) { this->remainingActivations_ = activations; }
       void tick(float dt);
 
@@ -71 +72 @@
       bool checkXor();
       void setBillboardColour(ColourValue colour);
+      void storeState();
+
+    protected:
+      inline bool isTriggered() { return this->isTriggered(this->mode_); }
+      virtual bool isTriggered(TriggerMode mode);
 
     private:
@@ -84 +90 @@
       BillboardSet debugBillboard_;
       float delay_;
+      int remainingActivations_;
+      bool bStayTriggered_;
       char latestState_;
   };