|
|
@@ -58,28 +58,13 @@ void CoreServices::setInstance(CoreServices *_instance) {
|
|
|
Logger::log("Overriding core instance to %d...\n", _instance);
|
|
|
}
|
|
|
|
|
|
-CoreServices* CoreServices::getInstance() {
|
|
|
-
|
|
|
- if(overrideInstance) {
|
|
|
- return overrideInstance;
|
|
|
- }
|
|
|
+void CoreServices::createInstance() {
|
|
|
+ overrideInstance = new CoreServices;
|
|
|
+ Logger::log("Creating new core services instance...\n");
|
|
|
+}
|
|
|
|
|
|
-//#ifdef _WINDOWS
|
|
|
- overrideInstance = new CoreServices;
|
|
|
- Logger::log("Creating new core services instance...\n");
|
|
|
- return overrideInstance;
|
|
|
-//#else
|
|
|
-// long threadID = getThreadID();
|
|
|
-// CoreServices *instance;
|
|
|
-// if(instanceMap.find(threadID) == instanceMap.end()) {
|
|
|
-// Logger::log("Creating new core services instance...\n");
|
|
|
-// instance = new CoreServices;
|
|
|
-// instanceMap[threadID] = instance;
|
|
|
-// } else {
|
|
|
-// instance = instanceMap[threadID];
|
|
|
-// }
|
|
|
-// return instance;
|
|
|
-//#endif
|
|
|
+CoreServices* CoreServices::getInstance() {
|
|
|
+ return overrideInstance;
|
|
|
}
|
|
|
|
|
|
MaterialManager *CoreServices::getMaterialManager() {
|