godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix lookup of C# types by their engine name

This commit is contained in:
Raul Santos 2023-01-27 21:28:15 +01:00
parent a43db5afa4
commit 65d0d05fa7
No known key found for this signature in database
GPG Key ID: B532473AE3A803E4
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
View File

@ -243,9 +243,33 @@ namespace Godot.Bridge
if (wrapperType == null) if (wrapperType == null)
{ {
wrapperType = AppDomain.CurrentDomain.GetAssemblies() wrapperType = GetTypeByGodotClassAttr(typeof(GodotObject).Assembly, nativeTypeNameStr);
.FirstOrDefault(a => a.GetName().Name == "GodotSharpEditor")? }
.GetType("Godot." + nativeTypeNameStr);
if (wrapperType == null)
{
var editorAssembly = AppDomain.CurrentDomain.GetAssemblies()
.FirstOrDefault(a => a.GetName().Name == "GodotSharpEditor");
wrapperType = editorAssembly?.GetType("Godot." + nativeTypeNameStr);
if (wrapperType == null)
{
wrapperType = GetTypeByGodotClassAttr(editorAssembly, nativeTypeNameStr);
}
}
static Type? GetTypeByGodotClassAttr(Assembly assembly, string nativeTypeNameStr)
{
var types = assembly.GetTypes();
foreach (var type in types)
{
var attr = type.GetCustomAttribute<GodotClassNameAttribute>();
if (attr?.Name == nativeTypeNameStr)
{
return type;
}
}
return null;
} }
static bool IsStatic(Type type) => type.IsAbstract && type.IsSealed; static bool IsStatic(Type type) => type.IsAbstract && type.IsSealed;