Changeset 1456 for code/branches/network/src/orxonox/hud/Navigation.cc

Timestamp:

May 28, 2008, 7:12:28 PM (17 years ago)

Author:

FelixSchulthess

Message:

using a std::set for the radar objects, which still has a the small problem, that the first radar object is selected twice when cycling through radar objects

File:

• code/branches/network/src/orxonox/hud/Navigation.cc (modified) (2 diffs)

code/branches/network/src/orxonox/hud/Navigation.cc

@@ -40 +40 @@
 #include "RadarOverlayElement.h"
 #include "HUD.h"
+#include "core/Debug.h"
 
 namespace orxonox
@@ -204 +205 @@
     void Navigation::cycleFocus(){
         if(focus_ == NULL){
-            focus_ = HUD::getSingleton().getFirstRadarObject();
+            it_ = HUD::getSingleton().roSet.begin();
+            focus_ = *it_;
         }
         else{
             focus_->resetColour();
-            if(focus_ != NULL) focus_ = focus_->next;
-        }
-
+            if(it_ != HUD::getSingleton().roSet.end()){
+                focus_ = *it_;
+                ++it_;
+            }
+            else focus_ = NULL;
+        }
         if(focus_ == NULL){
             navMarker_->hide();