Changeset 10800 for code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc

Timestamp:

Nov 13, 2015, 4:45:44 PM (8 years ago)

Author:

gania

Message:

compilable

File:

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

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

@@ -69 +69 @@
         }*/
         
-       /* if (this->bHasTargetPosition_)
-        {
-            this->moveToTargetPosition();
-        }*/
-        if (executingMoveToPoint_)
+        if (this->bHasTargetPosition_)
+        {
+            this->moveToTargetPosition(dt);
+        }
+       /* if (executingMoveToPoint_)
         {
             executingMoveToPoint_ = !this->moveAndRoll(dt);
@@ -89 +89 @@
                 Vector3 diffVector = this->positionOfTarget_ - this->getControllableEntity()->getWorldPosition();
                 float diffLength = diffVector.length();
-               /* Quaternion rotationToTarget = (this->getControllableEntity()->getOrientation() * WorldEntity::FRONT).getRotationTo(diffVector);
+                Quaternion rotationToTarget = (this->getControllableEntity()->getOrientation() * WorldEntity::FRONT).getRotationTo(diffVector);
                 Vector3* targetPosition = new Vector3 ( 0, 0, -200 );
-                Vector3 target = rotationToTarget * (*targetPosition);*/
+                Vector3 target = rotationToTarget * (*targetPosition);
                 if (diffLength > 200)
                     this->setTargetPosition( this->positionOfTarget_ - 0.6f*diffVector);
@@ -106 +106 @@
                 this->moveAndRoll(dt);
             }
-        }
-        if (this->bShooting_)
+        }*/
+        if (this->bShooting_ && this->canFire())
             doFire();
         SUPER(DivisionController, tick, dt);
@@ -135 +135 @@
         }*/
         //this->chooseManeuverType();
+                    this->maneuver();
+
         switch (this->maneuverType_)
         {