Changeset 10043 for code/branches/turretFS14/src/orxonox/controllers

Timestamp:

Apr 29, 2014, 11:31:23 AM (12 years ago)

Author:

muemart

Message:

Revert changes to FormationController… keep the dirt to myself

File:

• code/branches/turretFS14/src/orxonox/controllers/FormationController.cc (modified) (1 diff)

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

@@ -277 +277 @@
         }
 
-        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);