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

ScriptEngine refactoring

Browse Source
This commit is contained in:
Simon Lübeß
2024-03-31 12:36:22 +02:00
parent abcacc84a9
commit 777f52ab49
4 changed files with 13 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Scripting/ScriptClass.bf
+7 -25
View File
@@ -13,19 +13,16 @@ abstract class SharpType : RefCounter
protected String _namespace ~ delete _;
protected String _className ~ delete _;
protected String _fullName ~ delete _;
protected ScriptFieldType _scriptType;
public StringView Namespace => _namespace;
public StringView ClassName => _className;
public StringView FullName => _fullName;
public ScriptFieldType ScriptType => _scriptType;
public this(StringView classNamespace, StringView className, ScriptFieldType scriptType)
public this(StringView classNamespace, StringView className)
{
_namespace = new String(classNamespace);
_className = new String(className);
_fullName = new $"{_namespace}.{_className}";
_scriptType = scriptType;
}
}
@@ -33,36 +30,21 @@ class SharpClass : SharpType
{
protected internal MonoClass* _monoClass;
public this(StringView classNamespace, StringView className, MonoImage* image, ScriptFieldType fieldType = .Class) :
base(classNamespace, className, fieldType)
public this(StringView classNamespace, StringView className, MonoImage* image) :
base(classNamespace, className)
{
_monoClass = Mono.mono_class_from_name(image, _namespace, _className);
Log.EngineLogger.AssertDebug(_monoClass != null);
}
internal this(MonoClass* monoClass, ScriptFieldType fieldType = .Class) :
base(StringView(Mono.mono_class_get_namespace(monoClass)), StringView(Mono.mono_class_get_name(monoClass)), fieldType)
internal this(MonoClass* monoClass) :
base(StringView(Mono.mono_class_get_namespace(monoClass)), StringView(Mono.mono_class_get_name(monoClass)))
{
_monoClass = monoClass;
Log.EngineLogger.AssertDebug(_monoClass != null);
}
internal MonoType* GetMonoType()
{
return Mono.mono_class_get_type(_monoClass);
}
internal bool IsType(MonoType* type)
{
return GetMonoType() == type;
}
internal bool IsSubclass(MonoClass* @class)
{
return Mono.mono_class_is_subclass_of(_monoClass, @class, false);
}
}
class ScriptClass : SharpClass
@@ -88,8 +70,8 @@ class ScriptClass : SharpClass
public bool RunInEditMode => _runInEditMode;
[AllowAppend]
public this(StringView classNamespace, StringView className, MonoImage* image, ScriptFieldType scriptFieldType = .Class) :
base(classNamespace, className, image, scriptFieldType)
public this(StringView classNamespace, StringView className, MonoImage* image) :
base(classNamespace, className, image)
{
_constructor = FindConstructor();
_onCreate = (OnCreateMethod)GetMethodThunk("OnCreate");
GlitchyEngine/src/Scripting/ScriptEngine.bf
+2 -5
View File
@@ -585,15 +585,12 @@ static class ScriptEngine
if (scriptClass == null)
return;
let monoType = scriptClass.GetMonoType();
let monoReflectionType = Mono.mono_type_get_object(s_AppDomain, monoType);
let entityId = entity.UUID;
#unwarn
void*[2] args = .(&entityId, monoReflectionType);
void*[1] args = .(&entityId);
let method = Classes.EntityEditor.GetMethod("ShowDefaultEntityEditor", 2);
let method = Classes.EntityEditor.GetMethod("ShowDefaultEntityEditor", 1);
Classes.EntityEditor.Invoke(method, null, &args);
}
GlitchyEngine/src/Scripting/ScriptFieldType.bf
-16
View File
@@ -1,16 +0,0 @@
using System;
using GlitchyEngine.Core;
using GlitchyEngine.Math;
namespace GlitchyEngine.Scripting;
enum ScriptFieldType
{
case None;
case Class;
case Struct;
case Entity;
case Component;
}