Changeset 1410 for code/branches/network/src/orxonox/hud/HUD.cc

Timestamp:

May 24, 2008, 3:38:39 PM (16 years ago)

Author:

rgrieder

Message:

• converted tabs to spaces in HUD
• adjusted msvc project

File:

• code/branches/network/src/orxonox/hud/HUD.cc (modified) (5 diffs)

code/branches/network/src/orxonox/hud/HUD.cc

@@ -26 +26 @@
 */
 
-#include <string.h>
 #include "OrxonoxStableHeaders.h"
+#include "HUD.h"
+
+#include <string>
 #include <OgreOverlay.h>
 #include <OgreOverlayContainer.h>
@@ -37 +39 @@
 #include "objects/SpaceShip.h"
 #include "BarOverlayElement.h"
+#include "RadarObject.h"
 #include "RadarOverlayElement.h"
+#include "Navigation.h"
 #include "OverlayElementFactories.h"
-#include "HUD.h"
 
 namespace orxonox
@@ -52 +55 @@
         lastRadarObject = NULL;
 
-                // create Factories
+        // create Factories
         BarOverlayElementFactory *barOverlayElementFactory = new BarOverlayElementFactory();
         om->addOverlayElementFactory(barOverlayElementFactory);
@@ -84 +87 @@
         nav = new Navigation(container);
 
-                // set up screen-wide container
+        // set up screen-wide container
         container->show();
 
@@ -144 +147 @@
     }
 
-    /*static*/HUD& HUD::getSingleton(){
+    /*static*/ HUD& HUD::getSingleton(){
         static HUD theInstance;
         return theInstance;
     }
 
-    /*static*/void HUD::setFPS(float fps){
+    /*static*/ void HUD::setFPS(float fps){
         HUD::getSingleton().fpsText->setCaption("FPS: " + Ogre::StringConverter::toString(fps));
     }
 
-    /*static*/void HUD::setEnergy(float value){
+    /*static*/ void HUD::setEnergy(float value){
         HUD::getSingleton().energyBar->setValue(value);
     }
 
-    /*static*/void HUD::cycleNavigationFocus(){
+    /*static*/ void HUD::cycleNavigationFocus(){
         HUD::getSingleton().nav->cycleFocus();
     }