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

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

Browse Source 
# Conflicts:
#	Source/Engine/Content/JsonAsset.cpp
This commit is contained in:
Wojciech Figat
2022-10-19 13:36:46 +02:00
parent ff49401f3a f6857f66ba
commit e115aa2c4e
32 changed files with 362 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
View File

@@ -922,10 +922,8 @@ namespace Flax.Build.Bindings
// Properties
foreach (var propertyInfo in classInfo.Properties)
{
if (propertyInfo.IsHidden)
if (propertyInfo.IsHidden || !useUnmanaged)
continue;
if (!useUnmanaged)
throw new NotImplementedException("TODO: support properties inside non-static and non-scripting API class types.");
contents.AppendLine();
GenerateCSharpComment(contents, indent, propertyInfo.Comment, true);

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

@@ -1446,6 +1446,11 @@ namespace Flax.Build.Bindings
continue;
if (GenerateCppAutoSerializationSkip(buildData, typeInfo, propertyInfo, propertyInfo.Type))
continue;
CppAutoSerializeProperties.Add(propertyInfo);
// Skip writing deprecated properties (read-only deserialization to allow reading old data)
if (propertyInfo.HasAttribute("Obsolete"))
continue;
contents.Append(" {");
contents.Append(" const auto");
@@ -1462,7 +1467,6 @@ namespace Flax.Build.Bindings
contents.Append($"stream.JKEY(\"{propertyInfo.Name}\"); Serialization::Serialize(stream, value, nullptr);");
contents.Append(" }");
contents.Append('}').AppendLine();
CppAutoSerializeProperties.Add(propertyInfo);
}
}
else if (structureInfo != null)
@@ -1494,14 +1498,14 @@ namespace Flax.Build.Bindings
foreach (var propertyInfo in CppAutoSerializeProperties)
{
contents.Append(" {");
contents.Append($" const auto e = SERIALIZE_FIND_MEMBER(stream, \"{propertyInfo.Name}\");");
contents.Append(" if (e != stream.MemberEnd()) {");
contents.Append($" auto p = {propertyInfo.Getter.Name}();");
contents.Append(" Serialization::Deserialize(e->value, p, modifier);");
contents.Append($" {propertyInfo.Setter.Name}(p);");
contents.Append(" }");
contents.Append('}').AppendLine();
contents.AppendLine(" {");
contents.AppendLine($" const auto e = SERIALIZE_FIND_MEMBER(stream, \"{propertyInfo.Name}\");");
contents.AppendLine(" if (e != stream.MemberEnd()) {");
contents.AppendLine($" auto p = {propertyInfo.Getter.Name}();");
contents.AppendLine(" Serialization::Deserialize(e->value, p, modifier);");
contents.AppendLine($" {propertyInfo.Setter.Name}(p);");
contents.AppendLine(" }");
contents.AppendLine(" }");
}
contents.Append('}').AppendLine();