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

Add Variant enum parsing by name and fix enum printing to string

Browse Source
This commit is contained in:
Wojtek Figat
2024-10-03 17:10:34 +02:00
parent 497cd19fe5
commit 1414eb9852
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2740,12 +2740,12 @@ String Variant::ToString() const
const auto items = typeHandle.GetType().Enum.Items; const auto items = typeHandle.GetType().Enum.Items;
for (int32 i = 0; items[i].Name; i++) for (int32 i = 0; items[i].Name; i++)
{ {
if (items[i].Value == AsUint) if (items[i].Value == AsUint64)
return String(items[i].Name); return String(items[i].Name);
} }
} }
} }
return StringUtils::ToString(AsUint); return StringUtils::ToString(AsUint64);
case VariantType::Int64: case VariantType::Int64:
return StringUtils::ToString(AsInt64); return StringUtils::ToString(AsInt64);
case VariantType::Uint64: case VariantType::Uint64:
@@ -3098,7 +3098,27 @@ Variant Variant::Parse(const StringView& text, const VariantType& type)
break; break;
case VariantType::Uint64: case VariantType::Uint64:
case VariantType::Enum: case VariantType::Enum:
StringUtils::Parse(text.Get(), &result.AsUint64); if (!StringUtils::Parse(text.Get(), &result.AsUint64))
{
}
else if (type.TypeName)
{
const ScriptingTypeHandle typeHandle = Scripting::FindScriptingType(StringAnsiView(type.TypeName));
if (typeHandle && typeHandle.GetType().Type == ScriptingTypes::Enum)
{
const auto items = typeHandle.GetType().Enum.Items;
StringAsANSI<32> textAnsi(text.Get(), text.Length());
StringAnsiView textAnsiView(textAnsi.Get());
for (int32 i = 0; items[i].Name; i++)
{
if (textAnsiView == items[i].Name)
{
result.AsUint64 = items[i].Value;
break;
}
}
}
}
break; break;
case VariantType::Float: case VariantType::Float:
StringUtils::Parse(text.Get(), &result.AsFloat); StringUtils::Parse(text.Get(), &result.AsFloat);