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

Merge branch 'object_array_marshalling' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-object_array_marshalling

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-10 09:22:22 +02:00
parent 32bab1e7bf 66de1e744a
commit c73897ce7f
9 changed files with 108 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,6 +112,7 @@ public:
static void WriteRef(void* ptr, MObject* ref);
static void WriteValue(void* dst, void* src, int32 count, const MClass* klass);
static void WriteArrayRef(MArray* dst, MObject* ref, int32 index);
static void WriteArrayRef(MArray* dst, Span<MObject*> span);
#if USE_NETCORE
static void* AllocateMemory(int32 size, bool coTaskMem = false);
static void FreeMemory(void* ptr, bool coTaskMem = false);

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

@@ -104,8 +104,14 @@ struct MConverter<String>
void ToManagedArray(MArray* result, const Span<String>& data)
{
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, (MObject*)MUtils::ToString(data[i]), i);
objects[i] = (MObject*)MUtils::ToString(data[i]);
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
}
void ToNativeArray(Span<String>& result, const MArray* data)
@@ -132,8 +138,14 @@ struct MConverter<StringAnsi>
void ToManagedArray(MArray* result, const Span<StringAnsi>& data)
{
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, (MObject*)MUtils::ToString(data[i]), i);
objects[i] = (MObject*)MUtils::ToString(data[i]);
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
}
void ToNativeArray(Span<StringAnsi>& result, const MArray* data)
@@ -160,8 +172,14 @@ struct MConverter<StringView>
void ToManagedArray(MArray* result, const Span<StringView>& data)
{
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, (MObject*)MUtils::ToString(data[i]), i);
objects[i] = (MObject*)MUtils::ToString(data[i]);
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
}
void ToNativeArray(Span<StringView>& result, const MArray* data)
@@ -188,8 +206,14 @@ struct MConverter<Variant>
void ToManagedArray(MArray* result, const Span<Variant>& data)
{
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, MUtils::BoxVariant(data[i]), i);
objects[i] = MUtils::BoxVariant(data[i]);
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
}
void ToNativeArray(Span<Variant>& result, const MArray* data)
@@ -216,8 +240,14 @@ struct MConverter<T*, typename TEnableIf<TIsBaseOf<class ScriptingObject, T>::Va
void ToManagedArray(MArray* result, const Span<T*>& data)
{
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, data[i] ? data[i]->GetOrCreateManagedInstance() : nullptr, i);
objects[i] = data[i] ? data[i]->GetOrCreateManagedInstance() : nullptr;
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
}
void ToNativeArray(Span<T*>& result, const MArray* data)
@@ -239,8 +269,14 @@ struct MConverter<T, typename TEnableIf<TIsBaseOf<class ScriptingObject, T>::Val
void ToManagedArray(MArray* result, const Span<T>& data)
{
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, data[i].GetOrCreateManagedInstance(), i);
objects[i] = data[i].GetOrCreateManagedInstance();
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
}
};
@@ -263,8 +299,16 @@ struct MConverter<ScriptingObjectReference<T>>
void ToManagedArray(MArray* result, const Span<ScriptingObjectReference<T>>& data)
{
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, data[i].GetManagedInstance(), i);
objects[i] = data[i].GetManagedInstance();
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
//for (int32 i = 0; i < data.Length(); i++)
// MCore::GC::WriteArrayRef(result, data[i].GetManagedInstance(), i);
}
void ToNativeArray(Span<ScriptingObjectReference<T>>& result, const MArray* data)
@@ -294,8 +338,14 @@ struct MConverter<AssetReference<T>>
void ToManagedArray(MArray* result, const Span<AssetReference<T>>& data)
{
if (data.Length() == 0)
return;
Array<MObject*> objects;
objects.Resize(data.Length(), false);
for (int32 i = 0; i < data.Length(); i++)
MCore::GC::WriteArrayRef(result, data[i].GetManagedInstance(), i);
objects[i] = data[i].GetManagedInstance();
MCore::GC::WriteArrayRef(result, Span<MObject*>(objects.Get(), objects.Count()));
}
void ToNativeArray(Span<AssetReference<T>>& result, const MArray* data)