Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 21:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small script engine improvements

Browse Source 
- Fixed script class name not visible in Component Editor
- Retain user assembly file system watcher (fixed deletion while handling events)
- Fixed crash when a scritp constains a List or Array (by ignoring them for now)
- Fixed Typo in Genericinst
- Scene: Invoke OnCreate for copied entity scripts
This commit is contained in:
Simon Lübeß
2023-10-28 21:48:43 +02:00
parent 909012f518
commit 38fc1f63b3
5 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Scripting/ScriptEngine.bf
+37 -25
View File
@@ -27,7 +27,6 @@ static sealed class ScriptEngineHelper
("System.UInt64", .ULong),
("System.Single", .Float),
// TODO: We probably want to switch the C#-Library to use the superior floatN-Names
("GlitchyEngine.Math.float2", .float2),
("GlitchyEngine.Math.float3", .float3),
("GlitchyEngine.Math.float4", .float4),
@@ -153,38 +152,40 @@ static class ScriptEngine
String directory = scope .();
Path.GetDirectoryPath(_appAssemblyPath, directory);
if (_userAssemblyWatcher != null) // _userAssemblyWatcher.Directory != directory
/*if (_userAssemblyWatcher != null) // _userAssemblyWatcher.Directory != directory
{
delete _userAssemblyWatcher;
}
}*/
String fileName = scope .("*/");
Path.GetFileName(_appAssemblyPath, fileName);
// TODO: Obviously don't hardcode path
_userAssemblyWatcher = new FileSystemWatcher(directory, fileName);
_userAssemblyWatcher.OnChanged.Add(new (fileName) =>
if (_userAssemblyWatcher == null)
{
// TODO: Temporary, we want to be able to reload while in play-mode. (+ Editor Scripts will be a thing some day)
if (_entityScriptInstances.Count > 0)
_userAssemblyWatcher = new FileSystemWatcher(directory, fileName);
_userAssemblyWatcher.OnChanged.Add(new (fileName) =>
{
Log.EngineLogger.Warning("There are script instances. Skipping assembly reload.");
return;
}
Log.EngineLogger.Info("Script reload requested.");
_userAssemblyWatcher.StopRaisingEvents();
Application.Instance.InvokeOnMainThread(new () =>
{
Log.EngineLogger.Info("Reloading scripts...");
ReloadAssemblies();
Log.EngineLogger.Info("Scripts reloaded!");
_userAssemblyWatcher.StartRaisingEvents();
// TODO: Temporary, we want to be able to reload while in play-mode. (+ Editor Scripts will be a thing some day)
if (_entityScriptInstances.Count > 0)
{
Log.EngineLogger.Warning("There are script instances. Skipping assembly reload.");
return;
}
Log.EngineLogger.Info("Script reload requested.");
_userAssemblyWatcher.StopRaisingEvents();
Application.Instance.InvokeOnMainThread(new () =>
{
Log.EngineLogger.Info("Reloading scripts...");
ReloadAssemblies();
Log.EngineLogger.Info("Scripts reloaded!");
_userAssemblyWatcher.StartRaisingEvents();
});
});
});
}
_userAssemblyWatcher.StartRaisingEvents();
}
@@ -628,7 +629,7 @@ static class ScriptEngine
Mono.MonoTypeEnum fieldType = Mono.Mono.mono_type_get_type(monoType);
MonoClass* monoClass = Mono.mono_type_get_class(monoType);
MonoClass* monoClass = Mono.mono_class_from_mono_type(monoType);
if (monoClass == null)
return null;
@@ -667,6 +668,17 @@ static class ScriptEngine
{
scriptType = .Struct;
}
// TODO! ?!
else if (fieldType == .Genericinst)
{
scriptType = .GenericClass;
return null;
}
else if (fieldType == .SzArray)
{
scriptType = .Array;
return null;
}
Log.EngineLogger.AssertDebug(scriptType != .None);