Changeset 10725 for code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc

Timestamp:

Oct 30, 2015, 11:07:34 PM (8 years ago)

Author:

gania

Message:

fixed pointers

File:

• code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified) (4 diffs)

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

@@ -38 +38 @@
     {
         RegisterObject(SectionController);
+                this->setFormationMode(WALL);
+
         bIsDivisionLeader_ = false;
         this->actionTimer_.setTimer(ACTION_INTERVAL, true, createExecutor(createFunctor(&SectionController::action, this)));
-
+        this->myWingman_ = 0;
+        this->myDivisionLeader_ = 0;
+        this->desiredRelativePosition_ = 0;
+
+        orxout(internal_error) << this << "Was created" << endl;
 
     }
@@ -46 +52 @@
     SectionController::~SectionController()
     {
-        if (this->isInitialized())
-        {
-            if (this->myDivisionLeader_)
-                this->myDivisionLeader_->myFollower_ = 0;
-            if(this->myWingman_)
-                this->myWingman_->myLeader_ = 0;
-        }
-    }
-   
+       
+    }
+    /*void SectionController::setDesiredPositionOfWingman()
+    {
+        if (!this->myWingman_)
+            return;
+
+        switch (this->formationMode_){
+            case WALL:
+            {
+                myWingman_->desiredRelativePosition_ = new Vector3 (-200, 0, 0);   
+                break;
+            }
+            case FINGER4: 
+            {
+                break;
+            }
+            case VEE: 
+            {
+                break;
+            }
+            case DIAMOND: 
+            {
+                break;
+            }
+        }
+       
+    }
+*/
     LeaderController* SectionController::findNewDivisionLeader()
     {
@@ -112 +138 @@
             LeaderController* newDivisionLeader = findNewDivisionLeader();
             this->myDivisionLeader_ = newDivisionLeader;
-            /*if (newDivisionLeader)
+            if (newDivisionLeader)
                 orxout(internal_error) << "new DivisionLeader set" << endl;
-            else
-                orxout(internal_error) << "0 division leader" << endl;*/
-        }
-    }
+
+        }
+/*        setDesiredPositionOfWingman();
+*/    }
     /*
     Wingmen and Leaders attack target_, which is a member variable of their classes.
@@ -132 +158 @@
 
     */
+   /* void SectionController::keepDivisionTick()
+    {
+
+
+        if (this->myDivisionLeader_ && this->myDivisionLeader_->getControllableEntity() && desiredRelativePosition_)
+        {
+
+            Vector3 desiredAbsolutePosition = ((this->myDivisionLeader_->getControllableEntity()->getWorldPosition()) + 
+                (this->myDivisionLeader_->getControllableEntity()->getWorldOrientation()* (*desiredRelativePosition_)));
+            this->moveToPosition (desiredAbsolutePosition);
+        }
+    }*/
     void SectionController::tick(float dt)
-    {/*
+    {
+        
+
+       /* 
         if (!this->isActive())
             return;
         
         //--------------------------Stay in division--------------------------
-        this->keepDivisionTick();*/
-        /*keepDivisionTick(){
-            if (this->divisionLeader_ && this->divisionLeader_->getControllableEntity() && desiredRelativePosition_){
-                Vector3 desiredAbsolutePosition = ((this->divisionLeader_->getControllableEntity()->getWorldPosition()) + 
-                    (this->divisionLeader_->getControllableEntity()->getWorldOrientation()* (*desiredRelativePosition_)));
-                this->moveToPosition (desiredAbsolutePosition);
-            }
-        }
+        this->keepDivisionTick();
         */
-        /*//If ordered to attack -> follow target and shoot
-        if (this->bAttackOrder_)
-        {
- 
-        } 
         //If ordered to move -> move to a target Point
         
         //No orders -> Don't move, but shoot at whatever is close, unless Boss is shooting at it. 
         //(Section shoots same target, Boss's section shoots another target) 
-        {
-
-        }*/
+        
 
         //orxout(internal_error) << "my Wingman is " << this->myWingman_ << endl;