[Orxonox-commit 5380] r10043 - code/branches/turretFS14/src/orxonox/controllers

[muemart at orxonox.net]

Author: muemart
Date: 2014-04-29 11:31:23 +0200 (Tue, 29 Apr 2014)
New Revision: 10043

Modified:
   code/branches/turretFS14/src/orxonox/controllers/FormationController.cc
Log:
Revert changes to FormationController... keep the dirt to myself

Modified: code/branches/turretFS14/src/orxonox/controllers/FormationController.cc
===================================================================
--- code/branches/turretFS14/src/orxonox/controllers/FormationController.cc	2014-04-29 09:16:16 UTC (rev 10042)
+++ code/branches/turretFS14/src/orxonox/controllers/FormationController.cc	2014-04-29 09:31:23 UTC (rev 10043)
@@ -276,8 +276,8 @@
 //             return;
         }
 
-        Vector2 coord = get2DViewcoordinates(this->getControllableEntity()->getWorldPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
-        float distance = (target - this->getControllableEntity()->getWorldPosition()).length();
+        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);
         float rotateY = clamp(coord.y * 10, -1.0f, 1.0f);
 
@@ -1095,4 +1095,4 @@
         }
     }
 
-}
+}
\ No newline at end of file