Changeset 10342 for code/branches

Timestamp:

Apr 4, 2015, 1:24:49 PM (10 years ago)

Author:

landauf

Message:

added helper class for module initialization

Location:

code/branches/core7/src/libraries/core

Files:

• CMakeLists.txt (modified) (1 diff)
• Core.cc (modified) (2 diffs)
• CorePrereqs.h (modified) (2 diffs)
• module (added)
• module/CMakeLists.txt (added)
• module/ModuleInstance.cc (added)
• module/ModuleInstance.h (added)
• module/StaticallyInitializedInstance.cc (added)
• module/StaticallyInitializedInstance.h (added)

code/branches/core7/src/libraries/core/CMakeLists.txt

@@ -66 +66 @@
 ADD_SUBDIRECTORY(config)
 ADD_SUBDIRECTORY(input)
+ADD_SUBDIRECTORY(module)
 ADD_SUBDIRECTORY(object)
 

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

@@ -77 +77 @@
 #include "input/InputManager.h"
 #include "object/ObjectList.h"
+#include "module/ModuleInstance.h"
 
 namespace orxonox
@@ -139 +140 @@
         }
 
+        ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+
         // Parse command line arguments AFTER the modules have been loaded (static code!)
         CommandLineParser::parse(cmdLine);

code/branches/core7/src/libraries/core/CorePrereqs.h

@@ -169 +169 @@
     class MemoryArchive;
     class MemoryArchiveFactory;
+    class ModuleInstance;
     class Namespace;
     class NamespaceNode;
@@ -187 +188 @@
     template <class T>
     class SmartPtr;
+    class StaticallyInitializedInstance;
     template <class T>
     class SubclassIdentifier;