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

Implement .NET 7 runtime support and bindings generation

Browse Source
This commit is contained in:
Ari Vuollet
2022-11-17 19:49:39 +02:00
parent fe943ca010
commit 96dc279ebd
89 changed files with 6009 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Source/Engine/Scripting/ScriptingObject.cpp
View File

@@ -68,9 +68,13 @@ ScriptingObject* ScriptingObject::NewObject(const ScriptingTypeHandle& typeHandl
MObject* ScriptingObject::GetManagedInstance() const
{
#if USE_NETCORE
const gchandle handle = Platform::AtomicRead((int64*)&_gcHandle);
#elif USE_MONO
const gchandle handle = Platform::AtomicRead((int32*)&_gcHandle);
#endif
#if USE_MONO
const int32 handle = Platform::AtomicRead((int32*)&_gcHandle);
return handle ? mono_gchandle_get_target(handle) : nullptr;
return handle ? MUtils::GetGCHandleTarget(handle) : nullptr;
#else
return nullptr;
#endif
@@ -211,7 +215,7 @@ void ScriptingObject::OnManagedInstanceDeleted()
if (_gcHandle)
{
#if USE_MONO
mono_gchandle_free(_gcHandle);
MUtils::FreeGCHandle(_gcHandle);
#endif
_gcHandle = 0;
}
@@ -236,10 +240,15 @@ bool ScriptingObject::CreateManaged()
if (!managedInstance)
return true;
// Prevent form object GC destruction
auto handle = mono_gchandle_new(managedInstance, false);
// Prevent from object GC destruction
auto handle = MUtils::NewGCHandle(managedInstance, false);
#if USE_NETCORE
auto oldHandle = Platform::InterlockedCompareExchange((int64*)&_gcHandle, *(int64*)&handle, 0);
if (*(uint64*)&oldHandle != 0)
#else
auto oldHandle = Platform::InterlockedCompareExchange((int32*)&_gcHandle, *(int32*)&handle, 0);
if (*(uint32*)&oldHandle != 0)
#endif
{
// Other thread already created the object before
if (const auto monoClass = GetClass())
@@ -252,7 +261,7 @@ bool ScriptingObject::CreateManaged()
monoUnmanagedPtrField->SetValue(managedInstance, &param);
}
}
mono_gchandle_free(handle);
MUtils::FreeGCHandle(handle);
return true;
}
#endif
@@ -337,7 +346,7 @@ void ScriptingObject::DestroyManaged()
// Clear the handle
if (_gcHandle)
{
mono_gchandle_free(_gcHandle);
MUtils::FreeGCHandle(_gcHandle);
_gcHandle = 0;
}
#else
@@ -448,9 +457,14 @@ bool ManagedScriptingObject::CreateManaged()
return true;
// Cache the GC handle to the object (used to track the target object because it can be moved in a memory)
auto handle = mono_gchandle_new_weakref(managedInstance, false);
auto handle = MUtils::NewGCHandleWeakref(managedInstance, false);
#if USE_NETCORE
auto oldHandle = Platform::InterlockedCompareExchange((int64*)&_gcHandle, *(int64*)&handle, 0);
if (*(uint64*)&oldHandle != 0)
#else
auto oldHandle = Platform::InterlockedCompareExchange((int32*)&_gcHandle, *(int32*)&handle, 0);
if (*(uint32*)&oldHandle != 0)
#endif
{
// Other thread already created the object before
if (const auto monoClass = GetClass())
@@ -463,7 +477,7 @@ bool ManagedScriptingObject::CreateManaged()
monoUnmanagedPtrField->SetValue(managedInstance, &param);
}
}
mono_gchandle_free(handle);
MUtils::FreeGCHandle(handle);
return true;
}
#endif
@@ -487,6 +501,7 @@ public:
static MonoObject* Create1(MonoReflectionType* type)
{
SCRIPTING_EXPORT("FlaxEngine.Object::Internal_Create1")
// Peek class for that type (handle generic class cases)
if (!type)
DebugLog::ThrowArgumentNull("type");
@@ -550,6 +565,7 @@ public:
static MonoObject* Create2(MonoString* typeNameObj)
{
SCRIPTING_EXPORT("FlaxEngine.Object::Internal_Create2")
// Get typename
if (typeNameObj == nullptr)
DebugLog::ThrowArgumentNull("typeName");
@@ -587,6 +603,7 @@ public:
static void ManagedInstanceCreated(MonoObject* managedInstance)
{
SCRIPTING_EXPORT("FlaxEngine.Object::Internal_ManagedInstanceCreated")
MonoClass* typeClass = mono_object_get_class(managedInstance);
// Get the assembly with that class
@@ -625,12 +642,12 @@ public:
if (auto* managedScriptingObject = dynamic_cast<ManagedScriptingObject*>(obj))
{
// Managed
managedScriptingObject->_gcHandle = mono_gchandle_new_weakref(managedInstance, false);
managedScriptingObject->_gcHandle = MUtils::NewGCHandleWeakref(managedInstance, false);
}
else
{
// Persistent
obj->_gcHandle = mono_gchandle_new(managedInstance, false);
obj->_gcHandle = MUtils::NewGCHandle(managedInstance, false);
}
MClass* monoClass = obj->GetClass();
@@ -657,6 +674,7 @@ public:
static void Destroy(ScriptingObject* obj, float timeLeft)
{
SCRIPTING_EXPORT("FlaxEngine.Object::Internal_Destroy")
// Use scaled game time for removing actors/scripts by the user (maybe expose it to the api?)
const bool useGameTime = timeLeft > ZeroTolerance;
@@ -666,12 +684,14 @@ public:
static MonoString* GetTypeName(ScriptingObject* obj)
{
SCRIPTING_EXPORT("FlaxEngine.Object::Internal_GetTypeName")
INTERNAL_CALL_CHECK_RETURN(obj, nullptr);
return MUtils::ToString(obj->GetType().Fullname);
}
static MonoObject* FindObject(Guid* id, MonoReflectionType* type)
{
SCRIPTING_EXPORT("FlaxEngine.Object::Internal_FindObject")
if (!id->IsValid())
return nullptr;
auto klass = MUtils::GetClass(type);
@@ -701,6 +721,7 @@ public:
static MonoObject* TryFindObject(Guid* id, MonoReflectionType* type)
{
SCRIPTING_EXPORT("FlaxEngine.Object::Internal_TryFindObject")
ScriptingObject* obj = Scripting::TryFindObject(*id);
if (obj && !obj->Is(MUtils::GetClass(type)))
obj = nullptr;
@@ -709,12 +730,14 @@ public:
static void ChangeID(ScriptingObject* obj, Guid* id)
{
SCRIPTING_EXPORT("FlaxEngine.Object::Internal_ChangeID")
INTERNAL_CALL_CHECK(obj);
obj->ChangeID(*id);
}
static void* GetUnmanagedInterface(ScriptingObject* obj, MonoReflectionType* type)
{
SCRIPTING_EXPORT("FlaxEngine.Object::Internal_GetUnmanagedInterface")
if (obj && type)
{
auto typeClass = MUtils::GetClass(type);