Changeset 10868 for code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.cc

Timestamp:

Nov 26, 2015, 10:40:59 PM (8 years ago)

Author:

gania

Message:

first stable version

File:

• code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.cc (modified) (3 diffs)

code/branches/campaignHS15/src/orxonox/worldentities/Actionpoint.cc

@@ -29 +29 @@
 #include "Actionpoint.h"
 
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-
 namespace orxonox
 {
@@ -39 +36 @@
     {
         RegisterObject(Actionpoint);
-
+        
+        this->actionName_ = "";
+        this->name_ = "";
+        
+        this->bLoopStart_ = false;
+        this->bLoopEnd_ = false;
+        this->bProtectMe_ = false;
     }
     
@@ -46 +49 @@
         SUPER(Actionpoint, XMLPort, xmlelement, mode);
         
-        XMLPortParam( Actionpoint, "action", setActionXML, getActionXML,  xmlelement, mode );
-        XMLPortParam( Actionpoint, "protect", setProtectXML, getProtectXML,  xmlelement, mode );
-        XMLPortParam( Actionpoint, "attack", setAttackXML, getAttackXML,  xmlelement, mode );
-        XMLPortParam( Actionpoint, "protectMe", setProtectMeXML, getProtectMeXML,  xmlelement, mode ).defaultValues(false);
-        XMLPortParam( Actionpoint, "loopStart", setLoopStart, getLoopStart,  xmlelement, mode ).defaultValues(false);
-        XMLPortParam( Actionpoint, "loopEnd", setLoopEnd, getLoopEnd,  xmlelement, mode ).defaultValues(false);
-
+        XMLPortParam(Actionpoint, "action", setActionXML, getActionXML,  xmlelement, mode);
+        XMLPortParam(Actionpoint, "protect", setProtectXML, getProtectXML,  xmlelement, mode);
+        XMLPortParam(Actionpoint, "attack", setAttackXML, getAttackXML,  xmlelement, mode);
+        XMLPortParam(Actionpoint, "protectMe", setProtectMeXML, getProtectMeXML,  xmlelement, mode).defaultValues(false);
+        XMLPortParam(Actionpoint, "loopStart", setLoopStart, getLoopStart,  xmlelement, mode).defaultValues(false);
+        XMLPortParam(Actionpoint, "loopEnd", setLoopEnd, getLoopEnd,  xmlelement, mode).defaultValues(false);
     }
-    void Actionpoint::setActionXML( std::string val)
+    /**
+    @brief
+        action is ATTACK -> returns name of object to attack
+        action is PROTECT -> returns name of object to protect 
+        if asked to protect human, returns a special string.
+    @return
+        name of an object to interact with.
+    @note
+        never use more than one of following arguments for XMLPort:
+        attack, protect, protectMe or
+        loopStart and loopEnd.
+    */
+    std::string Actionpoint::getName() const
     {
-        this->actionName_ = getUppercase( val );
-        orxout(internal_error) << "action = " << this->actionName_ << endl;
-    }
-
-    std::string Actionpoint::getActionXML()
-    {
-        return this->actionName_;
-    }
-    void Actionpoint::setProtectXML( std::string val)
-    {
-        this->protectName_ = val;
-    }
-
-    std::string Actionpoint::getProtectXML()
-    {
-        return this->protectName_;
-    }
-    void Actionpoint::setAttackXML( std::string val)
-    {
-        this->attackName_ = val;
-    }
-
-    std::string Actionpoint::getAttackXML()
-    {
-        return this->attackName_;
-    }
-   
-    void Actionpoint::setTargetPosition(const Vector3& target)
-    {
-        this->targetPosition_ = target;
-    }
-    Vector3 Actionpoint::getTargetPosition ()
-    {
-        return this->targetPosition_;
-    }
-    
+        if (this->name_ != "")
+        {
+            return this->name_;
+        }
+        else if (this->bProtectMe_)
+        {
+            return "reservedKeyword:human";
+        }
+        else
+        {
+            return "";
+        }
+    }    
 }