Changeset 9658 for code/branches

Timestamp:

Aug 18, 2013, 4:41:37 PM (11 years ago)

Author:

landauf

Message:

register remaining classes in framework

Location:

code/branches/core6/src/libraries

Files:

• core/Core.cc (modified) (1 diff)
• core/command/Shell.cc (modified) (1 diff)
• core/command/Shell.h (modified) (1 diff)
• core/input/InputBuffer.cc (modified) (1 diff)
• network/NetworkFunction.cc (modified) (1 diff)
• tools/Shader.cc (modified) (1 diff)
• tools/Timer.cc (modified) (1 diff)

code/branches/core6/src/libraries/core/Core.cc

@@ -92 +92 @@
 #endif
 
+    // register Core as an abstract class to avoid problems if the class hierarchy is created within Core-constructor
+    RegisterAbstractClass(Core).inheritsFrom(Class(Configurable));
+
     Core::Core(const std::string& cmdLine)
         : pathConfig_(NULL)

code/branches/core6/src/libraries/core/command/Shell.cc

@@ -55 +55 @@
         const OutputLevel User = level::user_info;
     }
+
+    RegisterClassNoArgs(Shell);
 
     /**

code/branches/core6/src/libraries/core/command/Shell.h

@@ -109 +109 @@
             };
 
-            Shell(const std::string& consoleName, bool bScrollable);
+            Shell(const std::string& consoleName = "", bool bScrollable = true);
             ~Shell();
 

code/branches/core6/src/libraries/core/input/InputBuffer.cc

@@ -35 +35 @@
 namespace orxonox
 {
+    RegisterClassNoArgs(InputBuffer);
+
     InputBuffer::InputBuffer()
     {

code/branches/core6/src/libraries/network/NetworkFunction.cc

@@ -36 +36 @@
   std::map<NetworkFunctionPointer, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::functorMap_;
   std::map<uint32_t, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::idMap_;
+
+  // no suitable factory for NetworkFunctionBase (and children), so we declare it abstract
+  RegisterAbstractClass(NetworkFunctionBase).inheritsFrom(Class(Listable));
+  RegisterAbstractClass(NetworkFunctionStatic).inheritsFrom(Class(NetworkFunctionBase));
+  RegisterAbstractClass(NetworkMemberFunctionBase).inheritsFrom(Class(NetworkFunctionBase));
 
   NetworkFunctionBase::NetworkFunctionBase(const std::string& name)

code/branches/core6/src/libraries/tools/Shader.cc

@@ -39 +39 @@
 namespace orxonox
 {
+    RegisterClassNoArgs(Shader);
+
     /**
         @brief Initializes the values and sets the scene manager.

code/branches/core6/src/libraries/tools/Timer.cc

@@ -131 +131 @@
         }
     }
+
+    RegisterClassNoArgs(Timer);
 
     /**