Changeset 2261 for code/trunk/src/orxonox/objects/worldentities

Timestamp:

Nov 25, 2008, 11:56:40 PM (16 years ago)

Author:

landauf

Message:

merged questsystem2 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (5 diffs, 1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (3 diffs, 1 prop)
• src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc (copied) (copied from code/branches/questsystem2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc)
• src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (copied) (copied from code/branches/questsystem2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)

code/trunk/src/orxonox/objects/worldentities/triggers/CMakeLists.txt

@@ -3 +3 @@
   DistanceTrigger.cc
   EventTrigger.cc
+  PlayerTrigger.cc
 )
 

code/trunk/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;

code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h

@@ -30 +30 @@
 #define _DistanceTrigger_H__
 
-#include "Trigger.h"
+#include "PlayerTrigger.h"
 
 #include <set>
@@ -37 +37 @@
 #include "core/BaseObject.h"
 
+#include "orxonox/objects/worldentities/ControllableEntity.h"
+
 namespace orxonox
 {
-  class _OrxonoxExport DistanceTrigger : public Trigger
+  class _OrxonoxExport DistanceTrigger : public PlayerTrigger
   {
     public:
@@ -66 +68 @@
       std::set<Ogre::Node*> targetSet_;
       float distance_;
+      
   };
 }