Changeset 10518 for code/branches/core7/src/libraries/core/Core.h

Timestamp:

May 31, 2015, 10:56:32 AM (9 years ago)

Author:

landauf

Message:

load modules AFTER core was initialized. load each module with a separate ModuleInstance. unloading is not yet implemented…

File:

• code/branches/core7/src/libraries/core/Core.h (modified) (4 diffs)

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

@@ -60 +60 @@
     {
         friend class Singleton<Core>;
-        friend class Game;
 
         public:
@@ -77 +76 @@
             void destroy();
 
+            void preUpdate(const Clock& time);
+            void postUpdate(const Clock& time);
+
+            void loadGraphics();
+            void unloadGraphics();
+
+            void loadModules();
+            void unloadModules();
+            void loadModule(ModuleInstance* module);
+            void unloadModule(ModuleInstance* module);
+
             inline CoreConfig* getConfig() const
                 { return this->config_; }
@@ -82 +92 @@
         private:
             Core(const Core&); //!< Don't use (undefined symbol)
-
-            void preUpdate(const Clock& time);
-            void postUpdate(const Clock& time);
-
-            void loadGraphics();
-            void unloadGraphics();
 
             void setThreadAffinity(int limitToCPU);
@@ -108 +112 @@
             Scope<ScopeID::GRAPHICS>* graphicsScope_;
             bool                      bGraphicsLoaded_;
+            ModuleInstance*           rootModule_;
+            std::list<ModuleInstance*>modules_;
 
             /// Helper object that stores the config values