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

Refactored ScriptEngine

Browse Source
This commit is contained in:
Simon Lübeß
2024-03-31 11:55:39 +02:00
parent 1279dc0a66
commit abcacc84a9
2 changed files with 12 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Scripting/ScriptClass.bf
+2 -5
View File
@@ -26,8 +26,6 @@ abstract class SharpType : RefCounter
_className = new String(className);
_fullName = new $"{_namespace}.{_className}";
_scriptType = scriptType;
ScriptEngine.RegisterSharpType(this);
}
}
@@ -110,9 +108,8 @@ class ScriptClass : SharpClass
// TODO: This is only relevant for the editor!
MonoCustomAttrInfo* attributes = Mono.mono_custom_attrs_from_class(_monoClass);
if (attributes != null)
_runInEditMode = Mono.mono_custom_attrs_has_attr(attributes, ScriptEngine.Attributes.s_RunInEditModeAttribute);
if (attributes != null && ScriptEngine.Classes.RunInEditModeAttribute != null)
_runInEditMode = Mono.mono_custom_attrs_has_attr(attributes, ScriptEngine.Classes.RunInEditModeAttribute._monoClass);
}
private MonoMethod* FindConstructor()
GlitchyEngine/src/Scripting/ScriptEngine.bf
+9 -59
View File
@@ -27,6 +27,8 @@ class EngineClasses
private ScriptClass s_Collision2D ~ _?.ReleaseRef();
private ScriptClass s_RunInEditModeAttribute ~ _?.ReleaseRef();
public ScriptClass ComponentRoot => s_ComponentRoot;
public ScriptClass EntityRoot => s_EntityRoot;
public ScriptClass EngineObject => s_EngineObject;
@@ -37,6 +39,8 @@ class EngineClasses
public ScriptClass Collision2D => s_Collision2D;
public ScriptClass RunInEditModeAttribute => s_RunInEditModeAttribute;
internal void ReleaseAndNullify()
{
ReleaseRefAndNullify!(s_EngineObject);
@@ -49,6 +53,8 @@ class EngineClasses
ReleaseRefAndNullify!(s_SerializationContext);
ReleaseRefAndNullify!(s_Collision2D);
ReleaseRefAndNullify!(s_RunInEditModeAttribute);
}
internal void LoadClasses(MonoImage* image)
@@ -65,6 +71,9 @@ class EngineClasses
s_EntitySerializer = new ScriptClass("GlitchyEngine.Serialization", "EntitySerializer", image, .Class);
s_Collision2D = new ScriptClass("GlitchyEngine.Physics", "Collision2D", image, .Struct);
// Attributes
s_RunInEditModeAttribute = new ScriptClass("GlitchyEngine.Editor", "RunInEditModeAttribute", image, .Struct);
}
}
@@ -85,10 +94,7 @@ static class ScriptEngine
public static EngineClasses Classes => _classes;
private static Dictionary<StringView, SharpType> _sharpClasses = new .() ~ DeleteDictionaryAndReleaseValues!(_);
private static Dictionary<StringView, ScriptClass> _entityScripts = new .() ~ DeleteDictionaryAndReleaseValues!(_);
private static Dictionary<StringView, ScriptClass> _componentClasses = new .() ~ DeleteDictionaryAndReleaseValues!(_);
private static Dictionary<UUID, ScriptInstance> _entityScriptInstances = new .() ~ {
for (var entry in _)
@@ -99,7 +105,6 @@ static class ScriptEngine
}
public static Dictionary<StringView, ScriptClass> EntityClasses => _entityScripts;
public static Dictionary<StringView, ScriptClass> ComponentClasses => _componentClasses;
/// Gets or sets the current scene context for the runtime.
public static Scene Context
@@ -115,12 +120,6 @@ static class ScriptEngine
private static String _appAssemblyPath = new .() ~ delete _;
internal static class Attributes
{
internal static MonoClass* s_ShowInEditorAttribute;
internal static MonoClass* s_RunInEditModeAttribute;
}
public class ApplicationData
{
private bool _isEditor;
@@ -283,15 +282,10 @@ static class ScriptEngine
s_AppAssemblyImage = null;
}
GetCoreAttributes();
Classes.LoadClasses(s_CoreAssemblyImage);
ClearDictionaryAndReleaseValues!(_sharpClasses);
ClearDictionaryAndReleaseValues!(_componentClasses);
ClearDictionaryAndReleaseValues!(_entityScripts);
GetComponentsFromAssemblies();
GetEntitiesFromAssemblies();
ScriptGlue.RegisterManagedComponents();
@@ -454,17 +448,6 @@ static class ScriptEngine
return (assembly, image);
}
/// Retrieves the classes for Attributes that are defined in the Core library
static void GetCoreAttributes()
{
// We definitely need these attributes!
// TODO: Some only for the editor!
Attributes.s_ShowInEditorAttribute = Mono.mono_class_from_name(s_CoreAssemblyImage, "GlitchyEngine.Editor", "ShowInEditorAttribute");
Debug.Assert(Attributes.s_ShowInEditorAttribute != null);
Attributes.s_RunInEditModeAttribute = Mono.mono_class_from_name(s_CoreAssemblyImage, "GlitchyEngine.Editor", "RunInEditModeAttribute");
Debug.Assert(Attributes.s_RunInEditModeAttribute != null);
}
private static void GetEntitiesFromAssemblies()
{
Debug.Profiler.ProfileFunction!();
@@ -496,34 +479,6 @@ static class ScriptEngine
}
}
private static void GetComponentsFromAssemblies()
{
Debug.Profiler.ProfileFunction!();
MonoTableInfo* typeDefinitionsTable = Mono.mono_image_get_table_info(s_CoreAssemblyImage, .MONO_TABLE_TYPEDEF);
int32 numTypes = Mono.mono_table_info_get_rows(typeDefinitionsTable);
for (int32 i = 0; i < numTypes; i++)
{
int32[(.)SOME_RANDOM_ENUM.MONO_TYPEDEF_SIZE] cols = .();
Mono.mono_metadata_decode_row(typeDefinitionsTable, i, (.)&cols, (.)SOME_RANDOM_ENUM.MONO_TYPEDEF_SIZE);
char8* nameSpace = Mono.mono_metadata_string_heap(s_CoreAssemblyImage, (.)cols[(.)SOME_RANDOM_ENUM.MONO_TYPEDEF_NAMESPACE]);
char8* name = Mono.mono_metadata_string_heap(s_CoreAssemblyImage, (.)cols[(.)SOME_RANDOM_ENUM.MONO_TYPEDEF_NAME]);
MonoClass* monoClass = Mono.mono_class_from_name(s_CoreAssemblyImage, nameSpace, name);
// Check if it is a component but not the root Component class
if (monoClass != null && monoClass != Classes.ComponentRoot.[Friend]_monoClass && Mono.mono_class_is_subclass_of(monoClass, Classes.ComponentRoot.[Friend]_monoClass, false))
{
ScriptClass componentClass = new ScriptClass(StringView(nameSpace), StringView(name), s_CoreAssemblyImage, .Component);
_componentClasses.Add(componentClass.FullName, componentClass);
Log.EngineLogger.Info($"Added component \"{componentClass.FullName}\"");
}
}
}
public static void ReloadAssemblies()
{
Debug.Profiler.ProfileFunction!();
@@ -576,11 +531,6 @@ static class ScriptEngine
s_RootDomain = null;
}
internal static void RegisterSharpType(SharpType sharpType)
{
_sharpClasses.Add(sharpType.FullName, sharpType..AddRef());
}
/// Returns the script instance or null.
public static MonoObject* GetManagedInstance(UUID entityId)
{