Changeset 10847 for code/branches/campaignHS15/src/orxonox/worldentities

Timestamp:

Nov 24, 2015, 11:54:47 AM (9 years ago)

Author:

gania

Message:

I hope that you don't code today, that version is not compilable just yet

Location:

code/branches/campaignHS15/src/orxonox/worldentities

Files:

• ActionPoint.cc (modified) (3 diffs)
• ActionPoint.h (modified) (5 diffs)
• CMakeLists.txt (modified) (1 diff)

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

@@ -27 +27 @@
  */
 
-#include "ActionPoint.h"
+#include "Actionpoint.h"
 
 #include "core/CoreIncludes.h"
@@ -34 +34 @@
 namespace orxonox
 {
-    RegisterClass(ActionPoint);
+    RegisterClass(Actionpoint);
 
-    ActionPoint::ActionPoint(Context* context) : StaticEntity(context)
+    Actionpoint::Actionpoint(Context* context) : StaticEntity(context)
     {
-        RegisterObject(ActionPoint);
+        RegisterObject(Actionpoint);
 
     }
     //usage:
     // <DivisionController team=12>
-    //     <actionpoints>
-    //          <ActionPoint position="12,34,56" action="FIGHT" enemy="enemyName" />, position irrelevant
-    //          <ActionPoint position="12,34,56" action="PROTECT" protect="protectName" />, position irrelevant
-    //          <ActionPoint position="12,34,56" action="FLY" />, position relevant: makes ship fly to the position of ActionPoint
-    //     </actionpoints>
+    //     <Actionpoints>
+    //          <Actionpoint position="12,34,56" action="FIGHT" enemy="enemyName" />, position irrelevant
+    //          <Actionpoint position="12,34,56" action="PROTECT" protect="protectName" />, position irrelevant
+    //          <Actionpoint position="12,34,56" action="FLY" />, position relevant: makes ship fly to the position of Actionpoint
+    //     </Actionpoints>
     // </DivisonController>
     //DivisionController will firstly fight enemy that it will find by name "enemyName", if finds nothing or when beats enemy,
@@ -56 +56 @@
     //another usage:
     // <DivisionController team=12>
-    //     <actionpoints>
-    //          <ActionPoint position="12,34,56" action="PROTECT" protectMe=true />, position irrelevant
-    //          <ActionPoint position="12,34,56" action="FIGHT" fightAll=true />, position irrelevant
-    //     </actionpoints>
+    //     <Actionpoints>
+    //          <Actionpoint position="12,34,56" action="PROTECT" protectMe=true />, position irrelevant
+    //          <Actionpoint position="12,34,56" action="FIGHT" fightAll=true />, position irrelevant
+    //     </Actionpoints>
     // </DivisonController>
     //DivisionController will protect the first NewHumanController it finds, when it dies or if no controller found,
     //it will fight closest enemies one after another
-    void ActionPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    void Actionpoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(ActionPoint, XMLPort, xmlelement, mode);
+        SUPER(Actionpoint, XMLPort, xmlelement, mode);
         
-        XMLPortParam( ActionPoint, "action", setActionXML, getActionXML,  xmlelement, mode );
-        XMLPortParam( ActionPoint, "protect", setProtectXML, getProtectXML,  xmlelement, mode );
-        XMLPortParam( ActionPoint, "enemy", setEnemyXML, getEnemyXML,  xmlelement, mode );
-        XMLPortParam( ActionPoint, "protectMe", setProtectMeXML, getProtectMeXML,  xmlelement, mode ).defaultValues(false);
-        XMLPortParam( ActionPoint, "fightAll", setFightAllXML, getFightAllXML,  xmlelement, mode ).defaultValues(false);
+        XMLPortParam( Actionpoint, "action", setActionXML, getActionXML,  xmlelement, mode );
+        XMLPortParam( Actionpoint, "protect", setProtectXML, getProtectXML,  xmlelement, mode );
+        XMLPortParam( Actionpoint, "enemy", setEnemyXML, getEnemyXML,  xmlelement, mode );
+        XMLPortParam( Actionpoint, "protectMe", setProtectMeXML, getProtectMeXML,  xmlelement, mode ).defaultValues(false);
+        XMLPortParam( Actionpoint, "fightAll", setFightAllXML, getFightAllXML,  xmlelement, mode ).defaultValues(false);
 
     }
