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

Refactor managed array unboxing to handle case of C# array passes as object

Browse Source 
#1415
This commit is contained in:
Wojtek Figat
2023-09-20 14:17:11 +02:00
parent 5c5c64cf76
commit 8bd6649510
6 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Engine/Scripting/ManagedCLR/MCore.h
View File

@@ -85,6 +85,7 @@ public:
static MClass* GetClass(MClass* elementKlass);
static int32 GetLength(const MArray* obj);
static void* GetAddress(const MArray* obj);
static MArray* Unbox(MObject* obj);
template<typename T>
FORCE_INLINE static T* GetAddress(const MArray* obj)

5
Source/Engine/Scripting/ManagedCLR/MUtils.h
View File

@@ -363,11 +363,12 @@ struct MConverter<Array<T>>
void Unbox(Array<T>& result, MObject* data)
{
const int32 length = data ? MCore::Array::GetLength((MArray*)data) : 0;
MArray* array = MCore::Array::Unbox(data);
const int32 length = array ? MCore::Array::GetLength(array) : 0;
result.Resize(length);
MConverter<T> converter;
Span<T> resultSpan(result.Get(), length);
converter.ToNativeArray(resultSpan, (MArray*)data);
converter.ToNativeArray(resultSpan, array);
}
};