diff --git a/include/Nazara/Core/AppFilesystemComponent.hpp b/include/Nazara/Core/AppFilesystemComponent.hpp index aa943171f..89bb3ae81 100644 --- a/include/Nazara/Core/AppFilesystemComponent.hpp +++ b/include/Nazara/Core/AppFilesystemComponent.hpp @@ -37,8 +37,8 @@ namespace Nz template const typename T::Params* GetDefaultResourceParameters() const; - template std::shared_ptr GetOrLoad(std::string_view assetPath); - template std::shared_ptr GetOrLoad(std::string_view assetPath, typename T::Params params); + template std::shared_ptr Load(std::string_view assetPath); + template std::shared_ptr 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 std::shared_ptr GetOrLoadImpl(std::string_view assetPath, const typename T::Params& params); + template std::shared_ptr LoadImpl(std::string_view assetPath, const typename T::Params& params); std::vector> m_defaultParameters; VirtualDirectoryPtr m_rootDirectory; diff --git a/include/Nazara/Core/AppFilesystemComponent.inl b/include/Nazara/Core/AppFilesystemComponent.inl index 5e37944be..833e2d168 100644 --- a/include/Nazara/Core/AppFilesystemComponent.inl +++ b/include/Nazara/Core/AppFilesystemComponent.inl @@ -36,13 +36,13 @@ namespace Nz } template - std::shared_ptr AppFilesystemComponent::GetOrLoad(std::string_view assetPath) + std::shared_ptr AppFilesystemComponent::Load(std::string_view assetPath) { - return GetOrLoad(assetPath, typename T::Params{}); + return Load(assetPath, typename T::Params{}); } template - std::shared_ptr AppFilesystemComponent::GetOrLoad(std::string_view assetPath, typename T::Params params) + std::shared_ptr AppFilesystemComponent::Load(std::string_view assetPath, typename T::Params params) { if constexpr (Detail::ResourceParameterHasMerge::value) { @@ -50,7 +50,7 @@ namespace Nz params.Merge(*defaultParams); } - return GetOrLoadImpl(assetPath, params); + return LoadImpl(assetPath, params); } inline const VirtualDirectoryPtr& AppFilesystemComponent::Mount(std::string_view name, std::filesystem::path filepath) @@ -115,7 +115,7 @@ namespace Nz } template - std::shared_ptr AppFilesystemComponent::GetOrLoadImpl(std::string_view assetPath, const typename T::Params& params) + std::shared_ptr AppFilesystemComponent::LoadImpl(std::string_view assetPath, const typename T::Params& params) { std::shared_ptr resource; if (!m_rootDirectory)