Changeset 10731 for code/branches/AI_HS15/src/orxonox/controllers/DivisionController.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/DivisionController.cc (modified) (4 diffs)

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

@@ -40 +40 @@
         this->setFormationMode(WALL);
 
-        bIsDivisionLeader_ = true;
         this->myFollower_ = 0;
         this->myWingman_ = 0;
         this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&DivisionController::action, this)));
-       
-        /*Vector3* pos = new Vector3(500,500,-500);
-        this->setTargetPosition(*pos);*/
+        this->rank_ = DIVISIONLEADER;
+
+        Vector3* pos = new Vector3(500,500,-500);
+        this->setTargetPosition(*pos);
 
     }
@@ -54 +54 @@
       
     } 
+
+    
     void DivisionController::tick(float dt)
     {
+        if (this->target_)
+        {
+            this->aimAtTarget();
+            this->doFire();
+        }
+     
         if (this->bHasTargetPosition_)
         {
@@ -68 +76 @@
         setTargetPositionOfFollower();
         setTargetPositionOfWingman();
-    }
-
-    bool DivisionController::setFollower(LeaderController* myFollower)
-    {
-         if (!this->myFollower_)
-        {
-            this->myFollower_ = myFollower;
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
+
+        for (ObjectList<Controller>::iterator it = ObjectList<Controller>::begin(); it; ++it)
+        {
+            if (this->getControllableEntity()->getTeam() != (it)->getControllableEntity()->getTeam())
+            {
+                this->target_=it->getControllableEntity();
+                this->setTargetPosition(this->target_->getWorldPosition());
+                break;
+            } 
+        }
+           
+      
+    }
+
+    
 
     void DivisionController::setTargetPositionOfWingman()
@@ -149 +158 @@
        
     }
+
+
+    bool DivisionController::setWingman(CommonController* cwingman)
+    {
+
+        WeakPtr<WingmanController> wingman = orxonox_cast<WingmanController*>(cwingman);
+        if (!this->myWingman_)
+        {
+            this->myWingman_ = wingman;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    
+    }
+    bool DivisionController::setFollower(LeaderController* myFollower)
+    {
+         if (!this->myFollower_)
+        {
+            this->myFollower_ = myFollower;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    bool DivisionController::hasWingman()
+    {
+        if (this->myWingman_)
+            return true;
+        else
+            return false;
+    }
+    bool DivisionController::hasFollower()
+    {
+        if (this->myFollower_)
+            return true;
+        else
+            return false;
+    }
+
+
     void DivisionController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {