Changeset 10392 for code/branches/core7/src/libraries/core/Core.cc

Timestamp:

Apr 23, 2015, 10:44:57 PM (9 years ago)

Author:

landauf

Message:

Loader is now a singleton instead of a static class. fixes issue with statically initialized ClassTreeMask (which again requires a BaseObject-Identifier)

File:

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

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

@@ -70 +70 @@
 #include "class/Identifier.h"
 #include "Language.h"
+#include "Loader.h"
 #include "LuaState.h"
 #include "command/ConsoleCommandManager.h"
@@ -102 +103 @@
         , configFileManager_(NULL)
         , languageInstance_(NULL)
+        , loaderInstance_(NULL)
         , ioConsole_(NULL)
         , tclBind_(NULL)
@@ -208 +210 @@
         IdentifierManager::getInstance().createClassHierarchy();
 
+        // Loader
+        this->loaderInstance_ = new Loader();
+
         // Load OGRE excluding the renderer and the render window
         orxout(internal_info) << "creating GraphicsManager:" << endl;
@@ -253 +258 @@
         safeObjectDelete(&tclBind_);
         safeObjectDelete(&ioConsole_);
+        safeObjectDelete(&loaderInstance_);
         safeObjectDelete(&languageInstance_);
         safeObjectDelete(&configFileManager_);