Changeset 9667 for code/trunk/src/modules/overlays/debugging

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/debugging/DebugFPSText.cc (modified) (1 diff)
• src/modules/overlays/debugging/DebugFPSText.h (modified) (1 diff)
• src/modules/overlays/debugging/DebugRTRText.cc (modified) (1 diff)
• src/modules/overlays/debugging/DebugRTRText.h (modified) (1 diff)

code/trunk/src/modules/overlays/debugging/DebugFPSText.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(DebugFPSText);
+    RegisterClass(DebugFPSText);
 
-    DebugFPSText::DebugFPSText(BaseObject* creator) : OverlayText(creator)
+    DebugFPSText::DebugFPSText(Context* context) : OverlayText(context)
     {
         RegisterObject(DebugFPSText);

code/trunk/src/modules/overlays/debugging/DebugFPSText.h

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

code/trunk/src/modules/overlays/debugging/DebugRTRText.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(DebugRTRText);
+    RegisterClass(DebugRTRText);
 
-    DebugRTRText::DebugRTRText(BaseObject* creator) : OverlayText(creator)
+    DebugRTRText::DebugRTRText(Context* context) : OverlayText(context)
     {
         RegisterObject(DebugRTRText);

code/trunk/src/modules/overlays/debugging/DebugRTRText.h

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