From 416823c6cd6a891574fb61939f2277222b5652c4 Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 3 Jan 2025 11:01:44 +0100 Subject: [PATCH] chore: rename ZoneAssetLoaderState to ZoneAssetCreationState --- src/ObjCompiling/IObjCompiler.h | 1 + src/ObjCompiling/Image/IPak/IPakCreator.h | 4 +- .../Image/ImageIPakPostProcessor.cpp | 4 +- .../Image/ImageIwdPostProcessor.cpp | 4 +- src/ObjCompiling/Iwd/IwdCreator.h | 4 +- src/ObjLoading/Asset/AssetCreationContext.cpp | 2 +- src/ObjLoading/Asset/AssetCreationContext.h | 4 +- .../Asset/IZoneAssetCreationState.h | 57 +++++++++++++++++++ src/ObjLoading/Asset/IZoneAssetLoaderState.h | 57 ------------------- .../Game/IW4/Material/LoaderMaterialIW4.cpp | 4 +- .../Game/IW4/Menu/LoaderMenuListIW4.cpp | 6 +- .../IW4/Menu/MenuConversionZoneStateIW4.h | 4 +- .../Game/IW4/Menu/MenuConverterIW4.cpp | 4 +- .../Game/IW4/Techset/LoaderTechsetIW4.cpp | 16 +++--- .../IW4/Weapon/InfoStringLoaderWeaponIW4.cpp | 2 +- .../Game/IW5/Menu/LoaderMenuListIW5.cpp | 6 +- .../IW5/Menu/MenuConversionZoneStateIW5.h | 4 +- .../Game/IW5/Menu/MenuConverterIW5.cpp | 4 +- .../IW5/Weapon/InfoStringLoaderWeaponIW5.cpp | 2 +- .../T6/Weapon/InfoStringLoaderWeaponT6.cpp | 2 +- .../Parsing/Menu/MenuAssetZoneState.h | 4 +- .../Techset/TechniqueStateMapCache.h | 4 +- .../Techset/TechsetDefinitionCache.h | 4 +- src/ObjLoading/Weapon/AccuracyGraphLoader.h | 4 +- 24 files changed, 104 insertions(+), 103 deletions(-) create mode 100644 src/ObjLoading/Asset/IZoneAssetCreationState.h delete mode 100644 src/ObjLoading/Asset/IZoneAssetLoaderState.h diff --git a/src/ObjCompiling/IObjCompiler.h b/src/ObjCompiling/IObjCompiler.h index e4babff7..5bcf28a1 100644 --- a/src/ObjCompiling/IObjCompiler.h +++ b/src/ObjCompiling/IObjCompiler.h @@ -1,6 +1,7 @@ #pragma once #include "Asset/AssetCreatorCollection.h" +#include "Asset/IZoneAssetCreationState.h" #include "Asset/ZoneDefinitionContext.h" #include "Gdt/IGdtQueryable.h" #include "SearchPath/ISearchPath.h" diff --git a/src/ObjCompiling/Image/IPak/IPakCreator.h b/src/ObjCompiling/Image/IPak/IPakCreator.h index 699cea0d..2eb76b14 100644 --- a/src/ObjCompiling/Image/IPak/IPakCreator.h +++ b/src/ObjCompiling/Image/IPak/IPakCreator.h @@ -1,6 +1,6 @@ #pragma once -#include "Asset/IZoneAssetLoaderState.h" +#include "Asset/IZoneAssetCreationState.h" #include "SearchPath/ISearchPath.h" #include @@ -21,7 +21,7 @@ private: std::vector m_image_names; }; -class IPakCreator : public IZoneAssetLoaderState +class IPakCreator : public IZoneAssetCreationState { public: IPakToCreate* GetOrAddIPak(const std::string& ipakName); diff --git a/src/ObjCompiling/Image/ImageIPakPostProcessor.cpp b/src/ObjCompiling/Image/ImageIPakPostProcessor.cpp index 99870298..c1af9df9 100644 --- a/src/ObjCompiling/Image/ImageIPakPostProcessor.cpp +++ b/src/ObjCompiling/Image/ImageIPakPostProcessor.cpp @@ -39,7 +39,7 @@ void AbstractImageIPakPostProcessor::FindNextObjContainer(AssetCreationContext& if (objContainer.m_type != ZoneDefinitionObjContainerType::IPAK) continue; - auto& ipakCreator = context.GetZoneAssetLoaderState(); + auto& ipakCreator = context.GetZoneAssetCreationState(); m_current_ipak = ipakCreator.GetOrAddIPak(objContainer.m_name); m_current_ipak_start_index = objContainer.m_asset_start; m_current_ipak_end_index = objContainer.m_asset_end; @@ -70,5 +70,5 @@ void AbstractImageIPakPostProcessor::PostProcessAsset(XAssetInfoGeneric& assetIn void AbstractImageIPakPostProcessor::FinalizeZone(AssetCreationContext& context) { - context.GetZoneAssetLoaderState().Finalize(m_search_path, m_out_dir); + context.GetZoneAssetCreationState().Finalize(m_search_path, m_out_dir); } diff --git a/src/ObjCompiling/Image/ImageIwdPostProcessor.cpp b/src/ObjCompiling/Image/ImageIwdPostProcessor.cpp index 7b384634..45771ae7 100644 --- a/src/ObjCompiling/Image/ImageIwdPostProcessor.cpp +++ b/src/ObjCompiling/Image/ImageIwdPostProcessor.cpp @@ -40,7 +40,7 @@ void AbstractImageIwdPostProcessor::FindNextObjContainer(AssetCreationContext& c if (objContainer.m_type != ZoneDefinitionObjContainerType::IWD) continue; - auto& iwdCreator = context.GetZoneAssetLoaderState(); + auto& iwdCreator = context.GetZoneAssetCreationState(); m_current_iwd = iwdCreator.GetOrAddIwd(objContainer.m_name); m_current_iwd_start_index = objContainer.m_asset_start; m_current_iwd_end_index = objContainer.m_asset_end; @@ -71,5 +71,5 @@ void AbstractImageIwdPostProcessor::PostProcessAsset(XAssetInfoGeneric& assetInf void AbstractImageIwdPostProcessor::FinalizeZone(AssetCreationContext& context) { - context.GetZoneAssetLoaderState().Finalize(m_search_path, m_out_dir); + context.GetZoneAssetCreationState().Finalize(m_search_path, m_out_dir); } diff --git a/src/ObjCompiling/Iwd/IwdCreator.h b/src/ObjCompiling/Iwd/IwdCreator.h index 68fff8f9..43b31fe0 100644 --- a/src/ObjCompiling/Iwd/IwdCreator.h +++ b/src/ObjCompiling/Iwd/IwdCreator.h @@ -1,6 +1,6 @@ #pragma once -#include "Asset/IZoneAssetLoaderState.h" +#include "Asset/IZoneAssetCreationState.h" #include "SearchPath/ISearchPath.h" #include @@ -21,7 +21,7 @@ private: std::vector m_file_paths; }; -class IwdCreator : public IZoneAssetLoaderState +class IwdCreator : public IZoneAssetCreationState { public: IwdToCreate* GetOrAddIwd(const std::string& iwdName); diff --git a/src/ObjLoading/Asset/AssetCreationContext.cpp b/src/ObjLoading/Asset/AssetCreationContext.cpp index 307cc24c..cbe5d23f 100644 --- a/src/ObjLoading/Asset/AssetCreationContext.cpp +++ b/src/ObjLoading/Asset/AssetCreationContext.cpp @@ -63,7 +63,7 @@ std::unique_ptr GenericAssetRegistration::CreateXAssetInfo() } AssetCreationContext::AssetCreationContext(Zone& zone, const AssetCreatorCollection* creators, const IgnoredAssetLookup* ignoredAssetLookup) - : ZoneAssetLoaderContainer(zone), + : ZoneAssetCreationStateContainer(zone), m_creators(creators), m_ignored_asset_lookup(ignoredAssetLookup) { diff --git a/src/ObjLoading/Asset/AssetCreationContext.h b/src/ObjLoading/Asset/AssetCreationContext.h index c05351be..76ffde8b 100644 --- a/src/ObjLoading/Asset/AssetCreationContext.h +++ b/src/ObjLoading/Asset/AssetCreationContext.h @@ -1,6 +1,6 @@ #pragma once -#include "Asset/IZoneAssetLoaderState.h" +#include "Asset/IZoneAssetCreationState.h" #include "AssetRegistration.h" #include "Game/IAsset.h" #include "Pool/XAssetInfo.h" @@ -26,7 +26,7 @@ public: std::unordered_multimap m_ignored_asset_lookup; }; -class AssetCreationContext : public ZoneAssetLoaderContainer +class AssetCreationContext : public ZoneAssetCreationStateContainer { public: AssetCreationContext(Zone& zone, const AssetCreatorCollection* creators, const IgnoredAssetLookup* ignoredAssetLookup); diff --git a/src/ObjLoading/Asset/IZoneAssetCreationState.h b/src/ObjLoading/Asset/IZoneAssetCreationState.h new file mode 100644 index 00000000..f4a88340 --- /dev/null +++ b/src/ObjLoading/Asset/IZoneAssetCreationState.h @@ -0,0 +1,57 @@ +#pragma once + +#include "Zone/Zone.h" + +#include +#include +#include + +class IZoneAssetCreationState +{ +protected: + IZoneAssetCreationState() = default; + +public: + virtual ~IZoneAssetCreationState() = default; + IZoneAssetCreationState(const IZoneAssetCreationState& other) = default; + IZoneAssetCreationState(IZoneAssetCreationState&& other) noexcept = default; + IZoneAssetCreationState& operator=(const IZoneAssetCreationState& other) = default; + IZoneAssetCreationState& operator=(IZoneAssetCreationState&& other) noexcept = default; + + virtual void SetZone(Zone* zone) + { + // Do nothing by default + } +}; + +class ZoneAssetCreationStateContainer +{ +public: + ZoneAssetCreationStateContainer(Zone& zone) + : m_zone(zone) + { + } + + template T& GetZoneAssetCreationState() + { + static_assert(std::is_base_of_v, "T must inherit IZoneAssetCreationState"); + // T must also have a public default constructor + + const auto foundEntry = m_zone_asset_creation_states.find(typeid(T)); + if (foundEntry != m_zone_asset_creation_states.end()) + return *dynamic_cast(foundEntry->second.get()); + + auto newState = std::make_unique(); + newState->SetZone(&m_zone); + auto* newStatePtr = newState.get(); + m_zone_asset_creation_states.emplace(std::make_pair>(typeid(T), std::move(newState))); + + return *newStatePtr; + } + +protected: + Zone& m_zone; + +private: + std::unordered_map> m_zone_asset_creation_states; +}; diff --git a/src/ObjLoading/Asset/IZoneAssetLoaderState.h b/src/ObjLoading/Asset/IZoneAssetLoaderState.h deleted file mode 100644 index 5667af2e..00000000 --- a/src/ObjLoading/Asset/IZoneAssetLoaderState.h +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once - -#include "Zone/Zone.h" - -#include -#include -#include - -class IZoneAssetLoaderState -{ -protected: - IZoneAssetLoaderState() = default; - -public: - virtual ~IZoneAssetLoaderState() = default; - IZoneAssetLoaderState(const IZoneAssetLoaderState& other) = default; - IZoneAssetLoaderState(IZoneAssetLoaderState&& other) noexcept = default; - IZoneAssetLoaderState& operator=(const IZoneAssetLoaderState& other) = default; - IZoneAssetLoaderState& operator=(IZoneAssetLoaderState&& other) noexcept = default; - - virtual void SetZone(Zone* zone) - { - // Do nothing by default - } -}; - -class ZoneAssetLoaderContainer -{ -public: - ZoneAssetLoaderContainer(Zone& zone) - : m_zone(zone) - { - } - - template T& GetZoneAssetLoaderState() - { - static_assert(std::is_base_of_v, "T must inherit IZoneAssetLoaderState"); - // T must also have a public default constructor - - const auto foundEntry = m_zone_asset_loader_states.find(typeid(T)); - if (foundEntry != m_zone_asset_loader_states.end()) - return *dynamic_cast(foundEntry->second.get()); - - auto newState = std::make_unique(); - newState->SetZone(&m_zone); - auto* newStatePtr = newState.get(); - m_zone_asset_loader_states.emplace(std::make_pair>(typeid(T), std::move(newState))); - - return *newStatePtr; - } - -protected: - Zone& m_zone; - -private: - std::unordered_map> m_zone_asset_loader_states; -}; diff --git a/src/ObjLoading/Game/IW4/Material/LoaderMaterialIW4.cpp b/src/ObjLoading/Game/IW4/Material/LoaderMaterialIW4.cpp index 0311855c..51363e80 100644 --- a/src/ObjLoading/Game/IW4/Material/LoaderMaterialIW4.cpp +++ b/src/ObjLoading/Game/IW4/Material/LoaderMaterialIW4.cpp @@ -44,7 +44,7 @@ namespace m_search_path(searchPath), m_context(context), m_registration(registration), - m_state_map_cache(context.GetZoneAssetLoaderState()), + m_state_map_cache(context.GetZoneAssetCreationState()), m_base_state_bits{}, m_techset_creator(CreateTechsetLoader(memory, searchPath)) { @@ -792,7 +792,7 @@ namespace m_registration.AddDependency(techset); m_material.techniqueSet = techset->Asset(); - auto& definitionCache = m_context.GetZoneAssetLoaderState(); + auto& definitionCache = m_context.GetZoneAssetCreationState(); bool failure = false; const auto* techsetDefinition = m_techset_creator->LoadTechsetDefinition(techsetName, m_context, failure); diff --git a/src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp b/src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp index d97440ae..6dc661d9 100644 --- a/src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp +++ b/src/ObjLoading/Game/IW4/Menu/LoaderMenuListIW4.cpp @@ -28,8 +28,8 @@ namespace std::vector menus; AssetRegistration registration(assetName); - auto& zoneState = context.GetZoneAssetLoaderState(); - auto& conversionState = context.GetZoneAssetLoaderState(); + auto& zoneState = context.GetZoneAssetCreationState(); + auto& conversionState = context.GetZoneAssetCreationState(); std::deque menuLoadQueue; const auto alreadyLoadedMenuListFileMenus = conversionState.m_menus_by_filename.find(assetName); @@ -74,7 +74,7 @@ namespace void FinalizeZone(AssetCreationContext& context) override { - context.GetZoneAssetLoaderState().FinalizeSupportingData(); + context.GetZoneAssetCreationState().FinalizeSupportingData(); } private: diff --git a/src/ObjLoading/Game/IW4/Menu/MenuConversionZoneStateIW4.h b/src/ObjLoading/Game/IW4/Menu/MenuConversionZoneStateIW4.h index 9cdd0983..b28ef3de 100644 --- a/src/ObjLoading/Game/IW4/Menu/MenuConversionZoneStateIW4.h +++ b/src/ObjLoading/Game/IW4/Menu/MenuConversionZoneStateIW4.h @@ -1,13 +1,13 @@ #pragma once -#include "Asset/IZoneAssetLoaderState.h" +#include "Asset/IZoneAssetCreationState.h" #include "Game/IW4/IW4.h" #include namespace IW4 { - class MenuConversionZoneState final : public IZoneAssetLoaderState + class MenuConversionZoneState final : public IZoneAssetCreationState { Zone* m_zone; std::vector m_functions; diff --git a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp index 8e5bb2eb..bc07ad53 100644 --- a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp +++ b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp @@ -1112,8 +1112,8 @@ namespace public: MenuConverter(const bool disableOptimizations, ISearchPath& searchPath, MemoryManager& memory, AssetCreationContext& context) : AbstractMenuConverter(disableOptimizations, searchPath, memory, context), - m_conversion_zone_state(context.GetZoneAssetLoaderState()), - m_parsing_zone_state(context.GetZoneAssetLoaderState()) + m_conversion_zone_state(context.GetZoneAssetCreationState()), + m_parsing_zone_state(context.GetZoneAssetCreationState()) { } diff --git a/src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp b/src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp index 9edcc55a..8362dc3e 100644 --- a/src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp +++ b/src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp @@ -41,7 +41,7 @@ namespace } }; - class TechniqueZoneLoadingState final : public IZoneAssetLoaderState + class TechniqueZoneLoadingState final : public IZoneAssetCreationState { public: typedef const float (*literal_t)[4]; @@ -84,7 +84,7 @@ namespace std::map m_allocated_literals; }; - class ShaderInfoFromFileSystemCacheState final : public IZoneAssetLoaderState + class ShaderInfoFromFileSystemCacheState final : public IZoneAssetCreationState { std::unordered_map> m_cached_shader_info; @@ -205,9 +205,9 @@ namespace m_search_path(searchPath), m_memory(memory), m_context(context), - m_zone_state(context.GetZoneAssetLoaderState()), - m_state_map_cache(context.GetZoneAssetLoaderState()), - m_shader_info_cache(context.GetZoneAssetLoaderState()), + m_zone_state(context.GetZoneAssetCreationState()), + m_state_map_cache(context.GetZoneAssetCreationState()), + m_shader_info_cache(context.GetZoneAssetCreationState()), m_techset_creator(techsetCreator) { } @@ -1034,7 +1034,7 @@ namespace : m_search_path(searchPath), m_memory(memory), m_context(context), - m_zone_state(context.GetZoneAssetLoaderState()), + m_zone_state(context.GetZoneAssetCreationState()), m_techset_creator(techsetCreator) { } @@ -1313,7 +1313,7 @@ namespace techset::TechsetDefinition* LoadTechsetDefinition(const std::string& assetName, AssetCreationContext& context, bool& failure) override { failure = false; - auto& definitionCache = context.GetZoneAssetLoaderState(); + auto& definitionCache = context.GetZoneAssetCreationState(); auto* cachedTechsetDefinition = definitionCache.GetCachedTechsetDefinition(assetName); if (cachedTechsetDefinition) return cachedTechsetDefinition; @@ -1340,7 +1340,7 @@ namespace const state_map::StateMapDefinition* LoadStateMapDefinition(const std::string& stateMapName, AssetCreationContext& context) override { - auto& stateMapCache = context.GetZoneAssetLoaderState(); + auto& stateMapCache = context.GetZoneAssetCreationState(); auto* cachedStateMap = stateMapCache.GetCachedStateMap(stateMapName); if (cachedStateMap) return cachedStateMap; diff --git a/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp b/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp index 9d02da2a..5434043a 100644 --- a/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp +++ b/src/ObjLoading/Game/IW4/Weapon/InfoStringLoaderWeaponIW4.cpp @@ -392,7 +392,7 @@ namespace bool LoadAccuracyGraphs(WeaponFullDef& weaponFullDef, MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context) { - auto& accuracyGraphLoader = context.GetZoneAssetLoaderState(); + auto& accuracyGraphLoader = context.GetZoneAssetCreationState(); if (weaponFullDef.weapDef.aiVsAiAccuracyGraphName && weaponFullDef.weapDef.aiVsAiAccuracyGraphName[0]) { diff --git a/src/ObjLoading/Game/IW5/Menu/LoaderMenuListIW5.cpp b/src/ObjLoading/Game/IW5/Menu/LoaderMenuListIW5.cpp index 9306804f..e4058d18 100644 --- a/src/ObjLoading/Game/IW5/Menu/LoaderMenuListIW5.cpp +++ b/src/ObjLoading/Game/IW5/Menu/LoaderMenuListIW5.cpp @@ -28,8 +28,8 @@ namespace std::vector menus; AssetRegistration registration(assetName); - auto& zoneState = context.GetZoneAssetLoaderState(); - auto& conversionState = context.GetZoneAssetLoaderState(); + auto& zoneState = context.GetZoneAssetCreationState(); + auto& conversionState = context.GetZoneAssetCreationState(); std::deque menuLoadQueue; const auto alreadyLoadedMenuListFileMenus = conversionState.m_menus_by_filename.find(assetName); @@ -74,7 +74,7 @@ namespace void FinalizeZone(AssetCreationContext& context) override { - context.GetZoneAssetLoaderState().FinalizeSupportingData(); + context.GetZoneAssetCreationState().FinalizeSupportingData(); } private: diff --git a/src/ObjLoading/Game/IW5/Menu/MenuConversionZoneStateIW5.h b/src/ObjLoading/Game/IW5/Menu/MenuConversionZoneStateIW5.h index 236d7dd7..4b2056ef 100644 --- a/src/ObjLoading/Game/IW5/Menu/MenuConversionZoneStateIW5.h +++ b/src/ObjLoading/Game/IW5/Menu/MenuConversionZoneStateIW5.h @@ -1,13 +1,13 @@ #pragma once -#include "Asset/IZoneAssetLoaderState.h" +#include "Asset/IZoneAssetCreationState.h" #include "Game/IW5/IW5.h" #include namespace IW5 { - class MenuConversionZoneState final : public IZoneAssetLoaderState + class MenuConversionZoneState final : public IZoneAssetCreationState { Zone* m_zone; std::vector m_functions; diff --git a/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp b/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp index d7f5eaa7..b4bfc9a8 100644 --- a/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp +++ b/src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp @@ -1120,8 +1120,8 @@ namespace public: MenuConverter(const bool disableOptimizations, ISearchPath& searchPath, MemoryManager& memory, AssetCreationContext& context) : AbstractMenuConverter(disableOptimizations, searchPath, memory, context), - m_conversion_zone_state(context.GetZoneAssetLoaderState()), - m_parsing_zone_state(context.GetZoneAssetLoaderState()) + m_conversion_zone_state(context.GetZoneAssetCreationState()), + m_parsing_zone_state(context.GetZoneAssetCreationState()) { } diff --git a/src/ObjLoading/Game/IW5/Weapon/InfoStringLoaderWeaponIW5.cpp b/src/ObjLoading/Game/IW5/Weapon/InfoStringLoaderWeaponIW5.cpp index d5924591..39310e5a 100644 --- a/src/ObjLoading/Game/IW5/Weapon/InfoStringLoaderWeaponIW5.cpp +++ b/src/ObjLoading/Game/IW5/Weapon/InfoStringLoaderWeaponIW5.cpp @@ -822,7 +822,7 @@ namespace bool LoadAccuracyGraphs(WeaponFullDef& weaponFullDef, MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context) { - auto& accuracyGraphLoader = context.GetZoneAssetLoaderState(); + auto& accuracyGraphLoader = context.GetZoneAssetCreationState(); if (weaponFullDef.weapDef.aiVsAiAccuracyGraphName && weaponFullDef.weapDef.aiVsAiAccuracyGraphName[0]) { diff --git a/src/ObjLoading/Game/T6/Weapon/InfoStringLoaderWeaponT6.cpp b/src/ObjLoading/Game/T6/Weapon/InfoStringLoaderWeaponT6.cpp index 1e959152..d71ab521 100644 --- a/src/ObjLoading/Game/T6/Weapon/InfoStringLoaderWeaponT6.cpp +++ b/src/ObjLoading/Game/T6/Weapon/InfoStringLoaderWeaponT6.cpp @@ -409,7 +409,7 @@ namespace bool LoadAccuracyGraphs(WeaponFullDef& weaponFullDef, MemoryManager& memory, ISearchPath& searchPath, AssetCreationContext& context) { - auto& accuracyGraphLoader = context.GetZoneAssetLoaderState(); + auto& accuracyGraphLoader = context.GetZoneAssetCreationState(); if (weaponFullDef.weapDef.aiVsAiAccuracyGraphName && weaponFullDef.weapDef.aiVsAiAccuracyGraphName[0]) { diff --git a/src/ObjLoading/Parsing/Menu/MenuAssetZoneState.h b/src/ObjLoading/Parsing/Menu/MenuAssetZoneState.h index c2e24ce3..3130d261 100644 --- a/src/ObjLoading/Parsing/Menu/MenuAssetZoneState.h +++ b/src/ObjLoading/Parsing/Menu/MenuAssetZoneState.h @@ -1,6 +1,6 @@ #pragma once -#include "Asset/IZoneAssetLoaderState.h" +#include "Asset/IZoneAssetCreationState.h" #include "Domain/CommonFunctionDef.h" #include "Domain/CommonMenuDef.h" @@ -8,7 +8,7 @@ namespace menu { - class MenuAssetZoneState final : public IZoneAssetLoaderState + class MenuAssetZoneState final : public IZoneAssetCreationState { public: std::vector> m_functions; diff --git a/src/ObjLoading/Techset/TechniqueStateMapCache.h b/src/ObjLoading/Techset/TechniqueStateMapCache.h index f5d48b9f..aaf8b245 100644 --- a/src/ObjLoading/Techset/TechniqueStateMapCache.h +++ b/src/ObjLoading/Techset/TechniqueStateMapCache.h @@ -1,6 +1,6 @@ #pragma once -#include "Asset/IZoneAssetLoaderState.h" +#include "Asset/IZoneAssetCreationState.h" #include "StateMap/StateMapDefinition.h" #include "Utils/ClassUtils.h" @@ -10,7 +10,7 @@ namespace techset { - class TechniqueStateMapCache final : public IZoneAssetLoaderState + class TechniqueStateMapCache final : public IZoneAssetCreationState { public: _NODISCARD const state_map::StateMapDefinition* GetCachedStateMap(const std::string& name) const; diff --git a/src/ObjLoading/Techset/TechsetDefinitionCache.h b/src/ObjLoading/Techset/TechsetDefinitionCache.h index e11f9c47..b231f56c 100644 --- a/src/ObjLoading/Techset/TechsetDefinitionCache.h +++ b/src/ObjLoading/Techset/TechsetDefinitionCache.h @@ -1,6 +1,6 @@ #pragma once -#include "Asset/IZoneAssetLoaderState.h" +#include "Asset/IZoneAssetCreationState.h" #include "TechsetDefinition.h" #include "Utils/ClassUtils.h" @@ -10,7 +10,7 @@ namespace techset { - class TechsetDefinitionCache final : public IZoneAssetLoaderState + class TechsetDefinitionCache final : public IZoneAssetCreationState { public: _NODISCARD TechsetDefinition* GetCachedTechsetDefinition(const std::string& techsetName) const; diff --git a/src/ObjLoading/Weapon/AccuracyGraphLoader.h b/src/ObjLoading/Weapon/AccuracyGraphLoader.h index 3aadccd9..99610f22 100644 --- a/src/ObjLoading/Weapon/AccuracyGraphLoader.h +++ b/src/ObjLoading/Weapon/AccuracyGraphLoader.h @@ -1,6 +1,6 @@ #pragma once -#include "Asset/IZoneAssetLoaderState.h" +#include "Asset/IZoneAssetCreationState.h" #include "Parsing/GenericGraph2D.h" #include "SearchPath/ISearchPath.h" @@ -8,7 +8,7 @@ #include #include -class AccuracyGraphLoader final : public IZoneAssetLoaderState +class AccuracyGraphLoader final : public IZoneAssetCreationState { public: const GenericGraph2D* LoadAiVsAiGraph(ISearchPath& searchPath, const std::string& graphName);