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

Timestamp:

Oct 28, 2008, 8:37:09 PM (17 years ago)

Author:

landauf

Message:

some changes in Trigger and DistanceTrigger

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (3 diffs)

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

@@ -38 +38 @@
 #include "tools/BillboardSet.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
   enum TriggerMode
   {
@@ -59 +59 @@
         { return bActive_; }
 
-      void addTrigger(Trigger* trig);
+      void addTrigger(Trigger* trigger);
       const Trigger* getTrigger(unsigned int index) const;
 
+      void setMode(const std::string& modeName);
+      inline void setMode(TriggerMode mode)
+        { this->mode_ = mode; }
       inline TriggerMode getMode() const
         { return mode_; }
-      inline void setMode(TriggerMode mode)
-        { this->mode_ = mode; }
-      void setMode(const std::string& modeName);
 
-      inline void setInvert(int invert)
-        { bInvertMode_ = invert; }
-      inline void setStayOn(int stayOn)
-        { this->bStayOn_ = (stayOn == 1) ? true : false; }
+      inline void setInvert(bool bInvert)
+        { this->bInvertMode_ = bInvert; }
+      inline bool getInvert() const
+        { return this->bInvertMode_; }
+
+      inline void setSwitch(bool bSwitch)
+        { this->bSwitch_ = bSwitch; }
+      inline bool getSwitch() const
+        { return this->bSwitch_; }
+
+      inline void setStayActive(bool bStayActive)
+        { this->bStayActive_ = bStayActive; }
+      inline bool getStayActive() const
+        { return this->bStayActive_; }
+
       inline void setActivations(int activations)
         { this->remainingActivations_ = activations; }
+      inline int getActivations() const
+        { return this->remainingActivations_; }
+
       void setDelay(float delay);
+      inline float getDelay() const
+        { return this->delay_; }
+
       bool switchState();
 
       static void debugFlares(bool bVisible);
       virtual void changedVisibility();
-
-    private:
-      void init();
-      bool checkAnd();
-      bool checkOr();
-      bool checkXor();
-      void setBillboardColour(ColourValue colour);
-      void storeState();
 
     protected:
@@ -93 +102 @@
 
     private:
-      std::set<Trigger*> children_;
-      std::queue<std::pair<float,char> > stateChanges_;
+      bool checkAnd();
+      bool checkOr();
+      bool checkXor();
+      void setBillboardColour(const ColourValue& colour);
+      void storeState();
+      std::string getModeString() const;
+
+      bool bActive_;
+      bool bTriggered_;
+
+      TriggerMode mode_;
+      bool bInvertMode_;
+      bool bSwitch_;
+      bool bStayActive_;
+      float delay_;
+      int remainingActivations_;
+
+      char latestState_;
       float remainingTime_;
       float timeSinceLastEvent_;
-      TriggerMode mode_;
-      bool bActive_;
-      bool bInvertMode_;
-      bool bTriggered_;
-      bool bUpdating_;
+
+//      bool bUpdating_;
       BillboardSet debugBillboard_;
-      float delay_;
-      int remainingActivations_;
-      bool bStayOn_;
-      char latestState_;
+
+      std::set<Trigger*> children_;
+      std::queue<std::pair<float, char> > stateChanges_;
   };