Changeset 1590 for code/branches/hud/src/orxonox/hud/HUD.cc

Timestamp:

Jun 12, 2008, 12:57:45 AM (16 years ago)

Author:

rgrieder

Message:

svn save, just in case our house burns down over night…

File:

• code/branches/hud/src/orxonox/hud/HUD.cc (modified) (5 diffs)

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

@@ -107 +107 @@
                 Ogre::OverlayManager::getSingleton().destroy(this->orxonoxHUD_);
             this->orxonoxHUD_ = 0;
-
-            if (this->nav_)
-                delete this->nav_;
-            this->nav_ = 0;
         }
 
@@ -143 +139 @@
         radar_->init(0.5, 0.9, 0.2, container_);
 
-        // create Navigation
-        nav_ = new Navigation(container_);
-
         WorldEntity* object;
         object = new WorldEntity();
@@ -189 +182 @@
     {
         radar_->update();
-        nav_->update();
-    }
-
-    void HUD::resize()
+    }
+
+    void HUD::windowResized(int newWidth, int newHeight)
     {
         this->radar_->resize();
@@ -215 +207 @@
             if ((*it)->getObject() == object)
             {
-                if (this->nav_ && this->nav_->getFocus() == (*it))
-                    this->nav_->releaseFocus();
+                /*if (this->nav_ && this->nav_->getFocus() == (*it))
+                    this->nav_->releaseFocus();*/
 
                 delete (*it);
@@ -243 +235 @@
     }
 
-    /*static*/ void HUD::cycleNavigationFocus(){
-        HUD::getSingleton().nav_->cycleFocus();
+    /*static*/ void HUD::cycleNavigationFocus()
+    {
+        if (HUD::getSingleton().hudElements_.find("Navigation") != HUD::getSingleton().hudElements_.end())
+        {
+            Navigation* navi = dynamic_cast<Navigation*>(HUD::getSingleton().hudElements_["Navigation"]);
+            navi->cycleFocus();
+        }
     }
 
     /*static*/ void HUD::releaseNavigationFocus(){
-        HUD::getSingleton().nav_->releaseFocus();
+        //HUD::getSingleton().nav_->releaseFocus();
     }
 }