Initialize ScriptGlue whenever ScriptEngine loads assemblies

This commit is contained in:
Simon Lübeß
2023-12-26 02:01:14 +01:00
parent a4c311c2e4
commit 2e82f24fd7
+3 -2
View File
@@ -214,7 +214,6 @@ static class ScriptEngine
public static void Init() public static void Init()
{ {
InitMono(); InitMono();
ScriptGlue.Init();
LoadScriptAssemblies(); LoadScriptAssemblies();
} }
@@ -304,6 +303,8 @@ static class ScriptEngine
{ {
Debug.Profiler.ProfileFunction!(); Debug.Profiler.ProfileFunction!();
ScriptGlue.Init();
CreateAppDomain("GlitchyEngineScriptRuntime"); CreateAppDomain("GlitchyEngineScriptRuntime");
(s_CoreAssembly, s_CoreAssemblyImage) = LoadAssembly("resources/scripts/ScriptCore.dll", _debuggingEnabled); (s_CoreAssembly, s_CoreAssemblyImage) = LoadAssembly("resources/scripts/ScriptCore.dll", _debuggingEnabled);
@@ -844,7 +845,7 @@ static class ScriptEngine
#unwarn #unwarn
void*[2] args = .(&entityId, monoReflectionType); void*[2] args = .(&entityId, monoReflectionType);
let method = Classes.EntityEditor.GetMethod("ShowDefaultEntityEditor", 2); let method = Classes.EntityEditor.GetMethod("ShowDefaultEntityEditor", 2);
Classes.EntityEditor.Invoke(method, null, &args); Classes.EntityEditor.Invoke(method, null, &args);