Changeset 10847 for code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc

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

File:

• code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) (7 diffs)

code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc

@@ -60 +60 @@
         this->action_ = Action::FLY;
         this->stopLookingAtTarget();
-       
+        this->attackRange_ = 2500;
         RegisterObject( CommonController );
     }
@@ -69 +69 @@
         //orxout(internal_error) << "I died, my Rank is " << rank_ << endl;
     }
-   
+    void CommonController::backupAction()
+    {
+        this->actionpoints_.push_back (this->currentActionpoint_);
+    }
+    void CommonController::restoreAction()
+    {
+        this->currentActionpoint_ = this->actionpoints_.back();
+        this->actionpoints_.pop_back();
+    }
+    void CommonController::popAction()
+    {
+        this->currentActionpoint_ = actionpoints_.back();
+        actionpoints_.pop_back();
+    }
+
     void CommonController::XMLPort( Element& xmlelement, XMLPort::Mode mode )
     {
         SUPER( CommonController, XMLPort, xmlelement, mode );
         XMLPortParam( CommonController, "formationMode", setFormationModeXML, getFormationModeXML,  xmlelement, mode );
-        XMLPortParam( CommonController, "action", setActionXML, getActionXML,  xmlelement, mode );
-        XMLPortParam ( CommonController, "protect", setProtectXML, getProtectXML,  xmlelement, mode );
+        //XMLPortParam( CommonController, "action", setActionXML, getActionXML,  xmlelement, mode );
+        //XMLPortParam ( CommonController, "protect", setProtectXML, getProtectXML,  xmlelement, mode );
         //XMLPortParam ( CommonController, "enemy", setEnemyXML, getEnemyXML,  xmlelement, mode );
+        XMLPortObject(CommonController, WorldEntity, "actionpoints", addActionpoint, getActionpoint,  xmlelement, mode);
+
     }
     void CommonController::setProtectXML( std::string val )
@@ -104 +120 @@
         if (!this->getProtect())
             return "noProtectWasSet";
-        return this->getProtect()->getName();
-    }
-
+        return CommonController::getName (this->getProtect());
+    }
+    std::string CommonController::getName(ControllableEntity* entity)
+    {
+        std::string name = entity->getName();
+        if (name == "")
+        {
+            const void * address = static_cast<const void*>(entity);
+            std::stringstream ss;
+            ss << address;  
+            name = ss.str();            
+        }
+        return name;
+
+    }
     void CommonController::setProtect (ControllableEntity* protect)
     {
@@ -126 +154 @@
         else if ( valUpper == "PROTECT" )
             value = Action::PROTECT;
+        else if ( valUpper == "NONE" )
+            value = Action::NONE;
+        else if ( valUpper == "FIGHTALL" )
+            value = Action::FIGHTALL;
+        else if ( valUpper == "ATTACK" )
+            value = Action::ATTACK;
         else
             ThrowException( ParseError, std::string( "Attempting to set an unknown Action: '" )+ val + "'." );
@@ -149 +183 @@
                 break;
             }
+            case Action::NONE:
+            {
+                return "NONE";
+                break;
+            }
+            case Action::FIGHTALL:
+            {
+                return "FIGHTALL";
+                break;
+            }
+            case Action::ATTACK:
+            {
+                return "ATTACK";
+                break;
+            }
             default:
-                return "FIGHT";
+                return "NONE";
                 break;
         }
@@ -237 +286 @@
        
     }
+    void CommonController::addActionpoint(WorldEntity* actionpoint)
+    {
+        std::string actionName;
+        Vector3 position;
+        std::string targetName;
+        this->actionpoints_.push_back(actionpoint);
+        if (static_cast<Actionpoint*> (actionpoint))
+        {
+            Actionpoint* ap = static_cast<Actionpoint*> (actionpoint);
+            actionName = ap->getActionXML();
+            targetName = ap->get
+            Action::Value value;
+            
+            if ( valUpper == "FIGHT" )
+            {
+                value = Action::FIGHT;
+
+            }
+            else if ( valUpper == "FLY" )
+            {
+                value = Action::FLY;
+
+            }
+            else if ( valUpper == "PROTECT" )
+            {
+                value = Action::PROTECT;
+
+            }
+            else if ( valUpper == "NONE" )
+            {
+                value = Action::NONE;
+
+            }
+            else if ( valUpper == "FIGHTALL" )
+            {
+                value = Action::FIGHTALL;
+
+            }
+            else if ( valUpper == "ATTACK" )
+            {
+                value = Action::ATTACK;
+
+            }
+            else
+                ThrowException( ParseError, std::string( "Attempting to set an unknown Action: '" )+ val + "'." );
+            this->setAction( value );
+        }
+        else
+        {
+            actionName = "FLY";
+        }
+        
+    }
+
+    WorldEntity* CommonController::getActionpoint(unsigned int index) const
+    {
+        if (index < this->actionpoints_.size())
+            return this->actionpoints_[index];
+        else
+            return 0;
+    }
     void CommonController::setClosestTarget()
     {
+        this->setTarget (closestTarget()); 
+    }
+    ControllableEntity* CommonController::closestTarget()
+    {
         if (!this->getControllableEntity())
-            return;
+            return 0;
 
         Pawn* closestTarget = 0;
@@ -259 +373 @@
         if (closestTarget)
         {
-           (this)->setTarget(static_cast<ControllableEntity*>(closestTarget));
-        }   
+           return static_cast<ControllableEntity*>(closestTarget);
+        } 
+        return 0;  
     }
     void CommonController::maneuver()