Changeset 10875 for code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc

Timestamp:

Nov 27, 2015, 1:41:26 PM (8 years ago)

Author:

gania

Message:

fixed library dependencies

File:

• code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) (2 diffs)

code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc

@@ -68 +68 @@
         if (!this->isActive())
             return;
-        
+        if (this->myLeader_ && this->myLeader_->getAction() != Action::FIGHT && this->myLeader_->getAction() !=
+            Action::FIGHTALL && this->myLeader_->getAction() != Action::ATTACK)
+        {
+            ControllableEntity* myEntity = this->getControllableEntity();
+            Vector3 myPosition = myEntity->getWorldPosition();
+            if (!this->myLeader_)
+            {
+                return;
+            }
+            ControllableEntity* leaderEntity = this->myLeader_->getControllableEntity();
+            Quaternion orient = leaderEntity->getWorldOrientation();
+            Vector3 leaderPosition = leaderEntity->getWorldPosition();
+
+            Vector3 targetRelativePosition = getFormationPosition();
+            if (!this->myLeader_)
+            {
+                return;
+            }
+            Vector3 targetAbsolutePosition = 
+                (leaderPosition + (orient*WorldEntity::FRONT) * (leaderEntity->getVelocity().length()/5)
+                 + (orient* (targetRelativePosition)));
+       
+            this->setAction (Action::FLY, targetAbsolutePosition, orient);
+            if ((targetAbsolutePosition - myPosition).length() > this->tolerance_ * 1.5f)
+            {
+                this->boostControl();
+            }
+            else
+            {
+               this->getControllableEntity()->boost(false);
+            }
+        }   
         
         SUPER(WingmanController, tick, dt);
@@ -123 +154 @@
                 default:
                 {
-                    ControllableEntity* myEntity = this->getControllableEntity();
-                    Vector3 myPosition = myEntity->getWorldPosition();
-                    if (!this->myLeader_)
-                    {
-                        return;
-                    }
                     
-                    ControllableEntity* leaderEntity = this->myLeader_->getControllableEntity();
-                    Quaternion orient = leaderEntity->getWorldOrientation();
-                    Vector3 leaderPosition = leaderEntity->getWorldPosition();
-
-                    Vector3 targetRelativePosition = getFormationPosition();
-                    if (!this->myLeader_)
-                    {
-                        return;
-                    }
-                    Vector3 targetAbsolutePosition = 
-                        (leaderPosition + (orient*WorldEntity::FRONT) * (leaderEntity->getVelocity().length()/5)
-                         + (orient* (targetRelativePosition)));
-               
-                    this->setAction (Action::FLY, targetAbsolutePosition, orient);
-                    if ((targetAbsolutePosition - myPosition).length() > this->tolerance_ * 1.5f)
-                    {
-                        this->boostControl();
-                    }
-                    else
-                    {
-                       this->getControllableEntity()->boost(false);
-                    }
                 }
             }