Changeset 8992 for code/branches/presentation2011/src/orxonox/controllers/FormationController.cc

Timestamp:

Dec 16, 2011, 8:36:41 PM (13 years ago)

Author:

jo

Message:

Merged Formation branch. There are still some bugs (just have a look at the tutorial level)

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/FormationController.cc (copied) (copied from code/branches/formation/src/orxonox/controllers/FormationController.cc) (4 diffs)

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

@@ -40 +40 @@
 #include "gametypes/TeamDeathmatch.h"
 #include "gametypes/Dynamicmatch.h"
-//#include "gametypes/Mission.h" TODO: include mission after merging
+#include "gametypes/Mission.h" TODO: include mission after merging
 #include "gametypes/Gametype.h"
 #include "controllers/WaypointPatrolController.h"
@@ -962 +962 @@
         }
 
-        /*Mission* miss = orxonox_cast<Mission*>(gametype); //NEW
+        Mission* miss = orxonox_cast<Mission*>(gametype);
         if (miss)
         {
@@ -970 +970 @@
             if (entity2->getPlayer())
                 team2 = miss->getTeam(entity2->getPlayer());
-        }*/
+        }
 
         TeamBaseMatchBase* base = 0;
@@ -1039 +1039 @@
     }
 
+    void FormationController::absoluteMoveToPosition(const Vector3& target)
+    {
+        float minDistance = 40.0f;
+        if (!this->getControllableEntity())
+            return;
+
+        Vector2 coord = get2DViewdirection(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
+        float distance = (target - this->getControllableEntity()->getPosition()).length();
+
+            if (this->target_ || distance > minDistance)
+            {
+                // Multiply with ROTATEFACTOR_FREE to make them a bit slower
+                this->getControllableEntity()->rotateYaw(-1.0f * ROTATEFACTOR_FREE * sgn(coord.x) * coord.x*coord.x);
+                this->getControllableEntity()->rotatePitch(ROTATEFACTOR_FREE * sgn(coord.y) * coord.y*coord.y);
+                this->getControllableEntity()->moveFrontBack(SPEED_FREE);
+            }
+
+
+        if (distance < minDistance)
+        {
+            this->positionReached();
+        }
+    }
+
 }