Changeset 6273 for code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc

Timestamp:

Dec 8, 2009, 11:48:52 AM (14 years ago)

Author:

scheusso

Message:

radar working again (also focus incl. cycleNavigationFocus)

File:

• code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) (2 diffs)

code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc

@@ -41 +41 @@
 #include "Scene.h"
 #include "Radar.h"
+#include "controllers/HumanController.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -253 +255 @@
     float HUDNavigation::getDist2Focus() const
     {
-/*
-        if (Radar::getInstance().getFocus())
-            return (Radar::getInstance().getFocus()->getRVWorldPosition() - SpaceShip::getLocalShip()->getPosition()).length();
-        else
-*/
+        Radar* radar = this->getOwner()->getScene()->getRadar();
+        if (radar->getFocus() && HumanController::getLocalControllerEntityAsPawn())
+            return (radar->getFocus()->getRVWorldPosition() - HumanController::getLocalControllerEntityAsPawn()->getWorldPosition()).length();
+        else
             return 0;
     }