Jelajahi Sumber

entt::resource_loader -> entt::loader

Michele Caini 6 tahun lalu
induk
melakukan
00f03d9bb7

+ 2 - 2
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<my_loader, my_resource> {
+struct my_loader final: entt::loader<my_loader, my_resource> {
     // ...
 };
 ```
@@ -57,7 +57,7 @@ resource.<br/>
 As an example:
 
 ```cpp
-struct my_loader: entt::resource_loader<my_loader, my_resource> {
+struct my_loader: entt::loader<my_loader, my_resource> {
     std::shared_ptr<my_resource> load(int value) const {
         // ...
         return std::shared_ptr<my_resource>(new my_resource{ value });

+ 1 - 1
src/entt/resource/cache.hpp

@@ -91,7 +91,7 @@ struct resource_cache {
      */
     template<typename Loader, typename... Args>
     resource_handle<Resource> load(const resource_type id, Args &&... args) {
-        static_assert(std::is_base_of_v<resource_loader<Loader, Resource>, Loader>);
+        static_assert(std::is_base_of_v<loader<Loader, Resource>, Loader>);
         resource_handle<Resource> handle{};
 
         if(auto it = resources.find(id); it == resources.cend()) {

+ 2 - 2
src/entt/resource/fwd.hpp

@@ -16,9 +16,9 @@ struct resource_cache;
 template<typename>
 class resource_handle;
 
-/*! @class resource_loader */
+/*! @class loader */
 template<typename, typename>
-class resource_loader;
+class loader;
 
 
 }

+ 2 - 2
src/entt/resource/loader.hpp

@@ -21,7 +21,7 @@ namespace entt {
  * @code{.cpp}
  * struct my_resource {};
  *
- * struct my_loader: entt::resource_loader<my_loader, my_resource> {
+ * struct my_loader: entt::loader<my_loader, my_resource> {
  *     std::shared_ptr<my_resource> load(int) const {
  *         // use the integer value somehow
  *         return std::make_shared<my_resource>();
@@ -42,7 +42,7 @@ namespace entt {
  * @tparam Resource Type of resource for which to use the loader.
  */
 template<typename Loader, typename Resource>
-class resource_loader {
+class loader {
     /*! @brief Resource loaders are friends of their caches. */
     friend struct resource_cache<Resource>;
 

+ 2 - 2
test/entt/resource/resource.cpp

@@ -5,13 +5,13 @@
 
 struct resource { int value; };
 
-struct loader: entt::resource_loader<loader, resource> {
+struct loader: entt::loader<loader, resource> {
     std::shared_ptr<resource> load(int value) const {
         return std::shared_ptr<resource>(new resource{ value });
     }
 };
 
-struct broken_loader: entt::resource_loader<broken_loader, resource> {
+struct broken_loader: entt::loader<broken_loader, resource> {
     std::shared_ptr<resource> load(int) const {
         return nullptr;
     }