Changeset 1851 for code/branches/script_trigger

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.

Location:

code/branches/script_trigger

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/core/LuaBind.cc (added)
• src/core/LuaBind.h (added)
• src/core/LuaBind_clean.h (added)
• src/core/Script.cc (deleted)
• src/core/Script.h (deleted)
• src/core/Script_clean.h (deleted)
• src/orxonox/objects/DistanceTrigger.h (modified) (1 diff)
• src/orxonox/objects/Trigger.cc (modified) (9 diffs)
• src/orxonox/objects/Trigger.h (modified) (4 diffs)

code/branches/script_trigger/bin/levels/sample.oxw

@@ -38 +38 @@
 <Model position="-200,1000,500" scale="10" mesh="hoover_turbine.mesh" yawpitchroll="-90,-90,0" /-->
 
-<DistanceTrigger position="100,0,0" scale="2" distance="80" delay="10.0" target="SpaceShip"/>
+<DistanceTrigger position="100,0,0" scale="2" distance="80" activations="2" target="SpaceShip"/>
 
 

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

@@ -52 +52 @@
       void setDistance(float dist);
       virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+      bool checkDistance();
+
+    protected:
       bool isTriggered(TriggerMode mode);
-      bool checkDistance();
 
     private:

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

@@ -53 +53 @@
     bTriggered_ = false;
     bUpdating_ = false;
+    remainingActivations_ = -1;
+    bStayTriggered_ = false;
+    latestState_ = 0x0;
 
     debugBillboard_.setBillboardSet("Examples/Flare", ColourValue(1.0, 0.0, 0.0), 1);
@@ -79 +82 @@
   {
 
-    bool newTriggered = this->isTriggered();
-
-
-    // check if new triggering event is really new
-    if(this->latestState_ % 2 != newTriggered)
-    {
-      // create new state
-      if(newTriggered)
+    bool newTriggered;
+    if (latestState_ % 2 == 1 && this->bStayTriggered_)
+      newTriggered = true;
+    else
+      newTriggered = this->isTriggered();
+
+
+      // check if new triggering event is really new
+      if(this->latestState_ % 2 != newTriggered)
       {
-        latestState_ |= 0x1; // set trigger bit
-        latestState_ ^= 0x10; // toggle state bit
+        // create new state
+        if(newTriggered)
+        {
+          latestState_ |= 1; // set trigger bit
+          this->switchState();
+        }
+        else
+        {
+          latestState_ &= 0xFE; // set trigger bit
+          this->storeState();
+        }
       }
-      else
-      {
-        latestState_ &= 0x11111110; // set trigger bit
-      }
-
-      // put state change into queue
-      this->stateChanges_.push(std::pair<float,char>(timeSinceLastEvent_, latestState_));
-      // reset time since last event
-      timeSinceLastEvent_ = 0.0;
-
-      if(this->stateChanges_.size() == 1)
-        remainingTime_ = stateChanges_.front().first;
-    }
 
     if(remainingTime_ > 0.0)
@@ -118 +118 @@
       char newState = stateChanges_.front().second;
       bTriggered_ = newState % 2;
-      bActive_ = newState>>1 % 2;
+      bActive_ = newState & 2;
       this->stateChanges_.pop();
       if(stateChanges_.size() != 0)
@@ -144 +144 @@
   }
 
+  void Trigger::storeState()
+  {
+    // put state change into queue
+    this->stateChanges_.push(std::pair<float,char>(timeSinceLastEvent_, latestState_));
+    // reset time since last event
+    timeSinceLastEvent_ = 0.0;
+
+    if(this->stateChanges_.size() == 1)
+      remainingTime_ = stateChanges_.front().first;
+  }
+
   bool Trigger::isTriggered(TriggerMode mode)
   {
@@ -186 +197 @@
 
     XMLPortParamLoadOnly(Trigger, "delay", setDelay, xmlelement, mode);
+    XMLPortParamLoadOnly(Trigger, "stayTriggered", setStayTriggered, xmlelement, mode);
+    XMLPortParamLoadOnly(Trigger, "activations", setActivations, xmlelement, mode);
 
     this->init();
@@ -198 +211 @@
   bool Trigger::switchState()
   {
-    latestState_ ^= 0x10; // toggle state bit
-    // put state change into queue
-    this->stateChanges_.push(std::pair<float,char>(timeSinceLastEvent_, latestState_));
-    // reset time since last event
-    timeSinceLastEvent_ = 0.0;
-
-    if(this->stateChanges_.size() == 1)
-      remainingTime_ = stateChanges_.front().first;
+    if ( remainingActivations_ == -1 || this->latestState_ & 2 || remainingActivations_ > 0)
+    {
+      this->latestState_ ^= 2; // toggle state bit
+      // increase activation count
+      if (this->latestState_ & 2) remainingActivations_--;
+      this->storeState();
+
+      return true;
+    }
+    return false;
   }
 
@@ -214 +229 @@
     for(it = this->children_.begin(); it != this->children_.end(); it++)
     {
-      if(!((*it)->isTriggered()))
+      if(!((*it)->isActive()))
         return false;
     }
@@ -225 +240 @@
     for(it = this->children_.begin(); it != this->children_.end(); it++)
     {
-      if((*it)->isTriggered())
+      if((*it)->isActive())
         return true;
     }
@@ -237 +252 @@
     for(it = this->children_.begin(); it != this->children_.end(); it++)
     {
-      if(test && (*it)->isTriggered())
+      if(test && (*it)->isActive())
         return false;
-      if((*it)->isTriggered())
+      if((*it)->isActive())
         test = true;
     }

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_;
   };