Changeset 1387 for code/trunk/src/orxonox/hud/RadarOverlayElement.cc

Timestamp:

May 22, 2008, 5:22:33 PM (16 years ago)

Author:

FelixSchulthess

Message:

made HUD singleton

File:

• code/trunk/src/orxonox/hud/RadarOverlayElement.cc (modified) (2 diffs)

code/trunk/src/orxonox/hud/RadarOverlayElement.cc

@@ -30 +30 @@
 namespace orxonox
 {
-    ConsoleCommandShortcut(RadarOverlayElement, cycleFocus, AccessLevel::User);
 
     using namespace Ogre;
 
-    RadarOverlayElement* RadarOverlayElement::instance_s = NULL;
-
     RadarOverlayElement::RadarOverlayElement(const String& name):Ogre::PanelOverlayElement(name){
-        RadarOverlayElement::instance_s = this;
     }
 
@@ -205 +201 @@
         }
 
-        /*static*/void RadarOverlayElement::cycleFocus(){
-            if(RadarOverlayElement::instance_s == NULL) return;
-
-            if(RadarOverlayElement::instance_s->focus_ == NULL){
-            RadarOverlayElement::instance_s->focus_ = RadarOverlayElement::instance_s->firstRadarObject_;
+        void RadarOverlayElement::cycleFocus(){
+            if(focus_ == NULL){
+            focus_ = firstRadarObject_;
             }
         else{
-            RadarOverlayElement::instance_s->focus_->panel_->setMaterialName("Orxonox/RedDot");
-            RadarOverlayElement::instance_s->focus_ = RadarOverlayElement::instance_s->focus_->next;
-        }
-
-        if(RadarOverlayElement::instance_s->focus_ == NULL){
-            RadarOverlayElement::instance_s->navMarker_->hide();
-        }
-        else{
-            RadarOverlayElement::instance_s->navMarker_->show();
-            RadarOverlayElement::instance_s->focus_->panel_->setMaterialName("Orxonox/WhiteDot");
+            focus_->panel_->setMaterialName("Orxonox/RedDot");
+            focus_ = focus_->next;
+        }
+
+        if(focus_ == NULL){
+            navMarker_->hide();
+        }
+        else{
+            navMarker_->show();
+            focus_->panel_->setMaterialName("Orxonox/WhiteDot");
         }
         }