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

Timestamp:

Nov 25, 2015, 2:53:58 PM (8 years ago)

Author:

gania

Message:

should work, didn't compile

File:

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

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

@@ -98 +98 @@
             switch (this->myLeader_->getAction())
             {
-                // case Action::FLY:
-                // {
-                //     // Vector3 targetRelativePosition = getFormationPosition();
-                //     // Quaternion orient = 
-                //     //     this->myDivisionLeader_->getControllableEntity()->getWorldOrientation();
-                //     // Vector3 targetAbsolutePosition = 
-                //     //     ((this->myDivisionLeader_->getControllableEntity()->getWorldPosition()) + 
-                //     //         (orient* (targetRelativePosition)));
-                //     // this->setAction (Action::FLY, targetAbsolutePosition, orient);
-                //     break;
-                // }
-                // case Action::FIGHT:
-                // {
-
-                //     // this->setAction (Action::FLY, targetAbsolutePosition, orient);
-                //     break;
-                // }
+                case Action::FIGHT:
+                {
+                    if (!this->hasTarget())
+                    {
+                        this->setTarget(this->myLeader_->getTarget());
+                    }
+                    break;
+                }
+                case Action::FIGHTALL:
+                {
+                    if (!this->hasTarget())
+                    {
+                        this->setTarget(this->myLeader_->getTarget());
+                    }
+                    break;
+                }
+                case Action::ATTACK:
+                {
+                    if (!this->hasTarget())
+                    {
+                        this->setTarget(this->myLeader_->getTarget());
+                    }
+                    break;
+                }
                 default:
                 {
@@ -146 +153 @@
                     }
                 }
+            }
+            if (this->hasTarget())
+            {
+                //----choose where to go----
+                this->maneuver();
+                //----fire if you can----
+                this->bShooting_ = this->canFire();                
             }
         }