Changeset 2530 for code/branches/bugger/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

Timestamp:

Dec 23, 2008, 10:40:38 PM (16 years ago)

Author:

rgrieder

Message:

merged revisions 2260 - 2508 from trunk to buggy.
I'm sorry that I have to commit every merge. But otherwise I get tons of conflicts I have to solve ten times over.
Note: did not merge deletion of src/util/testing, tortoise wasn't very friendly with that.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (5 diffs, 1 prop)

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

@@ -35 +35 @@
 #include "core/XMLPort.h"
 
+#include "orxonox/objects/worldentities/ControllableEntity.h"
+
 namespace orxonox
 {
   CreateFactory(DistanceTrigger);
 
-  DistanceTrigger::DistanceTrigger(BaseObject* creator) : Trigger(creator)
+  DistanceTrigger::DistanceTrigger(BaseObject* creator) : PlayerTrigger(creator)
   {
     RegisterObject(DistanceTrigger);
@@ -45 +47 @@
     this->distance_ = 100;
     this->targetMask_.exclude(Class(BaseObject));
+    this->setForPlayer(false); //!< Normally hasn't just ControllableEntities as targets.
   }
 
@@ -83 +86 @@
   {
     Identifier* targetId = ClassByString(targets);
+    
+    //! Checks whether the target is (or is derived from) a ControllableEntity.
+    Identifier* controllableEntityId = Class(ControllableEntity);
+    if(targetId->isA(controllableEntityId))
+    {
+      this->setForPlayer(true);
+    }
+    
     if (!targetId)
     {
@@ -117 +128 @@
       Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
       if (distanceVec.length() < this->distance_)
+      {
+        
+        //! If the target is a player (resp. is a, or is derived from a, ControllableEntity) the triggeringPlayer is set to the target entity.
+        if(this->isForPlayer())
+        {
+          ControllableEntity* player = dynamic_cast<ControllableEntity*>(entity);
+          this->setTriggeringPlayer(player);
+        }
+        
         return true;
+      }
     }
     return false;
-
   }
 
@@ -126 +146 @@
   {
     if (Trigger::isTriggered(mode))
+    {
       return checkDistance();
+    }
     else
       return false;