Changeset 6906 for code/trunk

Timestamp:

May 17, 2010, 1:22:26 PM (15 years ago)

Author:

dafrick

Message:

Added DistanceTriggerBeacon, which is a device which can be attached to objects to trigger a DistanceTrigger (both the (single) DistanceTrigger and DistanceMultiTrigger) based on the name of the DistanceTri$
Also some minor adjustements in QuestEffectBeacon: Removed some output and adjusted the outputlevel of some other output.
And started working on PickupInventory again (though no significant changes yet).

Location:

code/trunk

Files:

• data/gui/scripts/PickupInventory.lua (modified) (2 diffs)
• src/modules/objects/ObjectsPrereqs.h (modified) (1 diff)
• src/modules/objects/triggers/CMakeLists.txt (modified) (1 diff)
• src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) (5 diffs)
• src/modules/objects/triggers/DistanceMultiTrigger.h (modified) (3 diffs)
• src/modules/objects/triggers/DistanceTrigger.cc (modified) (6 diffs)
• src/modules/objects/triggers/DistanceTrigger.h (modified) (2 diffs)
• src/modules/objects/triggers/DistanceTriggerBeacon.cc (added)
• src/modules/objects/triggers/DistanceTriggerBeacon.h (added)
• src/modules/questsystem/QuestEffectBeacon.cc (modified) (2 diffs)

code/trunk/data/gui/scripts/PickupInventory.lua

@@ -74 +74 @@
 
     local name = "orxonox/PickupInventory/Carrier" .. index
-        
+    
     --Design parameters:
     local imageHeight = 50
@@ -86 +86 @@
     box:setPosition(CEGUI.UVector2(CEGUI.UDim(0, horizontalOffset), CEGUI.UDim(0, 0)))
     box:setSize(CEGUI.UVector2(CEGUI.UDim(1.0, -horizontalOffset), CEGUI.UDim(1, 0)))
-    
-    offset = offset+textHeight
-    local title = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Title")
-    title:setText(carrier:getCarrierName())
-    title:setSize(CEGUI.UVector2(CEGUI.UDim(1, 0), CEGUI.UDim(0, offset)))
-    title:setProperty("FrameEnabled", "set:False")
-    box:addChildWindow(title)
     
     local numPickups = orxonox.PickupManager:getInstance():getNumPickups(carrier)

code/trunk/src/modules/objects/ObjectsPrereqs.h

@@ -87 +87 @@
     class DistanceMultiTrigger;
     class DistanceTrigger;
+    class DistanceTriggerBeacon;
     class EventMultiTrigger;
     class EventTrigger;

code/trunk/src/modules/objects/triggers/CMakeLists.txt

@@ -3 +3 @@
   DistanceMultiTrigger.cc
   DistanceTrigger.cc
+  DistanceTriggerBeacon.cc
   EventMultiTrigger.cc
   EventTrigger.cc

code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "DistanceTriggerBeacon.h"
 
 namespace orxonox
@@ -51 +52 @@
         
         this->distance_ = 100.0f;
+        this->targetName_ = BLANKSTRING;
+        this->singleTargetMode_ = false;
     }
 
@@ -70 +73 @@
 
         XMLPortParam(DistanceMultiTrigger, "distance", setDistance, getDistance, xmlelement, mode);
+        XMLPortParam(DistanceMultiTrigger, "targetname", setTargetName, getTargetName, xmlelement, mode);
     }
 
@@ -128 +132 @@
                 continue;
 
+            // If the DistanceMultiTrigger is in single-target-mode.
+            if(this->singleTargetMode_)
+            {
+                // If the object that is a target is no DistanceTriggerBeacon, then the DistanceMultiTrigger can't be in single-target-mode.
+                if(!(*it)->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()))
+                    this->singleTargetMode_ = false;
+                // If the target name and the name of the DistancTriggreBeacon don't match.
+                else if(entity->getName().compare(this->targetName_) != 0)
+                    continue;
+            }
+
             Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
             // If the object is in range.
@@ -136 +151 @@
                     continue;
 
+                // Change the entity to the parent of the DistanceTriggerBeacon (if in single-target-mode), which is the entity to which the beacon is attached.
+                if(this->singleTargetMode_)
+                    entity = entity->getParent();
+                
                 // If no queue has been created, yet.
                 if(queue == NULL)

code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h

