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

Add Variant new value init for objects

Browse Source
This commit is contained in:
Wojtek Figat
2023-08-17 16:10:07 +02:00
parent fad825690e
commit 14ffd0aa08
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Engine/Core/Types/Variant.cpp
View File

@@ -1075,9 +1075,7 @@ Variant& Variant::operator=(const Variant& other)
case VariantType::Object:
AsObject = other.AsObject;
if (other.AsObject)
{
AsObject->Deleted.Bind<Variant, &Variant::OnObjectDeleted>(this);
}
break;
case VariantType::Asset:
AsAsset = other.AsAsset;
@@ -2925,8 +2923,10 @@ Variant Variant::NewValue(const StringAnsiView& typeName)
switch (type.Type)
{
case ScriptingTypes::Script:
case ScriptingTypes::Class:
v.SetType(VariantType(VariantType::Object, typeName));
v.AsObject = type.Script.Spawn(ScriptingObjectSpawnParams(Guid::New(), typeHandle));
if (v.AsObject)
v.AsObject->Deleted.Bind<Variant, &Variant::OnObjectDeleted>(&v);
break;
case ScriptingTypes::Structure:
v.SetType(VariantType(VariantType::Structure, typeName));
@@ -2935,6 +2935,9 @@ Variant Variant::NewValue(const StringAnsiView& typeName)
v.SetType(VariantType(VariantType::Enum, typeName));
v.AsUint64 = 0;
break;
default:
LOG(Error, "Unsupported scripting type '{}' for Variant", typeName.ToString());
break;
}
}
#if USE_CSHARP
@@ -2953,6 +2956,15 @@ Variant Variant::NewValue(const StringAnsiView& typeName)
else
{
v.SetType(VariantType(VariantType::ManagedObject, typeName));
MObject* instance = mclass->CreateInstance();
if (instance)
{
#if USE_NETCORE
v.AsUint64 = MCore::GCHandle::New(instance);
#else
v.AsUint = MCore::GCHandle::New(instance);
#endif
}
}
}
#endif