Changeset 825

Timestamp:

Feb 17, 2008, 6:26:23 PM (16 years ago)

Author:

nicolasc

Message:

created error output, up to chai to fix it

Location:

code/branches/hud/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Orxonox.cc (modified) (2 diffs)
• hud/Bar.cc (modified) (1 diff)
• hud/Bar.h (modified) (1 diff)

code/branches/hud/src/orxonox/CMakeLists.txt

@@ -5 +5 @@
   SpaceshipSteering.cc
   hud/HUD.cc
+  hud/Bar.cc
   particle/ParticleInterface.cc
   tools/BillboardSet.cc

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

@@ -398 +398 @@
     Ogre::Overlay* hudOverlay = overlayManager.create("orxonoxsuperoverlay");
 
-    hud::Bar* newBar = static_cast<hud::Bar*>(overlayManager.createOverlayElement("Panel", "Bar"));
+    Bar* newBar = static_cast<Bar*>(overlayManager.createOverlayElement("Panel", "Bar"));
     newBar->setLeft(0);
     newBar->setTop(0);
@@ -405 +405 @@
     newBar->setMaterialName("Orxonox/Red");
     newBar->setMetricsMode(Ogre::GMM_PIXELS);
-    newBar->setPercentage(0.8);
+    newBar->setPercentage((Ogre::Real)0.8);
     newBar->show();
 

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

@@ -34 +34 @@
 #include "Bar.h"
 
-namespace hud
+namespace orxonox
 {
   using namespace Ogre;

code/branches/hud/src/orxonox/hud/Bar.h

@@ -39 +39 @@
 
 
-namespace hud
+// namespace hud
+namespace orxonox
 {
   class Bar : public Ogre::OverlayElement
   {
   private:
-    float percentage_;
+    double percentage_;
     bool horz_;
     Ogre::ColourValue color_;