@@ -48 +48 @@
     /**
     @brief
-        The DistanceMultiTrigger is a trigger that triggers whenever an object (that is of the specified target type) is in a specified range of the DistanceMultiTrigger.
+        The DistanceMultiTrigger is a trigger that triggers whenever an object (that is of the specified target type) is in a specified range of the DistanceMultiTrigger. The object can be specified further by adding a DistanceTriggerBeacon (just attaching it) to the objects that can trigger this DistanceMultiTrigger and specify the name of the DistanceTriggerBeacon with the parameter targetname and only objects that hav a DistanceTriggerBeacon with that name attached will trigger the DistanceMultiTrigger.
     @see MultiTrigger.h
         For more information on MultiTriggers.
@@ -63 +63 @@
             void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a DistanceMultiTrigger object through XML.
 
+            /**
+            @brief Set the target name of DistanceTriggerBeacons that triggers this DistanceMultiTrigger.
+            @param targename The name of the DistanceTriggerBeacon as a string.
+            */
+            inline void setTargetName(const std::string& targetname)
+                { if(targetname.compare(BLANKSTRING) != 0) this->singleTargetMode_ = true; else this->singleTargetMode_ = false; this->targetName_ = targetname; }
+            /**
+            @brief Get the target name of the DistanceTriggerbeacon, that triggers this DistanceMultiTrigger.
+            @return Returns the target name as a string.
+            */
+            inline const std::string& getTargetName(void)
+                { return this->targetName_; }
+            
             /**
             @brief Set the distance at which the DistanceMultiTrigger triggers.
@@ -96 +109 @@
         private:
             float distance_; //!< The distance at which the DistanceMultiTrigger triggers.
+            std::string targetName_; //!< The target name, used in singleTargetMode.
+            bool singleTargetMode_; //!< To indicate whe the MultiDistanceTrigger is in single-target-mode.
+            
             std::map<WorldEntity*, WeakPtr<WorldEntity>* > range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
         

code/trunk/src/modules/objects/triggers/DistanceTrigger.cc

@@ -32 +32 @@
 #include "core/XMLPort.h"
 #include "worldentities/pawns/Pawn.h"
+#include "DistanceTriggerBeacon.h"
 
 namespace orxonox
@@ -43 +44 @@
     this->distance_ = 100;
     this->targetMask_.exclude(Class(BaseObject));
+    this->targetName_ = BLANKSTRING;
+    this->singleTargetMode_ = false;
     this->setForPlayer(false); //!< Normally hasn't just players as targets.
   }
@@ -55 +58 @@
 
     XMLPortParam(DistanceTrigger, "distance", setDistance, getDistance, xmlelement, mode).defaultValues(100.0f);
-    XMLPortParamLoadOnly(DistanceTrigger, "target", addTargets, xmlelement, mode).defaultValues("ControllableEntity");
+    XMLPortParamLoadOnly(DistanceTrigger, "target", addTargets, xmlelement, mode).defaultValues("Pawn");
+    XMLPortParam(DistanceTrigger, "targetname", setTargetName, getTargetName, xmlelement, mode);
   }
 
@@ -84 +88 @@
 
     //! Checks whether the target is (or is derived from) a ControllableEntity.
-    Identifier* controllableEntityId = Class(ControllableEntity);
-    if(targetId->isA(controllableEntityId))
+    Identifier* pawnId = Class(Pawn);
+    Identifier* distanceTriggerBeaconId = Class(DistanceTriggerBeacon);
+    if(targetId->isA(pawnId) || targetId->isA(distanceTriggerBeaconId))
     {
       this->setForPlayer(true);
@@ -124 +129 @@
         continue;
 
+      if(this->singleTargetMode_)
+      {
+        if(!(*it)->isA(ClassIdentifier<DistanceTriggerBeacon>::getIdentifier()))
+          this->singleTargetMode_ = false;
+        else if(entity->getName().compare(this->targetName_) != 0)
+          continue;
+      }
+      
       Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
       if (distanceVec.length() < this->distance_)
@@ -131 +144 @@
         if(this->isForPlayer())
         {
+
+          if(this->singleTargetMode_)
+            entity = entity->getParent();
+
           Pawn* player = orxonox_cast<Pawn*>(entity);
           this->setTriggeringPlayer(player);

code/trunk/src/modules/objects/triggers/DistanceTrigger.h

@@ -52 +52 @@
       void removeTargets(const std::string& targets);
 
+      inline void setTargetName(const std::string& targetname)
+        { if(targetname.compare(BLANKSTRING) != 0) this->singleTargetMode_ = true; else this->singleTargetMode_ = false; this->targetName_ = targetname; }
+      inline const std::string& getTargetName(void)
+        { return this->targetName_; }
+
       inline void setDistance(float distance)
         { this->distance_ = distance; }
@@ -67 +72 @@
     private:
       std::set<Ogre::Node*> targetSet_;
+      std::string targetName_;
       float distance_;
+      bool singleTargetMode_;
 
   };

code/trunk/src/modules/questsystem/QuestEffectBeacon.cc

@@ -99 +99 @@
     bool QuestEffectBeacon::execute(bool b, BaseObject* trigger)
     {
-        //TODO: Remove debug output.
-        COUT(1) << "Debug: Calling execute on QuestEffectBeacon." << std::endl;
-        
         if(!b)
         {
@@ -108 +105 @@
         if(!(this->isActive())) //!< If the QuestEffectBeacon is inactive it cannot be executed.
         {
-            COUT(3) << "The QuestEffectBeacon is inactive." << std::endl;
+            COUT(4) << "The QuestEffectBeacon is inactive." << std::endl;
             return false;
         }