Changeset 2019 for code/branches/objecthierarchy/src/orxonox/overlays/hud

Timestamp:

Oct 27, 2008, 4:08:51 AM (16 years ago)

Author:

landauf

Message:

many changes, most important: BaseObject takes now a pointer to it's creator which is needed to build a level hierarchy (with different scenes)

Location:

code/branches/objecthierarchy/src/orxonox/overlays/hud

Files:

• ChatOverlay.cc (modified) (3 diffs)
• ChatOverlay.h (modified) (1 diff)
• HUDBar.cc (modified) (4 diffs)
• HUDBar.h (modified) (2 diffs)
• HUDNavigation.cc (modified) (4 diffs)
• HUDNavigation.h (modified) (1 diff)
• HUDRadar.cc (modified) (4 diffs)
• HUDRadar.h (modified) (1 diff)
• HUDSpeedBar.cc (modified) (1 diff)
• HUDSpeedBar.h (modified) (1 diff)

code/branches/objecthierarchy/src/orxonox/overlays/hud/ChatOverlay.cc

@@ -39 +39 @@
 
 #include "GraphicsEngine.h"
-#include "objects/infos/Level.h"
+#include "LevelManager.h"
 #include "objects/infos/PlayerInfo.h"
 #include "overlays/console/InGameConsole.h"
@@ -50 +50 @@
     CreateFactory(ChatOverlay);
 
-    ChatOverlay::ChatOverlay()
+    ChatOverlay::ChatOverlay(BaseObject* creator) : OverlayText(creator)
     {
         RegisterObject(ChatOverlay);
@@ -76 +76 @@
             std::string name = "unknown";
 
-            PlayerInfo* player = Level::getClient(senderID);
+            PlayerInfo* player = LevelManager::getInstance().getClient(senderID);
             if (player)
                 name = player->getName();

code/branches/objecthierarchy/src/orxonox/overlays/hud/ChatOverlay.h

@@ -42 +42 @@
     {
         public:
-            ChatOverlay();
+            ChatOverlay(BaseObject* creator);
             ~ChatOverlay();
 

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDBar.cc

@@ -38 +38 @@
 
 #include "util/Convert.h"
+#include "util/String.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -45 +46 @@
     CreateFactory(BarColour);
 
-    BarColour::BarColour()
-        : position_(0.0)
+    BarColour::BarColour(BaseObject* creator) : BaseObject(creator), position_(0.0)
     {
         RegisterObject(BarColour);
@@ -63 +63 @@
     unsigned int HUDBar::materialcount_s = 0;
 
-    HUDBar::HUDBar()
-        : bar_(0)
-        , textureUnitState_(0)
+    HUDBar::HUDBar(BaseObject* creator) : OrxonoxOverlay(creator), bar_(0), textureUnitState_(0)
     {
         RegisterObject(HUDBar);
@@ -92 +90 @@
 
             this->bar_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("Panel", "HUDBar_bar_" + getUniqueNumberStr()));
+                .createOverlayElement("Panel", "HUDBar_bar_" + getUniqueNumberString()));
             this->bar_->setMaterialName(materialname);
             this->background_->addChild(bar_);

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDBar.h

@@ -44 +44 @@
     {
     public:
-        BarColour();
+        BarColour(BaseObject* creator);
         ~BarColour() { }
 
@@ -64 +64 @@
     {
     public:
-        HUDBar();
+        HUDBar(BaseObject* creator);
         virtual ~HUDBar();
 

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -46 +46 @@
     CreateFactory(HUDNavigation);
 
-    HUDNavigation::HUDNavigation()
-        : navMarker_(0)
+    HUDNavigation::HUDNavigation(BaseObject* creator)
+        : OrxonoxOverlay(creator)
+        , navMarker_(0)
         , aimMarker_(0)
         , navText_(0)
@@ -72 +73 @@
             // create nav text
             navText_ = static_cast<Ogre::TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("TextArea", "HUDNavigation_navText_" + getUniqueNumberStr()));
+                .createOverlayElement("TextArea", "HUDNavigation_navText_" + getUniqueNumberString()));
 
             // create nav marker
             navMarker_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("Panel", "HUDNavigation_navMarker_" + getUniqueNumberStr()));
+                .createOverlayElement("Panel", "HUDNavigation_navMarker_" + getUniqueNumberString()));
             navMarker_->setMaterialName("Orxonox/NavArrows");
             wasOutOfView_ = true; // just to ensure the material is changed right the first time..
@@ -82 +83 @@
             // create aim marker
             aimMarker_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("Panel", "HUDNavigation_aimMarker_" + getUniqueNumberStr()));
+                .createOverlayElement("Panel", "HUDNavigation_aimMarker_" + getUniqueNumberString()));
             aimMarker_->setMaterialName("Orxonox/NavCrosshair");
 
@@ -112 +113 @@
             return this->navText_->getFontName();
         else
-            return blankString;
+            return BLANKSTRING;
     }
 

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDNavigation.h

@@ -41 +41 @@
     {
     public:
-        HUDNavigation();
+        HUDNavigation(BaseObject* creator);
         ~HUDNavigation();
 

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDRadar.cc

@@ -35 +35 @@
 
 #include "util/Math.h"
+#include "util/String.h"
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
@@ -45 +46 @@
     CreateFactory(HUDRadar);
 
-    HUDRadar::HUDRadar()
-        : marker_(0)
+    HUDRadar::HUDRadar(BaseObject* creator) : OrxonoxOverlay(creator), marker_(0)
     {
         RegisterObject(HUDRadar);
@@ -69 +69 @@
         {
             marker_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("Panel", "HUDRadar_marker_" + getUniqueNumberStr()));
+                .createOverlayElement("Panel", "HUDRadar_marker_" + getUniqueNumberString()));
             marker_->setMaterialName("Orxonox/RadarMarker");
             overlay_->add2D(marker_);
@@ -107 +107 @@
             // we have to create a new entry
             panel = static_cast<Ogre::PanelOverlayElement*>(
-                Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "RadarDot" + getUniqueNumberStr()));
+                Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "RadarDot" + getUniqueNumberString()));
             radarDots_.push_back(panel);
             // get right material

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDRadar.h

@@ -45 +45 @@
     {
     public:
-        HUDRadar();
+        HUDRadar(BaseObject* creator);
         ~HUDRadar();
 

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDSpeedBar.cc

@@ -36 +36 @@
     CreateFactory(HUDSpeedBar);
 
-    HUDSpeedBar::HUDSpeedBar()
+    HUDSpeedBar::HUDSpeedBar(BaseObject* creator) : HUDBar(creator)
     {
         RegisterObject(HUDSpeedBar);

code/branches/objecthierarchy/src/orxonox/overlays/hud/HUDSpeedBar.h

@@ -41 +41 @@
     {
     public:
-        HUDSpeedBar();
+        HUDSpeedBar(BaseObject* creator);
         ~HUDSpeedBar();