Changeset 9619

Timestamp:

Apr 30, 2013, 3:55:12 PM (11 years ago)

Author:

maxima

Message:

New function SetNewMasterWithinFormation(FormationController), but it does not work yet.

Location:

code/branches/formationupdate/src/orxonox

Files:

• controllers/FormationController.cc (modified) (1 diff)
• controllers/FormationController.h (modified) (3 diffs)
• worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/formationupdate/src/orxonox/controllers/FormationController.cc

@@ -534 +534 @@
     }
 
+    /*
+    void FormationController::setNewMasterWithinFormation(FormationController* newMaster)
+        {
+            if(this->state_ != MASTER) return;
+
+            if (!this->slaves_.empty())
+            {
+                newMaster->state_ = MASTER;
+                newMaster->slaves_ = this->slaves_;
+                newMaster->myMaster_ = 0;
+
+                for(std::vector<FormationController*>::iterator it = newMaster->slaves_.begin(); it != newMaster->slaves_.end(); it++)
+                {
+                    (*it)->myMaster_ = newMaster;
+                }
+            }
+
+            this->slaves_.clear();
+            this->specificMasterAction_ = NONE;
+            this->state_ = FREE;
+        }
+     */
+
 
   /**

code/branches/formationupdate/src/orxonox/controllers/FormationController.h

@@ -59 +59 @@
       static void passivebehaviour(const bool passive);
       static void formationsize(const int size);
-      void takeLeadOfFormation();
-      void loseMasterState();
+      void setNewMasterWithinFormation();
+      //void setNewMasterWithinFormation(FormationController* newMaster);
 
       inline void setFormationFlight(bool formation)
@@ -103 +103 @@
       FormationController* getMaster( void ) { return myMaster_; }
       FormationController* getThis( void ) { return this; }
+      FormationController* getSlave( void ) { return this->slaves_.back(); }
 
   protected:
@@ -133 +134 @@
       void searchNewMaster();
       void commandSlaves();
-      void setNewMasterWithinFormation();
+      void takeLeadOfFormation();
+      void loseMasterState();
 
       void freeSlaves();

code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc

@@ -365 +365 @@
 
                         // set new Master
-                                        orxonox_cast<FormationController*>(this->getController())->loseMasterState();
-
-
-
-                        /* TO DO: - new Master is not set right
-                         *                - The slave still has a AIController
+                                        //orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation(orxonox_cast<FormationController*>(slave));
+                        orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation();
+
+
+                        /* TO DO: - setNewMasterWithinFormation() with an argument.
+                         *                - set slave as the new master within the formation
                          *
                          */
@@ -377 +377 @@
                                 this->getPlayer()->startControl(entity);
 
-                                        //orxonox_cast<FormationController*>(this->getController())->takeLeadOfFormation();
 
                 }