Changeset 10717 for code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc

Timestamp:

Oct 29, 2015, 11:53:45 AM (9 years ago)

Author:

gania

Message:

Wingmen and Leaders look for their leaders

File:

• code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified) (6 diffs)

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

@@ -105 +105 @@
                         orxout(internal_error) << this << " is still master in " << (*it) << endl;
                         it->myMaster_ = 0;
-                        it->state_ = FREE;
                     }
 
@@ -278 +277 @@
         }
 
-        Vector2 coord = get2DViewCoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
+        Vector2 coord = get2DViewcoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
         float distance = (target - this->getControllableEntity()->getPosition()).length();
         float rotateX = clamp(coord.x * 10, -1.0f, 1.0f);
@@ -473 +472 @@
         Vector3 dest = this->getControllableEntity()->getPosition();
 
-        // only 1 slave: follow
+        // 1 slave: follow
         if (this->slaves_.size() == 1)
         {
@@ -703 +702 @@
         }
     }
-     /**
-      @brief If master, set the desired relative position of slaves (Vector3) in respect to a master for all the slaves.
-    */
-    void FormationController::setDesiredPositionOfSlaves()
-    {
-        if (this->state_ != MASTER)
-            return;
-        switch (this->formationMode_){
-            case ATTACK:
-            {
-                float i = 0;
-                for(std::vector<FormationController*>::iterator it = slaves_.begin(); it != slaves_.end(); it++)
-                {
-                    (*it)->desiredRelativePosition_ = new Vector3 ((i-slaves_.size()/2)*200, 0, 0);
-                    i++;
-                }
-                break;
-            }
-            case NORMAL: 
-            {
-                break;
-            }
-            case DEFEND: 
-            {
-                break;
-            }
-        }
-       
-    }
 
     /**
@@ -1099 +1069 @@
             return;
 
-        Vector2 coord = get2DViewCoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
+        Vector2 coord = get2DViewcoordinates(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
         float distance = (target - this->getControllableEntity()->getPosition()).length();
 
@@ -1117 +1087 @@
     }
 
-    void FormationController::changedControllableEntity()
-    {
-        Controller::changedControllableEntity(); // super
-
-        // when changing the controllable entity, ensure that the controller does not use the new entity as target
-        if (this->target_ && this->getControllableEntity() == static_cast<ControllableEntity*>(this->target_))
-            this->forgetTarget();
-    }
 }