Changeset 9667 for code/trunk/src/libraries/tools/interfaces

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/libraries/tools/interfaces/Tickable.h (modified) (1 diff)
• src/libraries/tools/interfaces/TimeFactorListener.h (modified) (1 diff)
• src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) (3 diffs)

code/trunk/src/libraries/tools/interfaces/Tickable.h

@@ -44 +44 @@
 #include "tools/ToolsPrereqs.h"
 
-#include "core/OrxonoxClass.h"
-#include "core/Super.h"
+#include "core/class/OrxonoxInterface.h"
+#include "core/class/Super.h"
 
 namespace orxonox
 {
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
-    class _ToolsExport Tickable : virtual public OrxonoxClass
+    class _ToolsExport Tickable : virtual public OrxonoxInterface
     {
         public:

code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h

@@ -31 +31 @@
 
 #include "tools/ToolsPrereqs.h"
-#include "core/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
 {
-    class _ToolsExport TimeFactorListener : virtual public OrxonoxClass
+    class _ToolsExport TimeFactorListener : virtual public Listable
     {
         public:

code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc

@@ -46 +46 @@
     float TimeFactorListener::timefactor_s = 1.0f;
 
+    RegisterAbstractClass(TimeFactorListener).inheritsFrom(Class(Listable));
+
     TimeFactorListener::TimeFactorListener()
     {
-        RegisterRootObject(TimeFactorListener);
+        RegisterObject(TimeFactorListener);
     }
 
@@ -65 +67 @@
     // Tickable
     //----------------------------
+    RegisterAbstractClass(Tickable).inheritsFrom(Class(OrxonoxInterface));
+
     /**
         @brief Constructor: Registers the object in the Tickable-list
@@ -70 +74 @@
     Tickable::Tickable()
     {
-        RegisterRootObject(Tickable);
+        RegisterObject(Tickable);
     }
 }