Changeset 3196 for code/trunk/src/orxonox/overlays/debug

Timestamp:

Jun 20, 2009, 9:20:47 AM (16 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/debug/DebugFPSText.cc (modified) (2 diffs)
• src/orxonox/overlays/debug/DebugFPSText.h (modified) (2 diffs)
• src/orxonox/overlays/debug/DebugRTRText.cc (modified) (2 diffs)
• src/orxonox/overlays/debug/DebugRTRText.h (modified) (2 diffs)

code/trunk/src/orxonox/overlays/debug/DebugFPSText.cc

@@ -28 +28 @@
 
 #include "DebugFPSText.h"
-#include <OgreTextAreaOverlayElement.h>
+
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
@@ -51 +51 @@
 
         float fps = Game::getInstance().getAvgFPS();
-        this->setCaption(convertToString(fps));
+        this->setCaption(multi_cast<std::string>(fps));
     }
 }

code/trunk/src/orxonox/overlays/debug/DebugFPSText.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
 
 namespace orxonox
@@ -41 +41 @@
     public:
         DebugFPSText(BaseObject* creator);
-        ~DebugFPSText();
+        virtual ~DebugFPSText();
 
         virtual void tick(float dt);

code/trunk/src/orxonox/overlays/debug/DebugRTRText.cc

@@ -28 +28 @@
 
 #include "DebugRTRText.h"
-#include <OgreTextAreaOverlayElement.h>
+
+#include "util/Convert.h"
 #include "core/CoreIncludes.h"
-#include "util/Convert.h"
 #include "core/Game.h"
 
@@ -51 +51 @@
 
         float rtr = Game::getInstance().getAvgTickTime();
-        this->setCaption(convertToString(rtr));
+        this->setCaption(multi_cast<std::string>(rtr));
     }
 }

code/trunk/src/orxonox/overlays/debug/DebugRTRText.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
 
 namespace orxonox
@@ -41 +41 @@
     public:
         DebugRTRText(BaseObject* creator);
-        ~DebugRTRText();
+        virtual ~DebugRTRText();
 
         virtual void tick(float dt);