فهرست منبع

registry: drop ::release (deprecated function)

Michele Caini 2 سال پیش
والد
کامیت
22914d4687
2فایلهای تغییر یافته به همراه4 افزوده شده و 47 حذف شده
  1. 0 17
      src/entt/entity/registry.hpp
  2. 4 30
      test/entt/entity/registry.cpp

+ 0 - 17
src/entt/entity/registry.hpp

@@ -548,23 +548,6 @@ public:
         return entities.current(entt);
     }
 
-    /**
-     * @brief Releases an identifier.
-     *
-     * The suggested version or the valid version closest to the suggested one
-     * is used instead of the implicitly generated version.
-     *
-     * @param entt A valid identifier.
-     * @param version A desired version upon destruction.
-     * @return The version actually assigned to the entity.
-     */
-    [[deprecated("use .orphan(entt), then .storage<Entity>().erase(entt)/.bump(next) instead")]] version_type release(const entity_type entt, const version_type version) {
-        ENTT_ASSERT(orphan(entt), "Non-orphan entity");
-        entities.erase(entt);
-        const auto elem = traits_type::construct(traits_type::to_entity(entt), version);
-        return entities.bump((elem == tombstone) ? traits_type::next(elem) : elem);
-    }
-
     /**
      * @brief Destroys an entity and releases its identifier.
      *

+ 4 - 30
test/entt/entity/registry.cpp

@@ -788,45 +788,19 @@ TEST(Registry, StableDestroy) {
     ASSERT_EQ(registry.storage<double>().size(), 0u);
 }
 
-TEST(Registry, ReleaseVersion) {
-    entt::registry registry;
-    entt::entity entities[2u];
-
-    registry.create(std::begin(entities), std::end(entities));
-
-    ASSERT_EQ(registry.current(entities[0u]), 0u);
-    ASSERT_EQ(registry.current(entities[1u]), 0u);
-
-    registry.release(entities[0u]);
-    registry.release(entities[1u], 3);
-
-    ASSERT_EQ(registry.current(entities[0u]), 1u);
-    ASSERT_EQ(registry.current(entities[1u]), 3u);
-}
-
-ENTT_DEBUG_TEST(RegistryDeathTest, ReleaseVersion) {
-    entt::registry registry;
-    entt::entity entity = registry.create();
-
-    registry.release(entity);
-
-    ASSERT_DEATH(registry.release(entity), "");
-    ASSERT_DEATH(registry.release(entity, 3), "");
-}
-
 TEST(Registry, VersionOverflow) {
     using traits_type = entt::entt_traits<entt::entity>;
 
     entt::registry registry;
     const auto entity = registry.create();
 
-    registry.release(entity);
+    registry.destroy(entity);
 
     ASSERT_NE(registry.current(entity), traits_type::to_version(entity));
     ASSERT_NE(registry.current(entity), typename traits_type::version_type{});
 
-    registry.release(registry.create(), traits_type::to_version(entt::tombstone) - 1u);
-    registry.release(registry.create());
+    registry.destroy(registry.create(), traits_type::to_version(entt::tombstone) - 1u);
+    registry.destroy(registry.create());
 
     ASSERT_EQ(registry.current(entity), traits_type::to_version(entity));
     ASSERT_EQ(registry.current(entity), typename traits_type::version_type{});
@@ -852,7 +826,7 @@ TEST(Registry, TombstoneVersion) {
     const auto vers = traits_type::to_version(entity);
     const auto required = traits_type::construct(traits_type::to_entity(other), vers);
 
-    ASSERT_NE(registry.release(other, vers), vers);
+    ASSERT_NE(registry.destroy(other, vers), vers);
     ASSERT_NE(registry.create(required), required);
 }