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

Timestamp:

Nov 1, 2008, 7:04:09 PM (16 years ago)

Author:

landauf

Message:

merged objecthierarchy 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) (1 diff)
• src/orxonox/overlays/debug/DebugRTRText.cc (modified) (2 diffs)
• src/orxonox/overlays/debug/DebugRTRText.h (modified) (1 diff)

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

@@ -38 +38 @@
     CreateFactory(DebugFPSText);
 
-    DebugFPSText::DebugFPSText()
+    DebugFPSText::DebugFPSText(BaseObject* creator) : OverlayText(creator)
     {
         RegisterObject(DebugFPSText);
@@ -50 +50 @@
     {
         float fps = GraphicsEngine::getInstance().getAverageFramesPerSecond();
-        this->text_->setCaption(this->getCaption() + convertToString(fps));
+        this->setCaption(convertToString(fps));
     }
 }

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

@@ -40 +40 @@
     {
     public:
-        DebugFPSText();
+        DebugFPSText(BaseObject* creator);
         ~DebugFPSText();
 

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

@@ -38 +38 @@
     CreateFactory(DebugRTRText);
 
-    DebugRTRText::DebugRTRText()
+    DebugRTRText::DebugRTRText(BaseObject* creator) : OverlayText(creator)
     {
         RegisterObject(DebugRTRText);
@@ -50 +50 @@
     {
         float rtr = GraphicsEngine::getInstance().getAverageTickTime();
-        this->text_->setCaption(this->getCaption() + convertToString(rtr));
+        this->setCaption(convertToString(rtr));
     }
 }

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

@@ -40 +40 @@
     {
     public:
-        DebugRTRText();
+        DebugRTRText(BaseObject* creator);
         ~DebugRTRText();