Changeset 1387

Timestamp:

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

Author:

FelixSchulthess

Message:

made HUD singleton

Location:

code/trunk

Files:

• bin/keybindings.ini (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (3 diffs)
• src/orxonox/hud/HUD.cc (modified) (3 diffs)
• src/orxonox/hud/HUD.h (modified) (2 diffs)
• src/orxonox/hud/RadarOverlayElement.cc (modified) (2 diffs)
• src/orxonox/hud/RadarOverlayElement.h (modified) (2 diffs)

code/trunk/bin/keybindings.ini

@@ -15 +15 @@
 KeyEQUALS=activateConsole
 KeyBACK=
-KeyTAB=cycleFocus
+KeyTAB=cycleRadarFocus
 KeyQ=
 KeyW=

code/trunk/src/orxonox/Orxonox.cc

@@ -180 +180 @@
   {
     // keep in mind: the order of deletion is very important!
-    if (this->orxonoxHUD_)
-      delete this->orxonoxHUD_;
+//    if (this->orxonoxHUD_)
+//      delete this->orxonoxHUD_;
     Loader::close();
     InputManager::destroy();
@@ -348 +348 @@
     // Load the HUD
     COUT(3) << "Orxonox: Loading HUD..." << std::endl;
-    orxonoxHUD_ = new HUD(1);
+    orxonoxHUD_ = &HUD::getSingleton();
 
     COUT(3) << "Orxonox: Loading Console..." << std::endl;
@@ -487 +487 @@
 //      orxonoxHUD_->setRocket2(ogreRoot.getCurrentFrameNumber());
       if (eventTimes[3].back() - eventTimes[3].front() != 0)
-        orxonoxHUD_->setFPS(50000.0f/(eventTimes[3].back() - eventTimes[3].front()));
+        HUD::setFPS(50000.0f/(eventTimes[3].back() - eventTimes[3].front()));
 
       // Iterate through all Tickables and call their tick(dt) function

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

@@ -43 +43 @@
 namespace orxonox
 {
+    ConsoleCommandShortcut(HUD, cycleRadarFocus, AccessLevel::User);
+
     using namespace Ogre;
 
-    HUD::HUD(int zoom){
+    HUD::HUD(){
         om = &Ogre::OverlayManager::getSingleton();
 
@@ -103 +105 @@
         radar->addObject(Vector3(0.0, 4000.0, 0.0));
         radar->addObject(Vector3(0.0, 0.0, 6800.0));
-        RadarOverlayElement::cycleFocus();
+    }
+
+    HUD::~HUD(){
+        //todo: clean up objects
     }
 
@@ -123 +128 @@
     }
 
-    void HUD::setFPS(float fps){
-        fpsText->setCaption("FPS: " + Ogre::StringConverter::toString(fps));
+    /*static*/HUD& HUD::getSingleton(){
+        static HUD theInstance;
+        return theInstance;
     }
 
-    HUD::~HUD(void){
+    /*static*/void HUD::setFPS(float fps){
+        HUD::getSingleton().fpsText->setCaption("FPS: " + Ogre::StringConverter::toString(fps));
+    }
+
+    /*static*/void HUD::cycleRadarFocus(){
+        HUD::getSingleton().radar->cycleFocus();
     }
 }

code/trunk/src/orxonox/hud/HUD.h

@@ -46 +46 @@
     {
         private:
+            HUD();
+            HUD(HUD& instance);
+            ~HUD();
             Ogre::OverlayManager* om;
             Ogre::Overlay* orxonoxHUD;
@@ -56 +59 @@
 
         public:
-            HUD(int zoom);
-            ~HUD();
-            void setFPS(float fps);
             virtual void tick(float);
 
+            static HUD* instance_s;
+            static HUD& getSingleton();
+            static void setFPS(float fps);
+            static void cycleRadarFocus();
     };
 }

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");
         }
         }

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

@@ -72 +72 @@
             void addObject(Vector3 pos);
             void listObjects();
+            void cycleFocus();
             float getDist2Focus();
             float calcRadius(RadarObject* obj);
@@ -81 +82 @@
                         RadarObject* lastRadarObject_;          // end of linked list
                         RadarObject* focus_;                    // object that is focussed
-
-            static RadarOverlayElement* instance_s;
-            static void cycleFocus();
         };
 }