zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-25 13:51:58 +00:00
Code Activity

fix: fix single pointer leaf structs that have non-matching cross platform structure

Browse Source
This commit is contained in:
Jan
2025-06-23 18:23:01 +01:00
parent 1736f38d78
commit f70932684c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1205,16 +1205,16 @@ namespace
LINE(MakeCustomActionCall(member->m_post_load_action.get())) LINE(MakeCustomActionCall(member->m_post_load_action.get()))
} }
} }
else if (member->m_type && !member->m_type->m_has_matching_cross_platform_structure && computations.IsInRuntimeBlock()) else if (member->m_type && !member->m_type->m_has_matching_cross_platform_structure)
{ {
LINEF("const auto runtimeArraySize = static_cast<size_t>({0});", MakeEvaluation(modifier.GetArrayPointerCountEvaluation())) LINEF("const auto fillArraySize = static_cast<size_t>({0});", MakeEvaluation(modifier.GetArrayPointerCountEvaluation()))
LINEF("const auto runtimeFill = m_stream.LoadWithFill({0} * runtimeArraySize);", member->m_member->m_type_declaration->m_type->GetSize()) LINEF("const auto fill = m_stream.LoadWithFill({0} * fillArraySize);", member->m_member->m_type_declaration->m_type->GetSize())
LINE("for (auto i = 0uz; i < runtimeArraySize; i++)") LINE("for (auto i = 0uz; i < fillArraySize; i++)")
LINE("{") LINE("{")
m_intendation++; m_intendation++;
LINEF("{0} = &{1}[i];", MakeTypeVarName(member->m_member->m_type_declaration->m_type), MakeMemberAccess(info, member, modifier)) LINEF("{0} = &{1}[i];", MakeTypeVarName(member->m_type->m_definition), MakeMemberAccess(info, member, modifier))
LINEF("FillStruct_{0}(runtimeFill.AtOffset(i * {1}));", LINEF("FillStruct_{0}(fill.AtOffset(i * {1}));",
MakeSafeTypeName(member->m_member->m_type_declaration->m_type), MakeSafeTypeName(member->m_type->m_definition),
member->m_member->m_type_declaration->m_type->GetSize()) member->m_member->m_type_declaration->m_type->GetSize())
m_intendation--; m_intendation--;
LINE("}") LINE("}")
@ -1378,7 +1378,7 @@ namespace
LINE(MakeCustomActionCall(member->m_post_load_action.get())) LINE(MakeCustomActionCall(member->m_post_load_action.get()))
} }
} }
else if (member->m_type && !member->m_type->m_has_matching_cross_platform_structure && computations.IsInRuntimeBlock()) else if (member->m_type && !member->m_type->m_has_matching_cross_platform_structure)
{ {
LINEF("{0} = {1};", MakeTypeVarName(member->m_member->m_type_declaration->m_type), MakeMemberAccess(info, member, modifier)) LINEF("{0} = {1};", MakeTypeVarName(member->m_member->m_type_declaration->m_type), MakeMemberAccess(info, member, modifier))
LINEF("FillStruct_{0}(m_stream.LoadWithFill({1}));", LINEF("FillStruct_{0}(m_stream.LoadWithFill({1}));",