Changeset 2069 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 30, 2008, 11:58:31 PM (16 years ago)

Author:

landauf

Message:

fixed a bug in the event system
fixed a bug in Trigger and tweaked some features

Location:

code/branches/objecthierarchy/src/orxonox/objects/worldentities

Files:

• BlinkingBillboard.cc (modified) (1 diff)
• triggers/DistanceTrigger.cc (modified) (3 diffs)
• triggers/Trigger.cc (modified) (3 diffs)
• triggers/Trigger.h (modified) (3 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/BlinkingBillboard.cc

@@ -75 +75 @@
     void BlinkingBillboard::tick(float dt)
     {
-        if (Core::isMaster())
+        if (Core::isMaster() && this->isActive())
         {
             this->time_ += dt;

code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -54 +54 @@
 
     XMLPortParam(DistanceTrigger, "distance", setDistance, getDistance, xmlelement, mode).defaultValues(100.0f);
-    XMLPortParamLoadOnly(DistanceTrigger, "target", addTargets, xmlelement, mode);
+    XMLPortParamLoadOnly(DistanceTrigger, "target", addTargets, xmlelement, mode).defaultValues("ControllableEntity");
   }
 
@@ -81 +81 @@
   {
     Identifier* targetId = ClassByString(targets);
-    targetMask_.include(targetId);
+    if (!targetId)
+        return;
+
+    this->targetMask_.include(targetId);
+
     // trigger shouldn't react on itself or other triggers
-    targetMask_.exclude(Class(Trigger), true);
+    this->targetMask_.exclude(Class(Trigger), true);
 
+    // we only want WorldEntities
+    ClassTreeMask WEMask;
+    WEMask.include(Class(WorldEntity));
+    this->targetMask_ *= WEMask;
   }
 
@@ -90 +98 @@
   {
     Identifier* targetId = ClassByString(targets);
-    targetMask_.exclude(targetId);
+    this->targetMask_.exclude(targetId);
   }
 
   bool DistanceTrigger::checkDistance()
   {
-    // Iterate through all WorldEntities
-    for (Iterator<WorldEntity> it = ObjectList<WorldEntity>::begin(); it; ++it)
+    // Iterate through all objects
+    for (ClassTreeMaskObjectIterator it = this->targetMask_.begin(); it != this->targetMask_.end(); ++it)
     {
-      // check if WorldEntity is a target
-      if (targetMask_.isIncluded(it->getIdentifier()))
-      {
-        Vector3 distanceVec = it->getNode()->getWorldPosition() - this->getNode()->getWorldPosition();
-        if (distanceVec.length() < this->distance_)
-          return true;
-      }
+      WorldEntity* entity = dynamic_cast<WorldEntity*>(*it);
+      if (!entity)
+        continue;
+
+      Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
+      if (distanceVec.length() < this->distance_)
+        return true;
     }
     return false;

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

@@ -50 +50 @@
     this->mode_ = TM_EventTriggerAND;
 
+    this->bFirstTick_ = true;
     this->bActive_ = false;
     this->bTriggered_ = false;
@@ -92 +93 @@
   void Trigger::tick(float dt)
   {
-
-    bool newTriggered = this->isTriggered();
+    if (this->bFirstTick_)
+    {
+      this->bFirstTick_ = false;
+      this->fireEvent(false);
+    }
+
+    bool newTriggered = this->isTriggered() ^ this->bInvertMode_;
 
     // check if new triggering event is really new
@@ -173 +179 @@
 //      this->bUpdating_ = false;
 
-      if (this->bInvertMode_)
-        return !returnval;
-      else
-        return returnval;
+      return returnval;
     }
     return true;

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

@@ -35 +35 @@
 #include "OrxonoxPrereqs.h"
 
+#include "objects/Tickable.h"
 #include "objects/worldentities/PositionableEntity.h"
 #include "tools/BillboardSet.h"
@@ -47 +48 @@
   };
 
-  class _OrxonoxExport Trigger : public PositionableEntity
+  class _OrxonoxExport Trigger : public PositionableEntity, public Tickable
   {
     public:
@@ -111 +112 @@
       bool bActive_;
       bool bTriggered_;
+      bool bFirstTick_;
 
       TriggerMode mode_;