Вынес рендер в отдельный модуль. Сделал систему вызовов для модулй к ядру. Исправил баг в SaveMap. Убрал поддержку linux, так как трудно поддерживать обе платформы. Убрал тесты для linux.

ModuleLib/ModuleInstance.cpp

@@ -3,14 +3,18 @@
 #include <mutex>
 #include <thread>
 
-ModuleInstance::ModuleInstance(CoreInstance& core) : core_(core)
-{
-	// Init instance
-}
+#include "Core/CoreCallBacks.h"
+
+extern ModuleInstance* Factory();
+
+static std::mutex mModuleInstance;
+static ModuleInstance* module = nullptr;
+static std::thread* moduleThread;
+// Don't free. It's memory free in core
+static CoreCallBacks* callbacks_;
 
 void ModuleInstance::start()
 {
-	// Create thread
 }
 
 void ModuleInstance::stop()
@@ -18,51 +22,36 @@ void ModuleInstance::stop()
 	onStop.Call();
 }
 
-
-extern ModuleInstance* Factory(CoreInstance&);
-
-static std::mutex mModuleInstance;
-static ModuleInstance* module = nullptr;
-static std::thread* moduleThread;
-
-void InitModule(CoreInstance& core)
+void ModuleInstance::QuitGame()
 {
-    mModuleInstance.lock();
+    callbacks_->Quit();
+}
+
+void InitModule(CoreCallBacks* callbacks)
+{
+    std::lock_guard<std::mutex> lock(mModuleInstance);
+    callbacks_ = callbacks;
     if(module == nullptr)
-            module = Factory(core);
-    mModuleInstance.unlock();
+        module = Factory();
 }
 
 void StartModule()
 {
-    mModuleInstance.lock();
+    std::lock_guard<std::mutex> lock(mModuleInstance);
     if (module != nullptr)
-        moduleThread = new std::thread([&] {module->start(); });
-    mModuleInstance.unlock();
-}
-
-void StopModule()
-{
-    mModuleInstance.lock();
-    if(module != nullptr)
-    {
-        delete module;
-        module = nullptr;
-        moduleThread->detach();
-        delete moduleThread;
-    }
-    mModuleInstance.unlock();
+        moduleThread = new std::thread(&ModuleInstance::start, module);
 }
 
 void QuitModule()
 {
-    mModuleInstance.lock();
+    std::lock_guard<std::mutex> lock(mModuleInstance);
     if(module != nullptr)
     {
         module->stop();
         moduleThread->join();
         delete module;
         module = nullptr;
+        delete moduleThread;
+        moduleThread = nullptr;
     }
-    mModuleInstance.unlock();
 }

ModuleLib/ModuleInstance.h

@@ -17,39 +17,31 @@
 extern "C" {\
 EXPORT void* protect_init() {return reinterpret_cast<void*>(&InitModule);} \
 EXPORT void* protect_start() {return reinterpret_cast<void*>(&StartModule);} \
-EXPORT void* protect_stop() {return reinterpret_cast<void*>(&StopModule);} \
 EXPORT void* protect_quit() {return reinterpret_cast<void*>(&QuitModule);} \
 }\
-ModuleInstance* Factory(CoreInstance& core) { return static_cast<ModuleInstance*>(new Class(core)); }
+ModuleInstance* Factory() { return static_cast<ModuleInstance*>(new Class()); }
 
-
-class CoreInstance;
+struct CoreCallBacks;
 
 class ModuleInstance {
-	CoreInstance& core_;
-
 public:
 	Delegate<void> onStop;
 	
-	ModuleInstance(CoreInstance& core);
 	virtual ~ModuleInstance() = default;
-
-	CoreInstance& getCore() const { return core_; }
 	
 	virtual void start();
 	void stop();
+
+	void QuitGame();
 };
 
 extern "C" {
 	// Create module instance
-	EXPORT void InitModule(CoreInstance& core);
+	EXPORT void InitModule(CoreCallBacks* callbacks);
 
 	// Start module instance
 	EXPORT void StartModule();
 
-	// Destroy module instance when core unloads there
-	EXPORT void StopModule();
-
 	// Stop module when core calls this
 	EXPORT void QuitModule();
 }