From 89074c8601cedda8678961a3e108e6193b0d2db5 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 30 Mar 2024 19:18:41 +0100 Subject: [PATCH] fix: not reallocating IW5 clipMap pInfo from temp block --- src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt | 1 + .../Domain/Information/MemberInformation.h | 2 +- .../Generating/RenderingContext.cpp | 48 +++++++++++++++---- .../Generating/RenderingContext.h | 1 + .../Generating/Templates/ZoneLoadTemplate.cpp | 24 ++++++++++ .../Commands/Sequence/SequenceAction.cpp | 16 ++++--- .../XAssets/clipmap_t/clipmap_t_actions.cpp | 17 +++++++ .../IW5/XAssets/clipmap_t/clipmap_t_actions.h | 15 ++++++ 8 files changed, 107 insertions(+), 17 deletions(-) create mode 100644 src/ZoneLoading/Game/IW5/XAssets/clipmap_t/clipmap_t_actions.cpp create mode 100644 src/ZoneLoading/Game/IW5/XAssets/clipmap_t/clipmap_t_actions.h diff --git a/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt b/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt index 64798d62..7b62a24d 100644 --- a/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt +++ b/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt @@ -7,6 +7,7 @@ set string name; set name name; set block pInfo XFILE_BLOCK_TEMP; set reusable pInfo; +set action pInfo ReallocClipInfo(ClipInfo, clipMap_t); set count staticModelList numStaticModels; set count nodes numNodes; set count leafs numLeafs; diff --git a/src/ZoneCodeGeneratorLib/Domain/Information/MemberInformation.h b/src/ZoneCodeGeneratorLib/Domain/Information/MemberInformation.h index ee421c35..d0b94ea7 100644 --- a/src/ZoneCodeGeneratorLib/Domain/Information/MemberInformation.h +++ b/src/ZoneCodeGeneratorLib/Domain/Information/MemberInformation.h @@ -4,7 +4,6 @@ #include "Domain/Evaluation/IEvaluation.h" #include "Domain/FastFile/FastFileBlock.h" #include "StructureInformation.h" -#include "Utils/ClassUtils.h" #include @@ -22,6 +21,7 @@ public: bool m_is_leaf; std::unique_ptr m_condition; std::unique_ptr m_alloc_alignment; + std::unique_ptr m_post_load_action; const FastFileBlock* m_fast_file_block; const EnumMember* m_asset_ref; diff --git a/src/ZoneCodeGeneratorLib/Generating/RenderingContext.cpp b/src/ZoneCodeGeneratorLib/Generating/RenderingContext.cpp index 9478ed24..c5ae8ff8 100644 --- a/src/ZoneCodeGeneratorLib/Generating/RenderingContext.cpp +++ b/src/ZoneCodeGeneratorLib/Generating/RenderingContext.cpp @@ -3,6 +3,8 @@ #include "Domain/Computations/MemberComputations.h" #include "Domain/Computations/StructureComputations.h" +#include + RenderingUsedType::RenderingUsedType(const DataDefinition* type, StructureInformation* info) : m_members_loaded(false), m_type(type), @@ -140,26 +142,52 @@ void RenderingContext::CreateUsedTypeCollections() { if (usedType->m_info != nullptr) { - StructureComputations computations(usedType->m_info); + const StructureComputations computations(usedType->m_info); if (usedType->m_info->m_definition == usedType->m_type) m_used_structures.push_back(usedType); - if (computations.IsAsset() && usedType->m_info != m_asset) - m_referenced_assets.push_back(usedType); - - if (!m_has_actions) + if (computations.IsAsset()) { - if ((!computations.IsAsset() || usedType->m_is_context_asset) && usedType->m_non_runtime_reference_exists - && usedType->m_info->m_post_load_action) - { - m_has_actions = true; - } + if (usedType->m_info != m_asset) + m_referenced_assets.push_back(usedType); + else + usedType->m_is_context_asset = true; + } + + if (!m_has_actions && UsedTypeHasActions(usedType)) + { + m_has_actions = true; } } } } +bool RenderingContext::UsedTypeHasActions(const RenderingUsedType* usedType) const +{ + const StructureComputations computations(usedType->m_info); + + if (computations.IsAsset() && !usedType->m_is_context_asset) + return false; + + if (!usedType->m_non_runtime_reference_exists && !usedType->m_is_context_asset) + return false; + + if (usedType->m_info->m_post_load_action) + return true; + + if (std::ranges::any_of(usedType->m_info->m_ordered_members, + [](const auto& member) -> bool + { + return member->m_post_load_action && !MemberComputations(member.get()).ShouldIgnore(); + })) + { + return true; + } + + return false; +} + std::unique_ptr RenderingContext::BuildContext(const IDataRepository* repository, StructureInformation* asset) { auto context = std::make_unique(RenderingContext(repository->GetGameName(), repository->GetAllFastFileBlocks())); diff --git a/src/ZoneCodeGeneratorLib/Generating/RenderingContext.h b/src/ZoneCodeGeneratorLib/Generating/RenderingContext.h index bedd3b5a..01a28483 100644 --- a/src/ZoneCodeGeneratorLib/Generating/RenderingContext.h +++ b/src/ZoneCodeGeneratorLib/Generating/RenderingContext.h @@ -36,6 +36,7 @@ class RenderingContext void ScanUsedTypeIfNeeded(const IDataRepository* repository, MemberComputations* computations, RenderingUsedType* usedType); void MakeAsset(const IDataRepository* repository, StructureInformation* asset); void CreateUsedTypeCollections(); + bool UsedTypeHasActions(const RenderingUsedType* usedType) const; public: std::string m_game; diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp index ce5c3b5a..a01235ac 100644 --- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp +++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp @@ -327,6 +327,12 @@ class ZoneLoadTemplate::Internal final : BaseTemplate LINE("") LINE(MakeCustomActionCall(member->m_type->m_post_load_action.get())) } + + if (member->m_post_load_action) + { + LINE("") + LINE(MakeCustomActionCall(member->m_post_load_action.get())) + } } else { @@ -378,6 +384,12 @@ class ZoneLoadTemplate::Internal final : BaseTemplate LINE("") LINE(MakeCustomActionCall(member->m_type->m_post_load_action.get())) } + + if (member->m_post_load_action) + { + LINE("") + LINE(MakeCustomActionCall(member->m_post_load_action.get())) + } } else if (computations.IsAfterPartialLoad()) { @@ -424,6 +436,12 @@ class ZoneLoadTemplate::Internal final : BaseTemplate LINE("") LINE(MakeCustomActionCall(member->m_type->m_post_load_action.get())) } + + if (member->m_post_load_action) + { + LINE("") + LINE(MakeCustomActionCall(member->m_post_load_action.get())) + } } else if (computations.IsAfterPartialLoad()) { @@ -446,6 +464,12 @@ class ZoneLoadTemplate::Internal final : BaseTemplate LINE("") LINE(MakeCustomActionCall(member->m_type->m_post_load_action.get())) } + + if (member->m_post_load_action) + { + LINE("") + LINE(MakeCustomActionCall(member->m_post_load_action.get())) + } } else { diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceAction.cpp b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceAction.cpp index bc7a9d30..adb30fb8 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceAction.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceAction.cpp @@ -40,6 +40,7 @@ SequenceAction::SequenceAction() void SequenceAction::ProcessMatch(CommandsParserState* state, SequenceResult& result) const { StructureInformation* type; + MemberInformation* member = nullptr; const auto& actionNameToken = result.NextCapture(CAPTURE_ACTION_NAME); // If a typename was specified then try to parse it @@ -53,11 +54,7 @@ void SequenceAction::ProcessMatch(CommandsParserState* state, SequenceResultm_type; - if (type == nullptr) - throw ParsingException(typeNameToken.GetPos(), "Member is not a data type with members."); - } + member = memberChain.back(); } else if (state->GetInUse() != nullptr) { @@ -79,5 +76,12 @@ void SequenceAction::ProcessMatch(CommandsParserState* state, SequenceResultm_post_load_action = std::make_unique(actionNameToken.IdentifierValue(), std::move(parameterTypes)); + auto action = std::make_unique(actionNameToken.IdentifierValue(), std::move(parameterTypes)); + + if (member != nullptr) + member->m_post_load_action = std::move(action); + else if (type != nullptr) + type->m_post_load_action = std::move(action); + else + throw ParsingException(actionNameToken.GetPos(), "Unknown type"); } diff --git a/src/ZoneLoading/Game/IW5/XAssets/clipmap_t/clipmap_t_actions.cpp b/src/ZoneLoading/Game/IW5/XAssets/clipmap_t/clipmap_t_actions.cpp new file mode 100644 index 00000000..59237320 --- /dev/null +++ b/src/ZoneLoading/Game/IW5/XAssets/clipmap_t/clipmap_t_actions.cpp @@ -0,0 +1,17 @@ +#include "clipmap_t_actions.h" + +#include +#include + +using namespace IW5; + +Actions_clipMap_t::Actions_clipMap_t(Zone* zone) + : AssetLoadingActions(zone) +{ +} + +void Actions_clipMap_t::ReallocClipInfo(ClipInfo* clipInfo, clipMap_t* clipMap) const +{ + clipMap->pInfo = static_cast(m_zone->GetMemory()->Alloc(sizeof(ClipInfo))); + memcpy(clipMap->pInfo, clipInfo, sizeof(ClipInfo)); +} diff --git a/src/ZoneLoading/Game/IW5/XAssets/clipmap_t/clipmap_t_actions.h b/src/ZoneLoading/Game/IW5/XAssets/clipmap_t/clipmap_t_actions.h new file mode 100644 index 00000000..90c11ac3 --- /dev/null +++ b/src/ZoneLoading/Game/IW5/XAssets/clipmap_t/clipmap_t_actions.h @@ -0,0 +1,15 @@ +#pragma once + +#include "Game/IW5/IW5.h" +#include "Loading/AssetLoadingActions.h" + +namespace IW5 +{ + class Actions_clipMap_t final : public AssetLoadingActions + { + public: + explicit Actions_clipMap_t(Zone* zone); + + void ReallocClipInfo(ClipInfo* clipInfo, clipMap_t* clipMap) const; + }; +} // namespace IW5