-    void ActionPoint::setActionXML( std::string val)
+    void Actionpoint::setActionXML( std::string val)
     {
         this->actionName_ = getUppercase( val );
+        orxout(internal_error) << "action = " << this->actionName_ << endl;
     }
 
-    std::string ActionPoint::getActionXML()
+    std::string Actionpoint::getActionXML()
     {
         return this->actionName_;
     }
-    void ActionPoint::setProtectXML( std::string val)
+    void Actionpoint::setProtectXML( std::string val)
     {
         this->protectName_ = getUppercase( val );
     }
 
-    std::string ActionPoint::getProtectXML()
+    std::string Actionpoint::getProtectXML()
     {
         return this->protectName_;
     }
-    void ActionPoint::setEnemyXML( std::string val)
+    void Actionpoint::setEnemyXML( std::string val)
     {
         this->enemyName_ = getUppercase( val );
     }
 
-    std::string ActionPoint::getEnemyXML()
+    std::string Actionpoint::getEnemyXML()
     {
         return this->enemyName_;
     }
-
-    void ActionPoint::setTargetPosition(const Vector3& target)
+    void Actionpoint::setProtect( ControllableEntity* protect)
+    {
+        this->protect_ = protect;
+    }
+    ControllableEntity* Actionpoint::getProtect()
+    {
+        return this->protect_;
+    }
+    void Actionpoint::setEnemy( ControllableEntity* enemy)
+    {
+        this->enemy_ = enemy;
+    }
+    ControllableEntity* Actionpoint::getEnemy()
+    {
+        return this->enemy_;
+    }
+    void Actionpoint::setTargetPosition(const Vector3& target)
     {
         this->targetPosition_ = target;
     }
-    Vector3 ActionPoint::getTargetPosition ()
+    Vector3 Actionpoint::getTargetPosition ()
     {
         return this->targetPosition_;

code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.h

@@ -33 +33 @@
 */
 
-#ifndef _ActionPoint_H__
-#define _ActionPoint_H__
+#ifndef _Actionpoint_H__
+#define _Actionpoint_H__
 
 #include "OrxonoxPrereqs.h"
@@ -45 +45 @@
 {
  
-    class _OrxonoxExport ActionPoint : public StaticEntity
+    class _OrxonoxExport Actionpoint : public StaticEntity
     {
         public:
-            ActionPoint(Context* context);
-            virtual ~ActionPoint() {}
+            Actionpoint(Context* context);
+            virtual ~Actionpoint() {}
 
             //----[XML data]----
@@ -87 +87 @@
                 //----[/FightAll data]----
             //----[/XML data]----
-
+                void setProtect( ControllableEntity* protect);
+                ControllableEntity* getProtect();
+                void setEnemy( ControllableEntity* enemy);
+                ControllableEntity* getEnemy();
             //----["Waypoints" data]----
                 void setTargetPosition(const Vector3& target);
@@ -98 +101 @@
             std::string protectName_;
             std::string enemyName_;
+            WeakPtr<ControllableEntity> protect_;
+            WeakPtr<ControllableEntity> enemy_;
+
             bool protectMe_;
             bool fightAll_;
@@ -104 +110 @@
 }
 
-#endif /* _ActionPoint_H__ */
+#endif /* _Actionpoint_H__ */

code/branches/campaignHS15/src/orxonox/worldentities/CMakeLists.txt

@@ -12 +12 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
-  ActionPoint.cc
+  Actionpoint.cc
 )