Преглед на файлове

sparse_set: rename context to bind

Michele Caini преди 4 години
родител
ревизия
f7be386d5a
променени са 5 файла, в които са добавени 13 реда и са изтрити 13 реда
  1. 3 3
      src/entt/entity/registry.hpp
  2. 2 2
      src/entt/entity/sparse_set.hpp
  3. 4 4
      src/entt/entity/storage.hpp
  4. 3 3
      test/entt/entity/sigh_storage_mixin.cpp
  5. 1 1
      test/entt/entity/sparse_set.cpp

+ 3 - 3
src/entt/entity/registry.hpp

@@ -108,7 +108,7 @@ class basic_registry {
 
         if(!pdata.pool) {
             pdata.pool.reset(new storage_type<Component>{});
-            pdata.pool->context(forward_as_any(*this));
+            pdata.pool->bind(forward_as_any(*this));
             pdata.info = &type_id<Component>();
         }
 
@@ -168,7 +168,7 @@ public:
           entities{std::move(other.entities)},
           free_list{other.free_list} {
         for(auto &&pdata: pools) {
-            pdata.second.pool->context(forward_as_any(*this));
+            pdata.second.pool->bind(forward_as_any(*this));
         }
     }
 
@@ -185,7 +185,7 @@ public:
         free_list = other.free_list;
 
         for(auto &&pdata: pools) {
-            pdata.second.pool->context(forward_as_any(*this));
+            pdata.second.pool->bind(forward_as_any(*this));
         }
 
         return *this;

+ 2 - 2
src/entt/entity/sparse_set.hpp

@@ -838,8 +838,8 @@ public:
         }
     }
 
-    /*! @brief Forwards context variables to mixins, if any. */
-    virtual void context(any) ENTT_NOEXCEPT {}
+    /*! @brief Forwards variables to mixins, if any. */
+    virtual void bind(any) ENTT_NOEXCEPT {}
 
 private:
     sparse_container_type sparse;

+ 4 - 4
src/entt/entity/storage.hpp

@@ -999,13 +999,13 @@ public:
     }
 
     /**
-     * @brief Forwards context variables to mixins, if any.
-     * @param value A context variable wrapped in an opaque container.
+     * @brief Forwards variables to mixins, if any.
+     * @param value A variable wrapped in an opaque container.
      */
-    void context(any value) ENTT_NOEXCEPT final {
+    void bind(any value) ENTT_NOEXCEPT final {
         auto *reg = any_cast<basic_registry<entity_type>>(&value);
         owner = reg ? reg : owner;
-        Type::context(std::move(value));
+        Type::bind(std::move(value));
     }
 
 private:

+ 3 - 3
test/entt/entity/sigh_storage_mixin.cpp

@@ -39,7 +39,7 @@ TEST(SighStorageMixin, GenericType) {
     entt::entity entities[2u]{entt::entity{3}, entt::entity{42}};
     entt::registry registry{};
 
-    pool.context(entt::forward_as_any(registry));
+    pool.bind(entt::forward_as_any(registry));
 
     counter on_construct{};
     counter on_destroy{};
@@ -104,7 +104,7 @@ TEST(SighStorageMixin, EmptyType) {
     entt::entity entities[2u]{entt::entity{3}, entt::entity{42}};
     entt::registry registry{};
 
-    pool.context(entt::forward_as_any(registry));
+    pool.bind(entt::forward_as_any(registry));
 
     counter on_construct{};
     counter on_destroy{};
@@ -169,7 +169,7 @@ TEST(SighStorageMixin, NonDefaultConstructibleType) {
     entt::entity entities[2u]{entt::entity{3}, entt::entity{42}};
     entt::registry registry{};
 
-    pool.context(entt::forward_as_any(registry));
+    pool.bind(entt::forward_as_any(registry));
 
     counter on_construct{};
     counter on_destroy{};

+ 1 - 1
test/entt/entity/sparse_set.cpp

@@ -76,7 +76,7 @@ TEST(SparseSet, Functionalities) {
     ASSERT_FALSE(set.contains(entt::entity{0}));
     ASSERT_FALSE(set.contains(entt::entity{42}));
 
-    ASSERT_NO_THROW(set.context(entt::any{}));
+    ASSERT_NO_THROW(set.bind(entt::any{}));
 }
 
 TEST(SparseSet, Contains) {