zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 00:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: use const reference for assetName in GetAsset methods

Browse Source
This commit is contained in:
Jan 2024-03-30 17:19:32 +01:00
parent d26fda2e92
commit e7a9e4b528
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
15 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZoneCommon/Game/IW3/GameAssetPoolIW3.cpp
View File

@ -169,7 +169,7 @@ XAssetInfoGeneric* GameAssetPoolIW3::AddAssetToPool(std::unique_ptr<XAssetInfoGe
#undef CASE_ADD_TO_POOL #undef CASE_ADD_TO_POOL
} }
XAssetInfoGeneric* GameAssetPoolIW3::GetAsset(const asset_type_t type, std::string name) const XAssetInfoGeneric* GameAssetPoolIW3::GetAsset(const asset_type_t type, const std::string& name) const
{ {
#define CASE_GET_ASSET(assetType, poolName) \ #define CASE_GET_ASSET(assetType, poolName) \
case assetType: \ case assetType: \

2
src/ZoneCommon/Game/IW3/GameAssetPoolIW3.h
View File

@ -52,7 +52,7 @@ public:
void InitPoolStatic(asset_type_t type, size_t capacity) override; void InitPoolStatic(asset_type_t type, size_t capacity) override;
void InitPoolDynamic(asset_type_t type) override; void InitPoolDynamic(asset_type_t type) override;
_NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, std::string name) const override; _NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, const std::string& name) const override;
static const char* AssetTypeNameByType(asset_type_t assetType); static const char* AssetTypeNameByType(asset_type_t assetType);
_NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override; _NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override;

4
src/ZoneCommon/Game/IW4/GameAssetPoolIW4.cpp
View File

@ -200,13 +200,13 @@ XAssetInfoGeneric* GameAssetPoolIW4::AddAssetToPool(std::unique_ptr<XAssetInfoGe
#undef CASE_ADD_TO_POOL #undef CASE_ADD_TO_POOL
} }
XAssetInfoGeneric* GameAssetPoolIW4::GetAsset(const asset_type_t type, std::string name) const XAssetInfoGeneric* GameAssetPoolIW4::GetAsset(const asset_type_t type, const std::string& name) const
{ {
#define CASE_GET_ASSET(assetType, poolName) \ #define CASE_GET_ASSET(assetType, poolName) \
case assetType: \ case assetType: \
{ \ { \
if ((poolName) != nullptr) \ if ((poolName) != nullptr) \
return (poolName)->GetAsset(std::move(name)); \ return (poolName)->GetAsset(name); \
break; \ break; \
} }

2
src/ZoneCommon/Game/IW4/GameAssetPoolIW4.h
View File

@ -60,7 +60,7 @@ public:
void InitPoolStatic(asset_type_t type, size_t capacity) override; void InitPoolStatic(asset_type_t type, size_t capacity) override;
void InitPoolDynamic(asset_type_t type) override; void InitPoolDynamic(asset_type_t type) override;
_NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, std::string name) const override; _NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, const std::string& name) const override;
static const char* AssetTypeNameByType(asset_type_t assetType); static const char* AssetTypeNameByType(asset_type_t assetType);
_NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override; _NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override;

2
src/ZoneCommon/Game/IW5/GameAssetPoolIW5.cpp
View File

