Changeset 6273

Timestamp:

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

Author:

scheusso

Message:

radar working again (also focus incl. cycleNavigationFocus)

Location:

code/branches/presentation2/src

Files:

• modules/overlays/hud/HUDNavigation.cc (modified) (2 diffs)
• orxonox/Radar.cc (modified) (6 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;
     }

code/branches/presentation2/src/orxonox/Radar.cc

@@ -40 +40 @@
 #include "core/ObjectList.h"
 #include "interfaces/RadarListener.h"
+#include "controllers/HumanController.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -46 +48 @@
     Radar::Radar()
         : focus_(0)
+        , itFocus_(0)
         , objectTypeCounter_(0)
     {
@@ -118 +121 @@
     void Radar::cycleFocus()
     {
-        if (ObjectList<RadarViewable>::begin() == 0)
+        if (ObjectList<RadarViewable>::begin() == ObjectList<RadarViewable>::end())
         {
             // list is empty
@@ -124 +127 @@
             this->focus_ = 0;
         }
-/*
-        else if (this->owner_)
+
+        else if (HumanController::getLocalControllerEntityAsPawn())
         {
-            Vector3 localPosition = this->owner_->getPosition();
+            Vector3 localPosition = HumanController::getLocalControllerEntityAsPawn()->getWorldPosition();
             Vector3 targetPosition = localPosition;
-            if (*(this->itFocus_))
+            if (this->itFocus_ && *(this->itFocus_))
                 targetPosition = this->itFocus_->getRVWorldPosition();
 
-            // find the closed object further away than targetPosition
+            // find the closest object further away than targetPosition
             float currentDistance = localPosition.squaredDistance(targetPosition);
             float nextDistance = FLT_MAX;
@@ -140 +143 @@
             for (ObjectList<RadarViewable>::iterator it = ObjectList<RadarViewable>::begin(); it; ++it)
             {
-                if (*it == static_cast<RadarViewable*>(this)->owner_)
+                if (*it == static_cast<RadarViewable*>(HumanController::getLocalControllerEntityAsPawn()))
                     continue;
 
@@ -167 +170 @@
             }
         }
-*/
     }