Changeset 10731 for code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc

Timestamp:

Oct 31, 2015, 4:07:29 PM (9 years ago)

Author:

gania

Message:

added a little bit of firing functionality

File:

• code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) (2 diffs)

code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc

@@ -43 +43 @@
       /*  this->goalTarget_ = NULL;
         this->goalProtect_ = NULL;*/
-        this->nTicks_ = 0;
-        this->bTicked_ = false;
+        
         //this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&FleetController::action, this)));
     }
@@ -63 +62 @@
     {
 
-         /*if (nTicks_ == 30)
-         {
-            std::vector<WeakPtr<WingmanController> > wingmen;
-            std::vector<WeakPtr<LeaderController> > leaders;
-
-            //--------------------------Put all WingmanController's in a vector--------------------------
-            for (ObjectList<WingmanController>::iterator it = ObjectList<WingmanController>::begin(); it; ++it)
-            {
-
-               
-                if ((*it)->getTeam() == this->getTeam())
-                {
-                    orxout(internal_error) << "ANOTHER SUCKER" << endl;
-                    wingmen.push_back(*it);
-                } 
-                
-            }
-            //--------------------------Substitute half of WingmanController's with LeaderController--------------------------
-
-            bool nowLeader = true;
-            LeaderController* leader;
-
-            for (std::vector<WeakPtr<WingmanController> >::iterator it = wingmen.begin() ; it != wingmen.end(); ++it)
-            {
-                if (nowLeader)
-                {
-                    leader = new LeaderController(this->getContext());
-                    leader->setTeam(this->team_);
-
-                    (*it)->getControllableEntity()->setController(leader);
-                    leaders.push_back(leader);
-                    nowLeader = !nowLeader;
-                    orxout(internal_error) << "NEW SUCKER" << endl;
-
-                }
-                else
-                {
-                    if (leader)
-                    {
-                        leader->setWingman(*it);
-                        nowLeader = !nowLeader;
-                        orxout(internal_error) << "I OWN THE SUCKER" << endl;
-
-                    }
-                }
-            }
-
-            //--------------------------Substitute half of LeaderController's with DivisionController--------------------------
-            bool nowDivision = true;
-            DivisionController* division;
-
-            for (std::vector<WeakPtr<LeaderController> >::iterator it = leaders.begin() ; it != leaders.end(); ++it)
-            {
-                if (nowDivision)
-                {
-                    division = new DivisionController(this->getContext());
-                    division->setTeam(this->team_);
-
-                    (*it)->getControllableEntity()->setController(division);
-
-                    divisions_.push_back(division);
-
-                    nowDivision = !nowDivision;
-                }
-                else
-                {
-                    if (division)
-                    {
-                        division->setLeader(*it);
-                        nowDivision = !nowDivision;
-                    }
-                }
-            }
-            bTicked_ = true;
-            nTicks_ += 1;
-         }
-         else if (!bTicked_)
-         {
-            nTicks_ += 1;
-
-         }*/
         SUPER(FleetController, tick, dt);