sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/AppFilesystemComponent: Rename GetOrLoad to Load

This commit is contained in:
SirLynix 2023-02-02 18:30:24 +01:00
parent 1406705491
commit 3d2aa94ac4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Core/AppFilesystemComponent.hpp
View File

@ -37,8 +37,8 @@ namespace Nz
template<typename T> const typename T::Params* GetDefaultResourceParameters() const;
template<typename T> std::shared_ptr<T> GetOrLoad(std::string_view assetPath);
template<typename T> std::shared_ptr<T> GetOrLoad(std::string_view assetPath, typename T::Params params);
template<typename T> std::shared_ptr<T> Load(std::string_view assetPath);
template<typename T> std::shared_ptr<T> Load(std::string_view assetPath, typename T::Params params);
inline const VirtualDirectoryPtr& Mount(std::string_view name, std::filesystem::path filepath);
inline const VirtualDirectoryPtr& Mount(std::string_view name, VirtualDirectoryPtr directory);
@ -51,7 +51,7 @@ namespace Nz
static inline void RegisterResourceTypes();
private:
template<typename T> std::shared_ptr<T> GetOrLoadImpl(std::string_view assetPath, const typename T::Params& params);
template<typename T> std::shared_ptr<T> LoadImpl(std::string_view assetPath, const typename T::Params& params);
std::vector<std::unique_ptr<ResourceParameters>> m_defaultParameters;
VirtualDirectoryPtr m_rootDirectory;

10
include/Nazara/Core/AppFilesystemComponent.inl
View File

@ -36,13 +36,13 @@ namespace Nz
}
template<typename T>
std::shared_ptr<T> AppFilesystemComponent::GetOrLoad(std::string_view assetPath)
std::shared_ptr<T> AppFilesystemComponent::Load(std::string_view assetPath)
{
return GetOrLoad<T>(assetPath, typename T::Params{});
return Load<T>(assetPath, typename T::Params{});
}
template<typename T>
std::shared_ptr<T> AppFilesystemComponent::GetOrLoad(std::string_view assetPath, typename T::Params params)
std::shared_ptr<T> AppFilesystemComponent::Load(std::string_view assetPath, typename T::Params params)
{
if constexpr (Detail::ResourceParameterHasMerge<typename T::Params>::value)
{
@ -50,7 +50,7 @@ namespace Nz
params.Merge(*defaultParams);
}
return GetOrLoadImpl<T>(assetPath, params);
return LoadImpl<T>(assetPath, params);
}
inline const VirtualDirectoryPtr& AppFilesystemComponent::Mount(std::string_view name, std::filesystem::path filepath)
@ -115,7 +115,7 @@ namespace Nz
}
template<typename T>
std::shared_ptr<T> AppFilesystemComponent::GetOrLoadImpl(std::string_view assetPath, const typename T::Params& params)
std::shared_ptr<T> AppFilesystemComponent::LoadImpl(std::string_view assetPath, const typename T::Params& params)
{
std::shared_ptr<T> resource;
if (!m_rootDirectory)