@ -253,7 +253,7 @@ XAssetInfoGeneric* GameAssetPoolIW5::AddAssetToPool(std::unique_ptr<XAssetInfoGe
#undef CASE_ADD_TO_POOL #undef CASE_ADD_TO_POOL
} }
XAssetInfoGeneric* GameAssetPoolIW5::GetAsset(const asset_type_t type, std::string name) const XAssetInfoGeneric* GameAssetPoolIW5::GetAsset(const asset_type_t type, const std::string& name) const
{ {
#define CASE_GET_ASSET(assetType, poolName) \ #define CASE_GET_ASSET(assetType, poolName) \
case assetType: \ case assetType: \

2
src/ZoneCommon/Game/IW5/GameAssetPoolIW5.h
View File

@ -64,7 +64,7 @@ public:
void InitPoolStatic(asset_type_t type, size_t capacity) override; void InitPoolStatic(asset_type_t type, size_t capacity) override;
void InitPoolDynamic(asset_type_t type) override; void InitPoolDynamic(asset_type_t type) override;
_NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, std::string name) const override; _NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, const std::string& name) const override;
static const char* AssetTypeNameByType(asset_type_t assetType); static const char* AssetTypeNameByType(asset_type_t assetType);
_NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override; _NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override;

2
src/ZoneCommon/Game/T5/GameAssetPoolT5.cpp
View File

@ -193,7 +193,7 @@ XAssetInfoGeneric* GameAssetPoolT5::AddAssetToPool(std::unique_ptr<XAssetInfoGen
#undef CASE_ADD_TO_POOL #undef CASE_ADD_TO_POOL
} }
XAssetInfoGeneric* GameAssetPoolT5::GetAsset(const asset_type_t type, std::string name) const XAssetInfoGeneric* GameAssetPoolT5::GetAsset(const asset_type_t type, const std::string& name) const
{ {
#define CASE_GET_ASSET(assetType, poolName) \ #define CASE_GET_ASSET(assetType, poolName) \
case assetType: \ case assetType: \

2
src/ZoneCommon/Game/T5/GameAssetPoolT5.h
View File

@ -56,7 +56,7 @@ public:
void InitPoolStatic(asset_type_t type, size_t capacity) override; void InitPoolStatic(asset_type_t type, size_t capacity) override;
void InitPoolDynamic(asset_type_t type) override; void InitPoolDynamic(asset_type_t type) override;
_NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, std::string name) const override; _NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, const std::string& name) const override;
static const char* AssetTypeNameByType(asset_type_t assetType); static const char* AssetTypeNameByType(asset_type_t assetType);
_NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override; _NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override;

4
src/ZoneCommon/Game/T6/GameAssetPoolT6.cpp
View File

@ -294,13 +294,13 @@ XAssetInfoGeneric* GameAssetPoolT6::AddAssetToPool(std::unique_ptr<XAssetInfoGen
#undef CASE_ADD_TO_POOL #undef CASE_ADD_TO_POOL
} }
XAssetInfoGeneric* GameAssetPoolT6::GetAsset(const asset_type_t type, std::string name) const XAssetInfoGeneric* GameAssetPoolT6::GetAsset(const asset_type_t type, const std::string& name) const
{ {
#define CASE_GET_ASSET(assetType, poolName) \ #define CASE_GET_ASSET(assetType, poolName) \
case assetType: \ case assetType: \
{ \ { \
if ((poolName) != nullptr) \ if ((poolName) != nullptr) \
return (poolName)->GetAsset(std::move(name)); \ return (poolName)->GetAsset(name); \
break; \ break; \
} }

2
src/ZoneCommon/Game/T6/GameAssetPoolT6.h
View File

@ -72,7 +72,7 @@ public:
void InitPoolStatic(asset_type_t type, size_t capacity) override; void InitPoolStatic(asset_type_t type, size_t capacity) override;
void InitPoolDynamic(asset_type_t type) override; void InitPoolDynamic(asset_type_t type) override;
_NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, std::string name) const override; _NODISCARD XAssetInfoGeneric* GetAsset(asset_type_t type, const std::string& name) const override;
static const char* AssetTypeNameByType(asset_type_t assetType); static const char* AssetTypeNameByType(asset_type_t assetType);
_NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override; _NODISCARD const char* GetAssetTypeName(asset_type_t assetType) const override;

2
src/ZoneCommon/Pool/ZoneAssetPools.h
View File

@ -38,7 +38,7 @@ public:
std::vector<XAssetInfoGeneric*> dependencies, std::vector<XAssetInfoGeneric*> dependencies,
std::vector<scr_string_t> usedScriptStrings, std::vector<scr_string_t> usedScriptStrings,
std::vector<IndirectAssetReference> indirectAssetReferences); std::vector<IndirectAssetReference> indirectAssetReferences);
_NODISCARD virtual XAssetInfoGeneric* GetAsset(asset_type_t type, std::string name) const = 0; _NODISCARD virtual XAssetInfoGeneric* GetAsset(asset_type_t type, const std::string& name) const = 0;
_NODISCARD virtual asset_type_t GetAssetTypeCount() const = 0; _NODISCARD virtual asset_type_t GetAssetTypeCount() const = 0;
_NODISCARD virtual const char* GetAssetTypeName(asset_type_t assetType) const = 0; _NODISCARD virtual const char* GetAssetTypeName(asset_type_t assetType) const = 0;

