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

Merge remote-tracking branch 'origin/1.5' into dotnet7

Browse Source
This commit is contained in:
Wojciech Figat
2023-01-03 14:34:20 +01:00
parent ceacdc8d08 b4faa128b7
commit e596d48729
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Engine/Tests/TestLevel.cpp
View File

@@ -33,11 +33,11 @@ TEST_CASE("Tags")
auto b = Tags::Get(TEXT("B")); auto b = Tags::Get(TEXT("B"));
auto b1 = Tags::Get(TEXT("B.1")); auto b1 = Tags::Get(TEXT("B.1"));
auto c = Tags::Get(TEXT("C")); auto c = Tags::Get(TEXT("C"));
CHECK(a.Index == 0); CHECK(a.Index == 1);
CHECK(a1.Index == 1); CHECK(a1.Index == 2);
CHECK(b.Index == 2); CHECK(b.Index == 3);
CHECK(b1.Index == 3); CHECK(b1.Index == 4);
CHECK(c.Index == 4); CHECK(c.Index == 5);
Tags::List = prevTags; Tags::List = prevTags;
} }

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

@@ -25,7 +25,7 @@ namespace Flax.Build.Bindings
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 HashSet<TypeInfo> CppVariantToTypes = new HashSet<TypeInfo>();
private static readonly HashSet<TypeInfo> CppVariantFromTypes = new HashSet<TypeInfo>(); private static readonly Dictionary<string, TypeInfo> CppVariantFromTypes = new Dictionary<string, TypeInfo>();
private static bool CppNonPodTypesConvertingGeneration = false; private static bool CppNonPodTypesConvertingGeneration = false;
public class ScriptingLangInfo public class ScriptingLangInfo
@@ -156,18 +156,21 @@ namespace Flax.Build.Bindings
return $"Variant({value}.Get())"; return $"Variant({value}.Get())";
if (typeInfo.IsArray) if (typeInfo.IsArray)
{ {
CppVariantFromTypes.Add(typeInfo); var wrapperName = GenerateCppWrapperNativeToVariantMethodName(typeInfo);
CppVariantFromTypes[wrapperName] = typeInfo;
return $"VariantFrom{GenerateCppWrapperNativeToVariantMethodName(typeInfo)}Array({value}, {typeInfo.ArraySize})"; return $"VariantFrom{GenerateCppWrapperNativeToVariantMethodName(typeInfo)}Array({value}, {typeInfo.ArraySize})";
} }
if (typeInfo.Type == "Array" && typeInfo.GenericArgs != null) if (typeInfo.Type == "Array" && typeInfo.GenericArgs != null)
{ {
CppVariantFromTypes.Add(typeInfo); var wrapperName = GenerateCppWrapperNativeToVariantMethodName(typeInfo.GenericArgs[0]);
return $"VariantFrom{GenerateCppWrapperNativeToVariantMethodName(typeInfo.GenericArgs[0])}Array({value}.Get(), {value}.Count())"; CppVariantFromTypes[wrapperName] = typeInfo;
return $"VariantFrom{wrapperName}Array({value}.Get(), {value}.Count())";
} }
if (typeInfo.Type == "Dictionary" && typeInfo.GenericArgs != null) if (typeInfo.Type == "Dictionary" && typeInfo.GenericArgs != null)
{ {
CppVariantFromTypes.Add(typeInfo); var wrapperName = GenerateCppWrapperNativeToVariantMethodName(typeInfo.GenericArgs[0]) + GenerateCppWrapperNativeToVariantMethodName(typeInfo.GenericArgs[1]);
return $"VariantFrom{GenerateCppWrapperNativeToVariantMethodName(typeInfo.GenericArgs[0])}{GenerateCppWrapperNativeToVariantMethodName(typeInfo.GenericArgs[1])}Dictionary({value})"; CppVariantFromTypes[wrapperName] = typeInfo;
return $"VariantFrom{wrapperName}Dictionary({value})";
} }
var apiType = FindApiTypeInfo(buildData, typeInfo, caller); var apiType = FindApiTypeInfo(buildData, typeInfo, caller);
@@ -2464,15 +2467,17 @@ namespace Flax.Build.Bindings
header.Append('}').AppendLine(); header.Append('}').AppendLine();
header.AppendLine("}"); header.AppendLine("}");
} }
foreach (var typeInfo in CppVariantFromTypes) foreach (var e in CppVariantFromTypes)
{ {
var wrapperName = e.Key;
var typeInfo = e.Value;
header.AppendLine(); header.AppendLine();
header.AppendLine("namespace {"); header.AppendLine("namespace {");
header.Append("Variant VariantFrom"); header.Append("Variant VariantFrom");
if (typeInfo.IsArray) if (typeInfo.IsArray)
{ {
typeInfo.IsArray = false; typeInfo.IsArray = false;
header.Append($"{GenerateCppWrapperNativeToVariantMethodName(typeInfo)}Array({(typeInfo.IsConst ? "const " : "")}{typeInfo}* v, const int32 length)").AppendLine(); header.Append($"{wrapperName}Array(const {typeInfo}* v, const int32 length)").AppendLine();
header.Append('{').AppendLine(); header.Append('{').AppendLine();
header.Append(" Variant result;").AppendLine(); header.Append(" Variant result;").AppendLine();
header.Append(" result.SetType(VariantType(VariantType::Array));").AppendLine(); header.Append(" result.SetType(VariantType(VariantType::Array));").AppendLine();
@@ -2485,7 +2490,7 @@ namespace Flax.Build.Bindings
else if (typeInfo.Type == "Array" && typeInfo.GenericArgs != null) else if (typeInfo.Type == "Array" && typeInfo.GenericArgs != null)
{ {
var valueType = typeInfo.GenericArgs[0]; var valueType = typeInfo.GenericArgs[0];
header.Append($"{GenerateCppWrapperNativeToVariantMethodName(valueType)}Array({(typeInfo.IsConst ? "const " : "")}{valueType}* v, const int32 length)").AppendLine(); header.Append($"{wrapperName}Array(const {valueType}* v, const int32 length)").AppendLine();
header.Append('{').AppendLine(); header.Append('{').AppendLine();
header.Append(" Variant result;").AppendLine(); header.Append(" Variant result;").AppendLine();
header.Append(" result.SetType(VariantType(VariantType::Array));").AppendLine(); header.Append(" result.SetType(VariantType(VariantType::Array));").AppendLine();
@@ -2498,7 +2503,7 @@ namespace Flax.Build.Bindings
{ {
var keyType = typeInfo.GenericArgs[0]; var keyType = typeInfo.GenericArgs[0];
var valueType = typeInfo.GenericArgs[1]; var valueType = typeInfo.GenericArgs[1];
header.Append($"{GenerateCppWrapperNativeToVariantMethodName(keyType)}{GenerateCppWrapperNativeToVariantMethodName(valueType)}Dictionary(const Dictionary<{keyType}, {valueType}>& v)").AppendLine(); header.Append($"{wrapperName}Dictionary(const Dictionary<{keyType}, {valueType}>& v)").AppendLine();
header.Append('{').AppendLine(); header.Append('{').AppendLine();
header.Append(" Variant result;").AppendLine(); header.Append(" Variant result;").AppendLine();
header.Append(" result.SetType(VariantType(VariantType::Dictionary));").AppendLine(); header.Append(" result.SetType(VariantType(VariantType::Dictionary));").AppendLine();