From 00f03d9bb72ffe5ab262be5ebc4a63bd850b501d Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Thu, 10 Oct 2019 22:11:16 +0200 Subject: [PATCH] entt::resource_loader -> entt::loader --- docs/md/resource.md | 4 ++-- src/entt/resource/cache.hpp | 2 +- src/entt/resource/fwd.hpp | 4 ++-- src/entt/resource/loader.hpp | 4 ++-- test/entt/resource/resource.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/md/resource.md b/docs/md/resource.md index 0c3e5fdbf..4554e45fd 100644 --- a/docs/md/resource.md +++ b/docs/md/resource.md @@ -45,7 +45,7 @@ A _loader_ is a class the aim of which is to load a specific resource. It has to inherit directly from the dedicated base class as in the following example: ```cpp -struct my_loader final: entt::resource_loader { +struct my_loader final: entt::loader { // ... }; ``` @@ -57,7 +57,7 @@ resource.
As an example: ```cpp -struct my_loader: entt::resource_loader { +struct my_loader: entt::loader { std::shared_ptr load(int value) const { // ... return std::shared_ptr(new my_resource{ value }); diff --git a/src/entt/resource/cache.hpp b/src/entt/resource/cache.hpp index c0a598246..8ba042a4f 100644 --- a/src/entt/resource/cache.hpp +++ b/src/entt/resource/cache.hpp @@ -91,7 +91,7 @@ struct resource_cache { */ template resource_handle load(const resource_type id, Args &&... args) { - static_assert(std::is_base_of_v, Loader>); + static_assert(std::is_base_of_v, Loader>); resource_handle handle{}; if(auto it = resources.find(id); it == resources.cend()) { diff --git a/src/entt/resource/fwd.hpp b/src/entt/resource/fwd.hpp index 03ef2a280..490deff26 100644 --- a/src/entt/resource/fwd.hpp +++ b/src/entt/resource/fwd.hpp @@ -16,9 +16,9 @@ struct resource_cache; template class resource_handle; -/*! @class resource_loader */ +/*! @class loader */ template -class resource_loader; +class loader; } diff --git a/src/entt/resource/loader.hpp b/src/entt/resource/loader.hpp index 34fdde51d..9871e2a19 100644 --- a/src/entt/resource/loader.hpp +++ b/src/entt/resource/loader.hpp @@ -21,7 +21,7 @@ namespace entt { * @code{.cpp} * struct my_resource {}; * - * struct my_loader: entt::resource_loader { + * struct my_loader: entt::loader { * std::shared_ptr load(int) const { * // use the integer value somehow * return std::make_shared(); @@ -42,7 +42,7 @@ namespace entt { * @tparam Resource Type of resource for which to use the loader. */ template -class resource_loader { +class loader { /*! @brief Resource loaders are friends of their caches. */ friend struct resource_cache; diff --git a/test/entt/resource/resource.cpp b/test/entt/resource/resource.cpp index 9c6f24e05..2b5176586 100644 --- a/test/entt/resource/resource.cpp +++ b/test/entt/resource/resource.cpp @@ -5,13 +5,13 @@ struct resource { int value; }; -struct loader: entt::resource_loader { +struct loader: entt::loader { std::shared_ptr load(int value) const { return std::shared_ptr(new resource{ value }); } }; -struct broken_loader: entt::resource_loader { +struct broken_loader: entt::loader { std::shared_ptr load(int) const { return nullptr; }