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

Timestamp:

Oct 28, 2008, 8:37:09 PM (16 years ago)

Author:

landauf

Message:

some changes in Trigger and DistanceTrigger

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (4 diffs)

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

@@ -41 +41 @@
     RegisterObject(DistanceTrigger);
 
-    targetMask_.exclude(Class(BaseObject));
+    this->distance_ = 100;
+    this->targetMask_.exclude(Class(BaseObject));
   }
 
   DistanceTrigger::~DistanceTrigger()
   {
+  }
+
+  void DistanceTrigger::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+  {
+    SUPER(DistanceTrigger, XMLPort, xmlelement, mode);
+
+    XMLPortParam(DistanceTrigger, "distance", setDistance, getDistance, xmlelement, mode).defaultValues(100.0f);
+    XMLPortParamLoadOnly(DistanceTrigger, "target", addTargets, xmlelement, mode);
   }
 
@@ -61 +70 @@
       COUT(4) << "Content of targetSet of trigger " << this << " :" << std::endl;
       std::set<Ogre::Node*>::iterator it;
-      for(it = this->targetSet_.begin(); it != this->targetSet_.end(); it++)
+      for (it = this->targetSet_.begin(); it != this->targetSet_.end(); ++it)
       {
         COUT(4) << *it << std::endl;
@@ -87 +96 @@
   {
     // Iterate through all WorldEntities
-    for(Iterator<WorldEntity> it = ObjectList<WorldEntity>::begin(); it; it++)
+    for (Iterator<WorldEntity> it = ObjectList<WorldEntity>::begin(); it; ++it)
     {
       // check if WorldEntity is a target
-      if(targetMask_.isIncluded(it->getIdentifier()))
+      if (targetMask_.isIncluded(it->getIdentifier()))
       {
         Vector3 distanceVec = it->getNode()->getWorldPosition() - this->getNode()->getWorldPosition();
         if (distanceVec.length() < this->distance_)
-        {
           return true;
-        }
       }
     }
@@ -103 +110 @@
   }
 
-  void DistanceTrigger::setDistance(float dist)
-  {
-    this->distance_ = dist;
-  }
-
-  void DistanceTrigger::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-  {
-    Trigger::XMLPort(xmlelement, mode);
-
-    XMLPortParamLoadOnly(DistanceTrigger, "distance", setDistance, xmlelement, mode);
-    XMLPortParamLoadOnly(DistanceTrigger, "target", addTargets, xmlelement, mode);
-  }
-
   bool DistanceTrigger::isTriggered(TriggerMode mode)
   {
-    if(Trigger::isTriggered(mode))
+    if (Trigger::isTriggered(mode))
       return checkDistance();
     else