Changeset 3192 for code/branches/pch/src/orxonox/overlays/hud

Timestamp:

Jun 18, 2009, 10:00:15 AM (16 years ago)

Author:

rgrieder

Message:

Replaced <OgrePrerequisites.h> with "util/OgreForwardRefs.h": I haven't yet realised that OgrePrerequisites.h includes about every single std header by including the OgreMemoryManager.h file.
And while at it, I took care of some type conversions (partially revealed by the missing OgrePrerequisites.h that disabled warnings)

Location:

code/branches/pch/src/orxonox/overlays/hud

Files:

• HUDBar.cc (modified) (1 diff)
• HUDBar.h (modified) (1 diff)
• HUDNavigation.h (modified) (1 diff)
• HUDRadar.h (modified) (1 diff)
• UnderAttackHealthBar.cc (modified) (1 diff)

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

@@ -78 +78 @@
         this->textureUnitState_->setTextureName("bar2.tga");
         // use the default colour
-        this->textureUnitState_->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, ColourValue(0.2, 0.7, 0.2));
+        this->textureUnitState_->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, ColourValue(0.2f, 0.7f, 0.2f));
 
         this->bar_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()

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

@@ -36 +36 @@
 #include <map>
 #include <vector>
-#include <OgrePrerequisites.h>
 
 #include "util/Math.h"
+#include "util/OgreForwardRefs.h"
 #include "core/BaseObject.h"
 #include "overlays/OrxonoxOverlay.h"

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
 #include "interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"

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

@@ -35 +35 @@
 #include <map>
 #include <vector>
-#include <OgrePrerequisites.h>
 
+#include "util/OgreForwardRefs.h"
 #include "interfaces/RadarListener.h"
 #include "interfaces/RadarViewable.h"

code/branches/pch/src/orxonox/overlays/hud/UnderAttackHealthBar.cc

@@ -47 +47 @@
         this->text_ = new OverlayText(this);
         this->text_->setFont("Monofur");
-        this->text_->setTextSize(0.04);
+        this->text_->setTextSize(0.04f);
         this->text_->setAlignmentString("center");
         this->text_->setColour(ColourValue::White);