From 04b80b5208332d8b2f1c2ee5566c58a8a7551400 Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 22 Apr 2024 18:52:13 +0200 Subject: [PATCH] chore: move AddAsset function shortcuts to interface --- .../AssetLoading/AssetLoadingManager.cpp | 25 ++------------ .../AssetLoading/AssetLoadingManager.h | 33 +++++++------------ .../AssetLoading/IAssetLoadingManager.h | 31 ++++++++++------- .../Mock/MockAssetLoadingManager.cpp | 20 ----------- .../Mock/MockAssetLoadingManager.h | 11 ------- 5 files changed, 35 insertions(+), 85 deletions(-) diff --git a/src/ObjLoading/AssetLoading/AssetLoadingManager.cpp b/src/ObjLoading/AssetLoading/AssetLoadingManager.cpp index c05a7c5f..c6c6208f 100644 --- a/src/ObjLoading/AssetLoading/AssetLoadingManager.cpp +++ b/src/ObjLoading/AssetLoading/AssetLoadingManager.cpp @@ -31,26 +31,6 @@ XAssetInfoGeneric* AssetLoadingManager::AddAssetInternal(std::unique_ptr dependencies, - std::vector usedScriptStrings) -{ - return AddAsset(std::make_unique(assetType, assetName, asset, std::move(dependencies), std::move(usedScriptStrings))); -} - -XAssetInfoGeneric* AssetLoadingManager::AddAsset(asset_type_t assetType, - const std::string& assetName, - void* asset, - std::vector dependencies, - std::vector usedScriptStrings, - std::vector indirectAssetReferences) -{ - return AddAsset(std::make_unique( - assetType, assetName, asset, std::move(dependencies), std::move(usedScriptStrings), std::move(indirectAssetReferences))); -} - XAssetInfoGeneric* AssetLoadingManager::AddAsset(std::unique_ptr xAssetInfo) { xAssetInfo->m_zone = m_context.m_zone; @@ -66,7 +46,8 @@ XAssetInfoGeneric* AssetLoadingManager::LoadIgnoredDependency(const asset_type_t auto* linkAsset = loader->CreateEmptyAsset(assetName, m_context.m_zone->GetMemory()); if (linkAsset) { - AddAsset(assetType, assetName, linkAsset, std::vector(), std::vector()); + IAssetLoadingManager::AddAsset( + assetType, assetName, linkAsset, std::vector(), std::vector(), std::vector()); auto* lastDependency = m_last_dependency_loaded; m_last_dependency_loaded = nullptr; return lastDependency; @@ -85,7 +66,7 @@ XAssetInfoGeneric* AssetLoadingManager::LoadIgnoredDependency(const asset_type_t return nullptr; } -XAssetInfoGeneric* AssetLoadingManager::LoadAssetDependency(const asset_type_t assetType, const std::string& assetName, IAssetLoader* loader) +XAssetInfoGeneric* AssetLoadingManager::LoadAssetDependency(const asset_type_t assetType, const std::string& assetName, const IAssetLoader* loader) { if (loader->CanLoadFromGdt() && !m_context.m_gdt_files.empty() && loader->LoadFromGdt(assetName, &m_context, m_context.m_zone->GetMemory(), this, m_context.m_zone)) diff --git a/src/ObjLoading/AssetLoading/AssetLoadingManager.h b/src/ObjLoading/AssetLoading/AssetLoadingManager.h index 23fac1f0..3a5e4808 100644 --- a/src/ObjLoading/AssetLoading/AssetLoadingManager.h +++ b/src/ObjLoading/AssetLoading/AssetLoadingManager.h @@ -1,4 +1,5 @@ #pragma once + #include "AssetLoadingContext.h" #include "IAssetLoader.h" #include "IAssetLoadingManager.h" @@ -7,34 +8,24 @@ class AssetLoadingManager final : public IAssetLoadingManager { - const std::map>& m_asset_loaders_by_type; - AssetLoadingContext& m_context; - XAssetInfoGeneric* m_last_dependency_loaded; - - XAssetInfoGeneric* LoadIgnoredDependency(asset_type_t assetType, const std::string& assetName, IAssetLoader* loader); - XAssetInfoGeneric* LoadAssetDependency(asset_type_t assetType, const std::string& assetName, IAssetLoader* loader); - - XAssetInfoGeneric* AddAssetInternal(std::unique_ptr xAssetInfo); - public: AssetLoadingManager(const std::map>& assetLoadersByType, AssetLoadingContext& context); bool LoadAssetFromLoader(asset_type_t assetType, const std::string& assetName); - _NODISCARD AssetLoadingContext* GetAssetLoadingContext() const override; + [[nodiscard]] AssetLoadingContext* GetAssetLoadingContext() const override; - XAssetInfoGeneric* AddAsset(asset_type_t assetType, - const std::string& assetName, - void* asset, - std::vector dependencies, - std::vector usedScriptStrings) override; - XAssetInfoGeneric* AddAsset(asset_type_t assetType, - const std::string& assetName, - void* asset, - std::vector dependencies, - std::vector usedScriptStrings, - std::vector indirectAssetReferences) override; XAssetInfoGeneric* AddAsset(std::unique_ptr xAssetInfo) override; XAssetInfoGeneric* LoadDependency(asset_type_t assetType, const std::string& assetName) override; IndirectAssetReference LoadIndirectAssetReference(asset_type_t assetType, const std::string& assetName) override; + +private: + XAssetInfoGeneric* LoadIgnoredDependency(asset_type_t assetType, const std::string& assetName, IAssetLoader* loader); + XAssetInfoGeneric* LoadAssetDependency(asset_type_t assetType, const std::string& assetName, const IAssetLoader* loader); + + XAssetInfoGeneric* AddAssetInternal(std::unique_ptr xAssetInfo); + + const std::map>& m_asset_loaders_by_type; + AssetLoadingContext& m_context; + XAssetInfoGeneric* m_last_dependency_loaded; }; diff --git a/src/ObjLoading/AssetLoading/IAssetLoadingManager.h b/src/ObjLoading/AssetLoading/IAssetLoadingManager.h index 0d90a6f2..b7283769 100644 --- a/src/ObjLoading/AssetLoading/IAssetLoadingManager.h +++ b/src/ObjLoading/AssetLoading/IAssetLoadingManager.h @@ -18,17 +18,6 @@ public: _NODISCARD virtual AssetLoadingContext* GetAssetLoadingContext() const = 0; - virtual XAssetInfoGeneric* AddAsset(asset_type_t assetType, - const std::string& assetName, - void* asset, - std::vector dependencies, - std::vector usedScriptStrings) = 0; - virtual XAssetInfoGeneric* AddAsset(asset_type_t assetType, - const std::string& assetName, - void* asset, - std::vector dependencies, - std::vector usedScriptStrings, - std::vector indirectAssetReferences) = 0; virtual XAssetInfoGeneric* AddAsset(std::unique_ptr xAssetInfo) = 0; XAssetInfoGeneric* AddAsset(const asset_type_t assetType, const std::string& assetName, void* asset) @@ -41,6 +30,26 @@ public: return AddAsset(assetType, assetName, asset, std::move(dependencies), std::vector()); } + XAssetInfoGeneric* AddAsset(const asset_type_t assetType, + const std::string& assetName, + void* asset, + std::vector dependencies, + std::vector usedScriptStrings) + { + return AddAsset(assetType, assetName, asset, std::move(dependencies), std::move(usedScriptStrings), std::vector()); + } + + XAssetInfoGeneric* AddAsset(const asset_type_t assetType, + const std::string& assetName, + void* asset, + std::vector dependencies, + std::vector usedScriptStrings, + std::vector indirectAssetReferences) + { + return AddAsset(std::make_unique( + assetType, assetName, asset, std::move(dependencies), std::move(usedScriptStrings), std::move(indirectAssetReferences))); + } + virtual XAssetInfoGeneric* LoadDependency(asset_type_t assetType, const std::string& assetName) = 0; virtual IndirectAssetReference LoadIndirectAssetReference(asset_type_t assetType, const std::string& assetName) = 0; }; diff --git a/test/ObjLoadingTests/Mock/MockAssetLoadingManager.cpp b/test/ObjLoadingTests/Mock/MockAssetLoadingManager.cpp index ea45e05e..2934ea27 100644 --- a/test/ObjLoadingTests/Mock/MockAssetLoadingManager.cpp +++ b/test/ObjLoadingTests/Mock/MockAssetLoadingManager.cpp @@ -20,26 +20,6 @@ XAssetInfoGeneric* MockAssetLoadingManager::AddAsset(std::unique_ptr dependencies, - std::vector usedScriptStrings) -{ - return AddAsset(std::make_unique(assetType, assetName, asset, std::move(dependencies), std::move(usedScriptStrings))); -} - -XAssetInfoGeneric* MockAssetLoadingManager::AddAsset(asset_type_t assetType, - const std::string& assetName, - void* asset, - std::vector dependencies, - std::vector usedScriptStrings, - std::vector indirectAssetReferences) -{ - return AddAsset(std::make_unique( - assetType, assetName, asset, std::move(dependencies), std::move(usedScriptStrings), std::move(indirectAssetReferences))); -} - XAssetInfoGeneric* MockAssetLoadingManager::LoadDependency(const asset_type_t assetType, const std::string& assetName) { auto foundDependencies = m_available_dependencies.find(assetName); diff --git a/test/ObjLoadingTests/Mock/MockAssetLoadingManager.h b/test/ObjLoadingTests/Mock/MockAssetLoadingManager.h index 107e61ee..5e112146 100644 --- a/test/ObjLoadingTests/Mock/MockAssetLoadingManager.h +++ b/test/ObjLoadingTests/Mock/MockAssetLoadingManager.h @@ -18,17 +18,6 @@ public: _NODISCARD AssetLoadingContext* GetAssetLoadingContext() const override; XAssetInfoGeneric* AddAsset(std::unique_ptr xAssetInfo) override; - XAssetInfoGeneric* AddAsset(asset_type_t assetType, - const std::string& assetName, - void* asset, - std::vector dependencies, - std::vector usedScriptStrings) override; - XAssetInfoGeneric* AddAsset(asset_type_t assetType, - const std::string& assetName, - void* asset, - std::vector dependencies, - std::vector usedScriptStrings, - std::vector indirectAssetReferences) override; XAssetInfoGeneric* LoadDependency(asset_type_t assetType, const std::string& assetName) override; IndirectAssetReference LoadIndirectAssetReference(asset_type_t assetType, const std::string& assetName) override;