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

Various improvements to Variant

Browse Source
This commit is contained in:
Wojtek Figat
2023-08-17 15:29:11 +02:00
parent c15a48b0b4
commit 70228ca355
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,13 +124,6 @@ VariantType::VariantType(Types type, MClass* klass)
VariantType::VariantType(const StringAnsiView& typeName)
{
// Check case for array
if (typeName.EndsWith(StringAnsiView("[]"), StringSearchCase::CaseSensitive))
{
new(this) VariantType(Array, StringAnsiView(typeName.Get(), typeName.Length() - 2));
return;
}
// Try using in-built type
for (uint32 i = 0; i < ARRAY_COUNT(InBuiltTypesTypeNames); i++)
{
@@ -141,6 +134,13 @@ VariantType::VariantType(const StringAnsiView& typeName)
}
}
// Check case for array
if (typeName.EndsWith(StringAnsiView("[]"), StringSearchCase::CaseSensitive))
{
new(this) VariantType(Array, StringAnsiView(typeName.Get(), typeName.Length() - 2));
return;
}
// Try using scripting type
const ScriptingTypeHandle typeHandle = Scripting::FindScriptingType(typeName);
if (typeHandle)
@@ -166,7 +166,10 @@ VariantType::VariantType(const StringAnsiView& typeName)
#if USE_CSHARP
if (const auto mclass = Scripting::FindClass(typeName))
{
new(this) VariantType(ManagedObject, typeName);
if (mclass->IsEnum())
new(this) VariantType(Enum, typeName);
else
new(this) VariantType(ManagedObject, typeName);
return;
}
#endif
@@ -2922,6 +2925,7 @@ Variant Variant::NewValue(const StringAnsiView& typeName)
switch (type.Type)
{
case ScriptingTypes::Script:
case ScriptingTypes::Class:
v.SetType(VariantType(VariantType::Object, typeName));
break;
case ScriptingTypes::Structure: