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

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

Files:

• OrxonoxOverlay.cc (modified) (3 diffs)
• OrxonoxOverlay.h (modified) (1 diff)
• OverlayGroup.h (modified) (1 diff)
• OverlayText.h (modified) (1 diff)
• console/InGameConsole.h (modified) (1 diff)
• hud/HUDBar.cc (modified) (1 diff)
• hud/HUDBar.h (modified) (1 diff)
• hud/HUDNavigation.h (modified) (1 diff)
• hud/HUDRadar.h (modified) (1 diff)
• hud/UnderAttackHealthBar.cc (modified) (1 diff)
• notifications/NotificationQueue.cc (modified) (1 diff)
• stats/Stats.h (modified) (1 diff)

code/branches/pch/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -215 +215 @@
             if (angle < 0.0)
                 angle = -angle;
-            angle -= 180.0 * (int)(angle / 180.0);
+            angle -= 180.0f * (int)(angle / 180.0);
 
             // take the reverse if angle is about 90 degrees
             float tempAspect;
-            if (angle > 89.0 && angle < 91.0)
+            if (angle > 89.0f && angle < 91.0f)
             {
                 tempAspect = 1.0 / this->windowAspectRatio_;
@@ -231 +231 @@
             else
             {
-                tempAspect = 1.0;
+                tempAspect = 1.0f;
                 rotState_ = Inbetween;
             }
@@ -238 +238 @@
             // magnitude of the width is about the magnitude of the height.
             // Correctly we would have to take the square root of width*height
-            this->sizeCorrection_.x = 2.0 / (tempAspect + 1.0);
+            this->sizeCorrection_.x = 2.0f / (tempAspect + 1.0f);
             this->sizeCorrection_.y = tempAspect * this->sizeCorrection_.x;
         }

code/branches/pch/src/orxonox/overlays/OrxonoxOverlay.h

@@ -38 +38 @@
 
 #include <string>
-#include <OgrePrerequisites.h>
 
 #include "util/Math.h"
+#include "util/OgreForwardRefs.h"
 #include "core/BaseObject.h"
 #include "interfaces/WindowEventListener.h"

code/branches/pch/src/orxonox/overlays/OverlayGroup.h

@@ -38 +38 @@
 
 #include <set>
-#include <OgrePrerequisites.h>
 #include "util/Math.h"
+#include "util/OgreForwardRefs.h"
 #include "core/BaseObject.h"
 

code/branches/pch/src/orxonox/overlays/OverlayText.h

@@ -34 +34 @@
 #include <string>
 #include "util/Math.h"
+#include "util/OgreForwardRefs.h"
 #include "OrxonoxOverlay.h"
 

code/branches/pch/src/orxonox/overlays/console/InGameConsole.h

@@ -34 +34 @@
 
 #include <string>
+#include "util/OgreForwardRefs.h"
 #include "core/Shell.h"
 #include "interfaces/WindowEventListener.h"

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

code/branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc

@@ -48 +48 @@
     const std::string NotificationQueue::DEFAULT_FONT = "VeraMono";
     const Vector2 NotificationQueue::DEFAULT_POSITION = Vector2(0.0,0.0);
-    const float NotificationQueue::DEFAULT_FONT_SIZE  = 0.025;
+    const float NotificationQueue::DEFAULT_FONT_SIZE  = 0.025f;
 
     /**

code/branches/pch/src/orxonox/overlays/stats/Stats.h

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