Changeset 10869

Timestamp:

Nov 27, 2015, 8:39:46 AM (8 years ago)

Author:

gania

Message:

fixed a bug and got rid of unnecessary Rank enumeration, used getIdentifire instead

Location:

code/branches/campaignHS15/src/orxonox/controllers

Files:

• CommonController.cc (modified) (1 diff)
• CommonController.h (modified) (3 diffs)
• DivisionController.cc (modified) (3 diffs)
• DivisionController.h (modified) (1 diff)
• SectionController.cc (modified) (3 diffs)
• SectionController.h (modified) (1 diff)
• WingmanController.cc (modified) (6 diffs)
• WingmanController.h (modified) (1 diff)

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

@@ -130 +130 @@
     { 
         return this->formationMode_; 
-    }
-    void CommonController::setRank(Rank::Value val)
-    { 
-        this->rank_ = val; 
-    }
-    Rank::Value CommonController::getRank() const
-    { 
-        return this->rank_; 
     }
     

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

@@ -53 +53 @@
         };
     }
-    namespace Rank
-    {
-        enum Value 
-        { 
-            NONE, SECTIONLEADER, DIVISIONLEADER, WINGMAN 
-        };
 
-    }
-   
 
     
@@ -86 +78 @@
                 FormationMode::Value getFormationMode() const;
 
-                void setRank(Rank::Value val);
-                Rank::Value getRank() const;
-           
+               
 
             //----[/XML methods]----
@@ -172 +162 @@
             //----["Private" variables]----
                 FormationMode::Value formationMode_;
-                Rank::Value rank_;
 
                 int attackRange_;

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

@@ -45 +45 @@
         this->myWingman_ = 0;
         this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&DivisionController::action, this)));
-        this->rank_ = Rank::DIVISIONLEADER;
     }
 
@@ -107 +106 @@
         
     }
+    //I wanted to do it different here, but at this point I think nothing will change if I delete that method
     void DivisionController::stayNearProtect()
     {
@@ -112 +112 @@
     }
     
-    bool DivisionController::setWingman(ActionpointController* cwingman)
+    bool DivisionController::setWingman(CommonController* cwingman)
     {
 

code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h

@@ -53 +53 @@
             //----[own functions]----
                 virtual bool setFollower(LeaderController* myFollower);
-                virtual bool setWingman(ActionpointController* cwingman);
+                virtual bool setWingman(CommonController* cwingman);
                 virtual bool hasWingman();
                 virtual bool hasFollower();

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

@@ -47 +47 @@
         this->myWingman_ = 0;
         this->myDivisionLeader_ = 0;
-        this->rank_ = Rank::SECTIONLEADER;
         this->bFirstAction_ = true;
         //orxout(internal_error) << this << "Was created" << endl;
@@ -285 +284 @@
         {
             //0ptr or not DivisionController?
-            if (!(it) || !((it)->getRank() == Rank::DIVISIONLEADER) || !(it->getControllableEntity()))
+            if (!(it) || !((it)->getIdentifier()->getName() == "DivisionController") || !(it->getControllableEntity()))
                 continue;
             //same team?
@@ -311 +310 @@
         return 0;
     }
-    bool SectionController::setWingman(ActionpointController* cwingman)
+    bool SectionController::setWingman(CommonController* cwingman)
     {
         WeakPtr<WingmanController> wingman = orxonox_cast<WingmanController*>(cwingman);

code/branches/campaignHS15/src/orxonox/controllers/SectionController.h

@@ -53 +53 @@
                 LeaderController* findNewDivisionLeader();
 
-                virtual bool setWingman(ActionpointController* cwingman);
+                virtual bool setWingman(CommonController* cwingman);
                 virtual bool hasWingman();
 

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

@@ -41 +41 @@
         this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&WingmanController::action, this)));
         this->myLeader_ = 0;
-        this->rank_ = Rank::WINGMAN;
         this->bFirstAction_ = true;
 
@@ -81 +80 @@
         if (!this->myLeader_)
         {
-            ActionpointController* newLeader = findNewLeader();
+            ActionpointController* newLeader = orxonox_cast<ActionpointController*> (findNewLeader());
             this->myLeader_ = newLeader;
            
@@ -172 +171 @@
         Vector3* targetRelativePosition;
 
-        if (this->myLeader_->getRank() == Rank::DIVISIONLEADER)
+        if (this->myLeader_->getIdentifier()->getName() == "DivisionController")
         {
             switch (this->formationMode_){
@@ -217 +216 @@
     }
     //----POST: closest leader that is ready to take a new wingman is returned----
-    ActionpointController* WingmanController::findNewLeader()
+    CommonController* WingmanController::findNewLeader()
     {
 
@@ -224 +223 @@
 
         //----vars for finding the closest leader----
-        ActionpointController* closestLeader = 0;
+        CommonController* closestLeader = 0;
         float minDistance =  std::numeric_limits<float>::infinity();
         Gametype* gt = this->getGametype();
-        for (ObjectList<ActionpointController>::iterator it = ObjectList<ActionpointController>::begin(); it; ++it)
+        for (ObjectList<CommonController>::iterator it = ObjectList<CommonController>::begin(); it; ++it)
         {
             //----0ptr or not a leader or dead?----
             if (!it || 
-                (it->getRank() != Rank::SECTIONLEADER && it->getRank() != Rank::DIVISIONLEADER) || 
+                (it->getIdentifier()->getName() != "SectionController" && it->getIdentifier()->getName() != "DivisionController") || 
                 !(it->getControllableEntity()))
                 continue;
@@ -251 +250 @@
         {
             //----Racing conditions----
-            if (closestLeader->setWingman(this))
+            if (closestLeader->setWingman(orxonox_cast<CommonController*>(this)))
                 return closestLeader;
         }

code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h

@@ -52 +52 @@
 
             //----[own functions]----
-               ActionpointController* findNewLeader();
+               CommonController* findNewLeader();
             //----[/own functions]----