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

Merge branch 'GoaLitiuM-varianttohelper_fix'

Browse Source
This commit is contained in:
Wojtek Figat
2024-03-18 21:06:53 +01:00
parent 12e2b8156f 8c722d6bba
commit 5e60d9d267
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
View File

@@ -24,7 +24,7 @@ namespace Flax.Build.Bindings
private static readonly List<PropertyInfo> CppAutoSerializeProperties = new List<PropertyInfo>(); private static readonly List<PropertyInfo> CppAutoSerializeProperties = new List<PropertyInfo>();
public static readonly HashSet<string> CppIncludeFiles = new HashSet<string>(); public static readonly HashSet<string> CppIncludeFiles = new HashSet<string>();
private static readonly List<string> CppIncludeFilesList = new List<string>(); private static readonly List<string> CppIncludeFilesList = new List<string>();
private static readonly HashSet<TypeInfo> CppVariantToTypes = new HashSet<TypeInfo>(); private static readonly Dictionary<string, TypeInfo> CppVariantToTypes = new Dictionary<string, TypeInfo>();
private static readonly Dictionary<string, TypeInfo> CppVariantFromTypes = new Dictionary<string, TypeInfo>(); private static readonly Dictionary<string, TypeInfo> CppVariantFromTypes = new Dictionary<string, TypeInfo>();
private static bool CppNonPodTypesConvertingGeneration = false; private static bool CppNonPodTypesConvertingGeneration = false;
private static StringBuilder CppContentsEnd; private static StringBuilder CppContentsEnd;
@@ -231,13 +231,15 @@ namespace Flax.Build.Bindings
throw new Exception($"Not supported type to convert from the Variant to fixed-size array '{typeInfo}[{typeInfo.ArraySize}]'."); throw new Exception($"Not supported type to convert from the Variant to fixed-size array '{typeInfo}[{typeInfo.ArraySize}]'.");
if (typeInfo.Type == "Array" && typeInfo.GenericArgs != null) if (typeInfo.Type == "Array" && typeInfo.GenericArgs != null)
{ {
CppVariantToTypes.Add(typeInfo); var wrapperName = GenerateCppWrapperNativeToVariantMethodName(typeInfo);
return $"MoveTemp(VariantTo{GenerateCppWrapperNativeToVariantMethodName(typeInfo)}({value}))"; CppVariantToTypes[wrapperName] = typeInfo;
return $"MoveTemp(VariantTo{wrapperName}({value}))";
} }
if (typeInfo.Type == "Dictionary" && typeInfo.GenericArgs != null) if (typeInfo.Type == "Dictionary" && typeInfo.GenericArgs != null)
{ {
CppVariantToTypes.Add(typeInfo); var wrapperName = GenerateCppWrapperNativeToVariantMethodName(typeInfo);
return $"MoveTemp(VariantTo{GenerateCppWrapperNativeToVariantMethodName(typeInfo)}({value}))"; CppVariantToTypes[wrapperName] = typeInfo;
return $"MoveTemp(VariantTo{wrapperName}({value}))";
} }
if (typeInfo.Type == "Span" && typeInfo.GenericArgs != null) if (typeInfo.Type == "Span" && typeInfo.GenericArgs != null)
{ {
@@ -2790,12 +2792,14 @@ namespace Flax.Build.Bindings
var header = GetStringBuilder(); var header = GetStringBuilder();
// Variant converting helper methods // Variant converting helper methods
foreach (var typeInfo in CppVariantToTypes) foreach (var e in CppVariantToTypes)
{ {
var wrapperName = e.Key;
var typeInfo = e.Value;
var name = typeInfo.ToString(false); var name = typeInfo.ToString(false);
header.AppendLine(); header.AppendLine();
header.AppendLine("namespace {"); header.AppendLine("namespace {");
header.Append($"{name} VariantTo{GenerateCppWrapperNativeToVariantMethodName(typeInfo)}(const Variant& v)").AppendLine(); header.Append($"{name} VariantTo{wrapperName}(const Variant& v)").AppendLine();
header.Append('{').AppendLine(); header.Append('{').AppendLine();
header.Append($" {name} result;").AppendLine(); header.Append($" {name} result;").AppendLine();
if (typeInfo.Type == "Array" && typeInfo.GenericArgs != null) if (typeInfo.Type == "Array" && typeInfo.GenericArgs != null)