GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor abstract classes handling for scripting types creation (eg. Script or GPUResource) under dotnet7

Browse Source
This commit is contained in:
Wojciech Figat
2023-01-02 10:35:39 +01:00
parent 6a8483a898
commit 00d960d61e
4 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Engine/Engine/NativeInterop.cs
View File

@@ -12,7 +12,6 @@ using System.Runtime.CompilerServices;
using FlaxEngine.Assertions;
using FlaxEngine.Utilities;
using System.Runtime.InteropServices.Marshalling;
using FlaxEngine.Visject;
using System.Buffers;
using System.Collections.Concurrent;
using System.Text;
@@ -1845,10 +1844,12 @@ namespace FlaxEngine
internal static IntPtr NewObject(IntPtr typeHandle)
{
Type type = Unsafe.As<Type>(GCHandle.FromIntPtr(typeHandle).Target);
if (type == typeof(Script))
if (type.IsAbstract)
{
// FIXME: Script is an abstract type which can not be instantiated
type = typeof(VisjectScript);
// Dotnet doesn't allow to instantiate abstract type thus allow to use generated mock class usage (eg. for Script or GPUResource) for generated abstract types
var abstractWrapper = type.GetNestedType("AbstractWrapper", BindingFlags.NonPublic);
if (abstractWrapper != null)
type = abstractWrapper;
}
object value = RuntimeHelpers.GetUninitializedObject(type);
return GCHandle.ToIntPtr(GCHandle.Alloc(value));