+ job system

1 files changed, 6 insertions, 1 deletions

diff --git a/Editor/EditorMain.cpp b/Editor/EditorMain.cpp
index 555867a..5f16d63 100644
--- a/Editor/EditorMain.cpp
+++ b/Editor/EditorMain.cpp
@@ -7,6 +7,7 @@
 #include "Runtime/Graphics/OpenGL.h"

 #include "Editor/Scripting/EditorScripting.h"

 #include "Editor/Win/Win.h"

+#include "Runtime/Threading/Thread.h"

 

 using namespace LuaBind;

 

@@ -21,6 +22,7 @@ void InitLuaState(LuaBind::VM& vm)
 	vm.OpenLibs();

 

     LuaBind::onRegisterNativeClass = LuaHelper::OnRegisterNativeClass;

+	LuaBind::onErrorOccured = ErrorHandle;

 

 	if (!SetupGameLabEditorScripting(vm.GetMainThread()))

 	{

@@ -33,7 +35,7 @@ void InitLuaState(LuaBind::VM& vm)
 	Win::SetDllSearchDirectory(workingDir);

 

     LuaBind::State state = vm.GetMainState();

-    state.DoFile("./boot.lua", ErrorHandle);

+    state.DoFile("./boot.lua");

 }

 

 #ifdef GAMELAB_DEBUG

@@ -42,6 +44,9 @@ int main()
 int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
 #endif
 {

+	WorkThread thread;

+	thread.Resume();

+

     WindowUtil::RegisterClasses();

 

 	LuaBind::VM vm;