4
src/ZoneLoading/Loading/AssetLoader.cpp
View File

@ -20,7 +20,7 @@ XAssetInfoGeneric* AssetLoader::LinkAsset(std::string name,
m_asset_type, std::move(name), asset, std::move(dependencies), std::move(scriptStrings), std::move(indirectAssetReferences)); m_asset_type, std::move(name), asset, std::move(dependencies), std::move(scriptStrings), std::move(indirectAssetReferences));
} }
XAssetInfoGeneric* AssetLoader::GetAssetInfo(std::string name) const XAssetInfoGeneric* AssetLoader::GetAssetInfo(const std::string& name) const
{ {
return m_zone->m_pools->GetAsset(m_asset_type, std::move(name)); return m_zone->m_pools->GetAsset(m_asset_type, name);
} }

2
src/ZoneLoading/Loading/AssetLoader.h
View File

@ -22,5 +22,5 @@ protected:
std::vector<scr_string_t> scriptStrings, std::vector<scr_string_t> scriptStrings,
std::vector<IndirectAssetReference> indirectAssetReferences) const; std::vector<IndirectAssetReference> indirectAssetReferences) const;
_NODISCARD XAssetInfoGeneric* GetAssetInfo(std::string name) const; _NODISCARD XAssetInfoGeneric* GetAssetInfo(const std::string& name) const;
}; };

4
src/ZoneLoading/Loading/AssetMarker.cpp
View File

@ -55,9 +55,9 @@ void AssetMarker::MarkArray_IndirectAssetRef(const asset_type_t type, const char
Mark_IndirectAssetRef(type, assetRefNames[index]); Mark_IndirectAssetRef(type, assetRefNames[index]);
} }
XAssetInfoGeneric* AssetMarker::GetAssetInfoByName(std::string name) const XAssetInfoGeneric* AssetMarker::GetAssetInfoByName(const std::string& name) const
{ {
return m_zone->m_pools->GetAsset(m_asset_type, std::move(name)); return m_zone->m_pools->GetAsset(m_asset_type, name);
} }
std::vector<XAssetInfoGeneric*> AssetMarker::GetDependencies() const std::vector<XAssetInfoGeneric*> AssetMarker::GetDependencies() const

2
src/ZoneLoading/Loading/AssetMarker.h
View File

@ -26,7 +26,7 @@ protected:
void Mark_IndirectAssetRef(asset_type_t type, const char* assetRefName); void Mark_IndirectAssetRef(asset_type_t type, const char* assetRefName);
void MarkArray_IndirectAssetRef(asset_type_t type, const char** assetRefNames, size_t count); void MarkArray_IndirectAssetRef(asset_type_t type, const char** assetRefNames, size_t count);
_NODISCARD XAssetInfoGeneric* GetAssetInfoByName(std::string name) const; _NODISCARD XAssetInfoGeneric* GetAssetInfoByName(const std::string& name) const;
Zone* m_zone; Zone* m_zone;