Changeset 2905

Timestamp:

Apr 6, 2009, 5:25:22 PM (15 years ago)

Author:

Aurelian

Message:

My first version with working triggers in a row…

Location:

code/branches/gametypes/src/orxonox/objects

Files:

• gametypes/Asteroids.cc (added)
• gametypes/Asteroids.h (added)
• worldentities/triggers/CheckPoint.cc (added)
• worldentities/triggers/CheckPoint.h (added)
• worldentities/triggers/Trigger.cc (modified) (3 diffs)
• worldentities/triggers/Trigger.h (modified) (1 diff)

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -102 +102 @@
     {
       this->bFirstTick_ = false;
-      this->fireEvent(false);
+      this->triggered(false);
     }
 
@@ -144 +144 @@
       this->bTriggered_ = (newState & 0x1);
       this->bActive_ = newState & 2;
-      this->fireEvent(this->bActive_);
+      this->triggered(this->bActive_);
       this->stateChanges_.pop();
       if (this->stateChanges_.size() != 0)
@@ -160 +160 @@
     else
       this->setBillboardColour(ColourValue(1.0, 0.0, 0.0));
+  }
+
+  void Trigger::triggered(bool bIsTriggered)
+  {
+    this->fireEvent(bIsTriggered);
   }
 

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

@@ -101 +101 @@
       inline bool isTriggered() { return this->isTriggered(this->mode_); }
       virtual bool isTriggered(TriggerMode mode);
+      virtual void triggered(bool bIsTriggered);
 
     private: