Changeset 1601 for code/branches/hud/src/orxonox/overlays/OverlayGroup.cc

Timestamp:

Jun 14, 2008, 6:37:12 PM (16 years ago)

Author:

rgrieder

Message:

• new folder structure for overlays:

orxonox/

…
overlays/

console/
hud/

• Navigation —> HUDNavigation
• HUD —> OverlayGroup (not yet begun with that except renaming and getHUD() instead of getSingleton())
• moved HUD.oxo (file ending should stand for orxonox overlay) to media repository in overlay folder
• fixed a bug with console noiseSize_ config value (was inverted..)

File:

• code/branches/hud/src/orxonox/overlays/OverlayGroup.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/HUD.cc) (10 diffs)

code/branches/hud/src/orxonox/overlays/OverlayGroup.cc

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "HUD.h"
+#include "OverlayGroup.h"
 
 #include <string>
@@ -44 +44 @@
 #include "objects/WorldEntity.h"
 #include "GraphicsEngine.h"
-#include "HUDBar.h"
-#include "RadarObject.h"
-#include "RadarOverlayElement.h"
-#include "Navigation.h"
+#include "hud/HUDBar.h"
+#include "hud/RadarObject.h"
+#include "hud/RadarOverlayElement.h"
+#include "hud/HUDNavigation.h"
 
 namespace orxonox
 {
-    CreateFactory(HUD);
-
-    SetConsoleCommandShortcut(HUD, cycleNavigationFocus).setAccessLevel(AccessLevel::User);
-    SetConsoleCommandShortcut(HUD, releaseNavigationFocus).setAccessLevel(AccessLevel::User);
-    SetConsoleCommand(HUD, toggleVisibility, false).setAccessLevel(AccessLevel::User);
-
-    HUD* HUD::instance_s = 0;
+    CreateFactory(OverlayGroup);
+
+    SetConsoleCommandShortcut(OverlayGroup, cycleNavigationFocus).setAccessLevel(AccessLevel::User);
+    SetConsoleCommandShortcut(OverlayGroup, releaseNavigationFocus).setAccessLevel(AccessLevel::User);
+    SetConsoleCommand(OverlayGroup, toggleVisibility, false).setAccessLevel(AccessLevel::User);
+
+    OverlayGroup* OverlayGroup::hudInstance_s = 0;
 
     using namespace Ogre;
 
-    HUD::HUD()
-    {
-        assert(instance_s == 0);
-        instance_s = this;
-        RegisterObject(HUD);
+    OverlayGroup::OverlayGroup()
+    {
+        assert(hudInstance_s == 0);
+        hudInstance_s = this;
+        RegisterObject(OverlayGroup);
 
         // Singleton like in Ogre. Constructor and destructor are public,
@@ -82 +82 @@
     }
 
-    HUD::~HUD()
+    OverlayGroup::~OverlayGroup()
     {
         if (this->isInitialized())
@@ -109 +109 @@
         }
 
-        instance_s = 0;
-    }
-
-    void HUD::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+        hudInstance_s = 0;
+    }
+
+    void OverlayGroup::XMLPort(Element& xmlElement, XMLPort::Mode mode)
     {
         BaseObject::XMLPort(xmlElement, mode);
@@ -119 +119 @@
         showRenderTime_ = true;
 
-        XMLPortObject(HUD, HUDOverlay, "", addHUDElement, getHUDElement, xmlElement, mode, false, true);
+        XMLPortObject(OverlayGroup, OrxonoxOverlay, "", addElement, getElement, xmlElement, mode, false, true);
 
         // create Factories
@@ -156 +156 @@
     }
 
-    void HUD::addHUDElement(HUDOverlay* element)
+    void OverlayGroup::addElement(OrxonoxOverlay* element)
     {
         if (hudElements_.find(element->getName()) != hudElements_.end())
@@ -166 +166 @@
     }
 
-    HUDOverlay* HUD::getHUDElement(unsigned int index)
+    OrxonoxOverlay* OverlayGroup::getElement(unsigned int index)
     {
         if (index < this->hudElements_.size())
         {
-          std::map<std::string, HUDOverlay*>::const_iterator it = hudElements_.begin();
+          std::map<std::string, OrxonoxOverlay*>::const_iterator it = hudElements_.begin();
           for (unsigned int i = 0; i != index; ++it, ++i)
             ;
@@ -179 +179 @@
     }
 
-    void HUD::tick(float dt)
+    void OverlayGroup::tick(float dt)
     {
         radar_->update();
     }
 
-    void HUD::windowResized(int newWidth, int newHeight)
+    void OverlayGroup::windowResized(int newWidth, int newHeight)
     {
         this->radar_->resize();
     }
 
-    void HUD::addRadarObject(WorldEntity* object, const ColourValue& colour){
+    void OverlayGroup::addRadarObject(WorldEntity* object, const ColourValue& colour){
         RadarObject* obj = new RadarObject(container_, object, colour);
         roSet_.insert(roSet_.end(), obj);
@@ -203 +203 @@
     }
 
-    void HUD::removeRadarObject(WorldEntity* object){
+    void OverlayGroup::removeRadarObject(WorldEntity* object){
         for(std::list<RadarObject*>::iterator it=roSet_.begin(); it!=roSet_.end(); ++it){
             if ((*it)->getObject() == object)
@@ -217 +217 @@
     }
 
-    /*static*/ HUD& HUD::getSingleton()
-    {
-        assert(instance_s);
-        return *instance_s;
-    }
-
-    /*static*/ void HUD::toggleVisibility(const std::string& name)
-    {
-        if (HUD::getSingleton().hudElements_.find(name) != HUD::getSingleton().hudElements_.end())
-        {
-            HUD::getSingleton().hudElements_[name]->setVisibility(!HUD::getSingleton().hudElements_[name]->isVisible());
-        }
-    }
-
-    /*static*/ void HUD::setEnergy(float value){
-        HUD::getSingleton().energyBar_->setValue(value);
-    }
-
-    /*static*/ void HUD::cycleNavigationFocus()
-    {
-        if (HUD::getSingleton().hudElements_.find("Navigation") != HUD::getSingleton().hudElements_.end())
-        {
-            Navigation* navi = dynamic_cast<Navigation*>(HUD::getSingleton().hudElements_["Navigation"]);
+    /*static*/ OverlayGroup& OverlayGroup::getHUD()
+    {
+        assert(hudInstance_s);
+        return *hudInstance_s;
+    }
+
+    /*static*/ void OverlayGroup::toggleVisibility(const std::string& name)
+    {
+        if (OverlayGroup::getHUD().hudElements_.find(name) != OverlayGroup::getHUD().hudElements_.end())
+        {
+            OverlayGroup::getHUD().hudElements_[name]->setVisibility(!OverlayGroup::getHUD().hudElements_[name]->isVisible());
+        }
+    }
+
+    /*static*/ void OverlayGroup::setEnergy(float value){
+        OverlayGroup::getHUD().energyBar_->setValue(value);
+    }
+
+    /*static*/ void OverlayGroup::cycleNavigationFocus()
+    {
+        if (OverlayGroup::getHUD().hudElements_.find("Navigation") != OverlayGroup::getHUD().hudElements_.end())
+        {
+            HUDNavigation* navi = dynamic_cast<HUDNavigation*>(OverlayGroup::getHUD().hudElements_["Navigation"]);
             navi->cycleFocus();
         }
     }
 
-    /*static*/ void HUD::releaseNavigationFocus(){
-        //HUD::getSingleton().nav_->releaseFocus();
+    /*static*/ void OverlayGroup::releaseNavigationFocus(){
+        //OverlayGroup::getHUD().nav_->releaseFocus();
     }
 }