zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-08 21:45:40 +00:00
Code

fix: properly load matching structure dynamic array inside non-matching structure embed

Browse Source
This commit is contained in:
Jan 2025-06-04 21:32:00 +01:00
parent fff00af67b
commit c822ede9e3
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ZoneCodeGeneratorLib/Domain/Information/StructureInformation.h
View File

@ -26,6 +26,7 @@ public:
bool m_requires_marking; bool m_requires_marking;
bool m_has_matching_cross_platform_structure; bool m_has_matching_cross_platform_structure;
bool m_embedded_reference_exists;
bool m_non_embedded_reference_exists; bool m_non_embedded_reference_exists;
bool m_single_pointer_reference_exists; bool m_single_pointer_reference_exists;
bool m_array_pointer_reference_exists; bool m_array_pointer_reference_exists;

21
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp
View File

@ -64,8 +64,7 @@ namespace
{ {
for (const auto* type : m_env.m_used_types) for (const auto* type : m_env.m_used_types)
{ {
if (type->m_info && type->m_type == type->m_info->m_definition && !type->m_info->m_has_matching_cross_platform_structure if (ShouldGenerateFillMethod(*type))
&& (type->m_is_context_asset || !StructureComputations(type->m_info).IsAsset()))
{ {
PrintFillStructMethodDeclaration(type->m_info); PrintFillStructMethodDeclaration(type->m_info);
} }
@ -174,8 +173,7 @@ namespace
{ {
for (const auto* type : m_env.m_used_types) for (const auto* type : m_env.m_used_types)
{ {
if (type->m_info && type->m_type == type->m_info->m_definition && !type->m_info->m_has_matching_cross_platform_structure if (ShouldGenerateFillMethod(*type))
&& (type->m_is_context_asset || !StructureComputations(type->m_info).IsAsset()))
{ {
LINE("") LINE("")
PrintFillStructMethod(type->m_info); PrintFillStructMethod(type->m_info);
@ -253,6 +251,16 @@ namespace
return std::format("{0}** var{1}Ptr;", def->GetFullName(), MakeSafeTypeName(def)); return std::format("{0}** var{1}Ptr;", def->GetFullName(), MakeSafeTypeName(def));
} }
bool ShouldGenerateFillMethod(const RenderingUsedType& type)
{
const auto isNotForeignAsset = type.m_is_context_asset || !type.m_info || !StructureComputations(type.m_info).IsAsset();
const auto hasMismatchingStructure =
type.m_info && type.m_type == type.m_info->m_definition && !type.m_info->m_has_matching_cross_platform_structure;
const auto isEmbeddedDynamic = type.m_info && type.m_info->m_embedded_reference_exists && StructureComputations(type.m_info).GetDynamicMember();
return isNotForeignAsset && (hasMismatchingStructure || isEmbeddedDynamic);
}
void PrintFillStructMethodDeclaration(const StructureInformation* info) const void PrintFillStructMethodDeclaration(const StructureInformation* info) const
{ {
LINEF("void FillStruct_{0}(const ZoneStreamFillReadAccessor& fillAccessor);", MakeSafeTypeName(info->m_definition)) LINEF("void FillStruct_{0}(const ZoneStreamFillReadAccessor& fillAccessor);", MakeSafeTypeName(info->m_definition))
@ -275,7 +283,6 @@ namespace
void PrintHeaderLoadMethodDeclaration(const StructureInformation* info) const void PrintHeaderLoadMethodDeclaration(const StructureInformation* info) const
{ {
const StructureComputations computations(info);
LINEF("void Load_{0}(bool atStreamStart);", MakeSafeTypeName(info->m_definition)) LINEF("void Load_{0}(bool atStreamStart);", MakeSafeTypeName(info->m_definition))
} }
@ -501,7 +508,9 @@ namespace
if (!hasAnonymousType) if (!hasAnonymousType)
{ {
if (memberInfo.m_type && !memberInfo.m_type->m_has_matching_cross_platform_structure) const auto hasMismatchingStructure = memberInfo.m_type && !memberInfo.m_type->m_has_matching_cross_platform_structure;
const auto hasDynamicMember = memberInfo.m_type && StructureComputations(memberInfo.m_type).GetDynamicMember();
if (hasMismatchingStructure || hasDynamicMember)
{ {
LINEF("{0} = &{1};", MakeTypeVarName(memberInfo.m_member->m_type_declaration->m_type), MakeMemberAccess(&structInfo, &memberInfo, modifier)) LINEF("{0} = &{1};", MakeTypeVarName(memberInfo.m_member->m_type_declaration->m_type), MakeMemberAccess(&structInfo, &memberInfo, modifier))
LINEF("FillStruct_{0}(fillAccessor.AtOffset({1}));", LINEF("FillStruct_{0}(fillAccessor.AtOffset({1}));",

3
src/ZoneCodeGeneratorLib/Parsing/PostProcessing/UsagesPostProcessor.cpp
View File

@ -35,6 +35,9 @@ namespace
if (computations.ShouldIgnore()) if (computations.ShouldIgnore())
continue; continue;
if (computations.IsArray() || member->m_member->m_type_declaration->m_declaration_modifiers.empty())
member->m_type->m_embedded_reference_exists = true;
if (computations.ContainsNonEmbeddedReference()) if (computations.ContainsNonEmbeddedReference())
member->m_type->m_non_embedded_reference_exists = true; member->m_type->m_non_embedded_reference_exists = true;