mirror of
https://github.com/bevyengine/bevy
synced 2024-12-22 19:13:08 +00:00
584d14808a
# Objective Following the pattern established in #15593, we can reduce the API surface of `World` by providing a single function to grab both a singular entity reference, or multiple entity references. ## Solution The following functions can now also take multiple entity IDs and will return multiple entity references back: - `World::entity` - `World::get_entity` - `World::entity_mut` - `World::get_entity_mut` - `DeferredWorld::entity_mut` - `DeferredWorld::get_entity_mut` If you pass in X, you receive Y: - give a single `Entity`, receive a single `EntityRef`/`EntityWorldMut` (matches current behavior) - give a `[Entity; N]`/`&[Entity; N]` (array), receive an equally-sized `[EntityRef; N]`/`[EntityMut; N]` - give a `&[Entity]` (slice), receive a `Vec<EntityRef>`/`Vec<EntityMut>` - give a `&EntityHashSet`, receive a `EntityHashMap<EntityRef>`/`EntityHashMap<EntityMut>` Note that `EntityWorldMut` is only returned in the single-entity case, because having multiple at the same time would lead to UB. Also, `DeferredWorld` receives an `EntityMut` in the single-entity case because it does not allow structural access. ## Testing - Added doc-tests on `World::entity`, `World::entity_mut`, and `DeferredWorld::entity_mut` - Added tests for aliased mutability and entity existence --- ## Showcase <details> <summary>Click to view showcase</summary> The APIs for fetching `EntityRef`s and `EntityMut`s from the `World` have been unified. ```rust // This code will be referred to by subsequent code blocks. let world = World::new(); let e1 = world.spawn_empty().id(); let e2 = world.spawn_empty().id(); let e3 = world.spawn_empty().id(); ``` Querying for a single entity remains mostly the same: ```rust // 0.14 let eref: EntityRef = world.entity(e1); let emut: EntityWorldMut = world.entity_mut(e1); let eref: Option<EntityRef> = world.get_entity(e1); let emut: Option<EntityWorldMut> = world.get_entity_mut(e1); // 0.15 let eref: EntityRef = world.entity(e1); let emut: EntityWorldMut = world.entity_mut(e1); let eref: Result<EntityRef, Entity> = world.get_entity(e1); let emut: Result<EntityWorldMut, Entity> = world.get_entity_mut(e1); ``` Querying for multiple entities with an array has changed: ```rust // 0.14 let erefs: [EntityRef; 2] = world.many_entities([e1, e2]); let emuts: [EntityMut; 2] = world.many_entities_mut([e1, e2]); let erefs: Result<[EntityRef; 2], Entity> = world.get_many_entities([e1, e2]); let emuts: Result<[EntityMut; 2], QueryEntityError> = world.get_many_entities_mut([e1, e2]); // 0.15 let erefs: [EntityRef; 2] = world.entity([e1, e2]); let emuts: [EntityMut; 2] = world.entity_mut([e1, e2]); let erefs: Result<[EntityRef; 2], Entity> = world.get_entity([e1, e2]); let emuts: Result<[EntityMut; 2], EntityFetchError> = world.get_entity_mut([e1, e2]); ``` Querying for multiple entities with a slice has changed: ```rust let ids = vec![e1, e2, e3]); // 0.14 let erefs: Result<Vec<EntityRef>, Entity> = world.get_many_entities_dynamic(&ids[..]); let emuts: Result<Vec<EntityMut>, QueryEntityError> = world.get_many_entities_dynamic_mut(&ids[..]); // 0.15 let erefs: Result<Vec<EntityRef>, Entity> = world.get_entity(&ids[..]); let emuts: Result<Vec<EntityMut>, EntityFetchError> = world.get_entity_mut(&ids[..]); let erefs: Vec<EntityRef> = world.entity(&ids[..]); // Newly possible! let emuts: Vec<EntityMut> = world.entity_mut(&ids[..]); // Newly possible! ``` Querying for multiple entities with an `EntityHashSet` has changed: ```rust let set = EntityHashSet::from_iter([e1, e2, e3]); // 0.14 let emuts: Result<Vec<EntityMut>, QueryEntityError> = world.get_many_entities_from_set_mut(&set); // 0.15 let emuts: Result<EntityHashMap<EntityMut>, EntityFetchError> = world.get_entity_mut(&set); let erefs: Result<EntityHashMap<EntityRef>, EntityFetchError> = world.get_entity(&set); // Newly possible! let emuts: EntityHashMap<EntityMut> = world.entity_mut(&set); // Newly possible! let erefs: EntityHashMap<EntityRef> = world.entity(&set); // Newly possible! ``` </details> ## Migration Guide - `World::get_entity` now returns `Result<_, Entity>` instead of `Option<_>`. - Use `world.get_entity(..).ok()` to return to the previous behavior. - `World::get_entity_mut` and `DeferredWorld::get_entity_mut` now return `Result<_, EntityFetchError>` instead of `Option<_>`. - Use `world.get_entity_mut(..).ok()` to return to the previous behavior. - Type inference for `World::entity`, `World::entity_mut`, `World::get_entity`, `World::get_entity_mut`, `DeferredWorld::entity_mut`, and `DeferredWorld::get_entity_mut` has changed, and might now require the input argument's type to be explicitly written when inside closures. - The following functions have been deprecated, and should be replaced as such: - `World::many_entities` -> `World::entity::<[Entity; N]>` - `World::many_entities_mut` -> `World::entity_mut::<[Entity; N]>` - `World::get_many_entities` -> `World::get_entity::<[Entity; N]>` - `World::get_many_entities_dynamic` -> `World::get_entity::<&[Entity]>` - `World::get_many_entities_mut` -> `World::get_entity_mut::<[Entity; N]>` - The equivalent return type has changed from `Result<_, QueryEntityError>` to `Result<_, EntityFetchError>` - `World::get_many_entities_dynamic_mut` -> `World::get_entity_mut::<&[Entity]>1 - The equivalent return type has changed from `Result<_, QueryEntityError>` to `Result<_, EntityFetchError>` - `World::get_many_entities_from_set_mut` -> `World::get_entity_mut::<&EntityHashSet>` - The equivalent return type has changed from `Result<Vec<EntityMut>, QueryEntityError>` to `Result<EntityHashMap<EntityMut>, EntityFetchError>`. If necessary, you can still convert the `EntityHashMap` into a `Vec`.
345 lines
11 KiB
Rust
345 lines
11 KiB
Rust
use crate::components::{Children, Parent};
|
|
use bevy_ecs::{
|
|
entity::Entity,
|
|
system::EntityCommands,
|
|
world::{Command, EntityWorldMut, World},
|
|
};
|
|
use bevy_utils::tracing::debug;
|
|
|
|
/// Despawns the given entity and all its children recursively
|
|
#[derive(Debug)]
|
|
pub struct DespawnRecursive {
|
|
/// Target entity
|
|
pub entity: Entity,
|
|
/// Whether or not this command should output a warning if the entity does not exist
|
|
pub warn: bool,
|
|
}
|
|
|
|
/// Despawns the given entity's children recursively
|
|
#[derive(Debug)]
|
|
pub struct DespawnChildrenRecursive {
|
|
/// Target entity
|
|
pub entity: Entity,
|
|
/// Whether or not this command should output a warning if the entity does not exist
|
|
pub warn: bool,
|
|
}
|
|
|
|
/// Function for despawning an entity and all its children
|
|
pub fn despawn_with_children_recursive(world: &mut World, entity: Entity, warn: bool) {
|
|
// first, make the entity's own parent forget about it
|
|
if let Some(parent) = world.get::<Parent>(entity).map(|parent| parent.0) {
|
|
if let Some(mut children) = world.get_mut::<Children>(parent) {
|
|
children.0.retain(|c| *c != entity);
|
|
}
|
|
}
|
|
|
|
// then despawn the entity and all of its children
|
|
despawn_with_children_recursive_inner(world, entity, warn);
|
|
}
|
|
|
|
// Should only be called by `despawn_with_children_recursive` and `try_despawn_with_children_recursive`!
|
|
fn despawn_with_children_recursive_inner(world: &mut World, entity: Entity, warn: bool) {
|
|
if let Some(mut children) = world.get_mut::<Children>(entity) {
|
|
for e in core::mem::take(&mut children.0) {
|
|
despawn_with_children_recursive_inner(world, e, warn);
|
|
}
|
|
}
|
|
|
|
if warn {
|
|
if !world.despawn(entity) {
|
|
debug!("Failed to despawn entity {:?}", entity);
|
|
}
|
|
} else if !world.try_despawn(entity) {
|
|
debug!("Failed to despawn entity {:?}", entity);
|
|
}
|
|
}
|
|
|
|
fn despawn_children_recursive(world: &mut World, entity: Entity, warn: bool) {
|
|
if let Some(children) = world.entity_mut(entity).take::<Children>() {
|
|
for e in children.0 {
|
|
despawn_with_children_recursive_inner(world, e, warn);
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Command for DespawnRecursive {
|
|
fn apply(self, world: &mut World) {
|
|
#[cfg(feature = "trace")]
|
|
let _span = bevy_utils::tracing::info_span!(
|
|
"command",
|
|
name = "DespawnRecursive",
|
|
entity = bevy_utils::tracing::field::debug(self.entity),
|
|
warn = bevy_utils::tracing::field::debug(self.warn)
|
|
)
|
|
.entered();
|
|
despawn_with_children_recursive(world, self.entity, self.warn);
|
|
}
|
|
}
|
|
|
|
impl Command for DespawnChildrenRecursive {
|
|
fn apply(self, world: &mut World) {
|
|
#[cfg(feature = "trace")]
|
|
let _span = bevy_utils::tracing::info_span!(
|
|
"command",
|
|
name = "DespawnChildrenRecursive",
|
|
entity = bevy_utils::tracing::field::debug(self.entity),
|
|
warn = bevy_utils::tracing::field::debug(self.warn)
|
|
)
|
|
.entered();
|
|
|
|
despawn_children_recursive(world, self.entity, self.warn);
|
|
}
|
|
}
|
|
|
|
/// Trait that holds functions for despawning recursively down the transform hierarchy
|
|
pub trait DespawnRecursiveExt {
|
|
/// Despawns the provided entity alongside all descendants.
|
|
fn despawn_recursive(self);
|
|
|
|
/// Despawns all descendants of the given entity.
|
|
fn despawn_descendants(&mut self) -> &mut Self;
|
|
|
|
/// Similar to [`Self::despawn_recursive`] but does not emit warnings
|
|
fn try_despawn_recursive(self);
|
|
|
|
/// Similar to [`Self::despawn_descendants`] but does not emit warnings
|
|
fn try_despawn_descendants(&mut self) -> &mut Self;
|
|
}
|
|
|
|
impl DespawnRecursiveExt for EntityCommands<'_> {
|
|
/// Despawns the provided entity and its children.
|
|
/// This will emit warnings for any entity that does not exist.
|
|
fn despawn_recursive(mut self) {
|
|
let entity = self.id();
|
|
self.commands()
|
|
.queue(DespawnRecursive { entity, warn: true });
|
|
}
|
|
|
|
fn despawn_descendants(&mut self) -> &mut Self {
|
|
let entity = self.id();
|
|
self.commands()
|
|
.queue(DespawnChildrenRecursive { entity, warn: true });
|
|
self
|
|
}
|
|
|
|
/// Despawns the provided entity and its children.
|
|
/// This will never emit warnings.
|
|
fn try_despawn_recursive(mut self) {
|
|
let entity = self.id();
|
|
self.commands().queue(DespawnRecursive {
|
|
entity,
|
|
warn: false,
|
|
});
|
|
}
|
|
|
|
fn try_despawn_descendants(&mut self) -> &mut Self {
|
|
let entity = self.id();
|
|
self.commands().queue(DespawnChildrenRecursive {
|
|
entity,
|
|
warn: false,
|
|
});
|
|
self
|
|
}
|
|
}
|
|
|
|
fn despawn_recursive_inner(world: EntityWorldMut, warn: bool) {
|
|
let entity = world.id();
|
|
|
|
#[cfg(feature = "trace")]
|
|
let _span = bevy_utils::tracing::info_span!(
|
|
"despawn_recursive",
|
|
entity = bevy_utils::tracing::field::debug(entity),
|
|
warn = bevy_utils::tracing::field::debug(warn)
|
|
)
|
|
.entered();
|
|
|
|
despawn_with_children_recursive(world.into_world_mut(), entity, warn);
|
|
}
|
|
|
|
fn despawn_descendants_inner<'v, 'w>(
|
|
world: &'v mut EntityWorldMut<'w>,
|
|
warn: bool,
|
|
) -> &'v mut EntityWorldMut<'w> {
|
|
let entity = world.id();
|
|
|
|
#[cfg(feature = "trace")]
|
|
let _span = bevy_utils::tracing::info_span!(
|
|
"despawn_descendants",
|
|
entity = bevy_utils::tracing::field::debug(entity),
|
|
warn = bevy_utils::tracing::field::debug(warn)
|
|
)
|
|
.entered();
|
|
|
|
world.world_scope(|world| {
|
|
despawn_children_recursive(world, entity, warn);
|
|
});
|
|
world
|
|
}
|
|
|
|
impl<'w> DespawnRecursiveExt for EntityWorldMut<'w> {
|
|
/// Despawns the provided entity and its children.
|
|
/// This will emit warnings for any entity that does not exist.
|
|
fn despawn_recursive(self) {
|
|
despawn_recursive_inner(self, true);
|
|
}
|
|
|
|
fn despawn_descendants(&mut self) -> &mut Self {
|
|
despawn_descendants_inner(self, true)
|
|
}
|
|
|
|
/// Despawns the provided entity and its children.
|
|
/// This will not emit warnings.
|
|
fn try_despawn_recursive(self) {
|
|
despawn_recursive_inner(self, false);
|
|
}
|
|
|
|
fn try_despawn_descendants(&mut self) -> &mut Self {
|
|
despawn_descendants_inner(self, false)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use bevy_ecs::{
|
|
component::Component,
|
|
system::Commands,
|
|
world::{CommandQueue, World},
|
|
};
|
|
|
|
use super::DespawnRecursiveExt;
|
|
use crate::{
|
|
child_builder::{BuildChildren, ChildBuild},
|
|
components::Children,
|
|
};
|
|
|
|
#[derive(Component, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Debug)]
|
|
struct Idx(u32);
|
|
|
|
#[derive(Component, Clone, PartialEq, Eq, Ord, PartialOrd, Debug)]
|
|
struct N(String);
|
|
|
|
#[test]
|
|
fn despawn_recursive() {
|
|
let mut world = World::default();
|
|
let mut queue = CommandQueue::default();
|
|
let grandparent_entity;
|
|
{
|
|
let mut commands = Commands::new(&mut queue, &world);
|
|
|
|
commands
|
|
.spawn((N("Another parent".to_owned()), Idx(0)))
|
|
.with_children(|parent| {
|
|
parent.spawn((N("Another child".to_owned()), Idx(1)));
|
|
});
|
|
|
|
// Create a grandparent entity which will _not_ be deleted
|
|
grandparent_entity = commands.spawn((N("Grandparent".to_owned()), Idx(2))).id();
|
|
commands.entity(grandparent_entity).with_children(|parent| {
|
|
// Add a child to the grandparent (the "parent"), which will get deleted
|
|
parent
|
|
.spawn((N("Parent, to be deleted".to_owned()), Idx(3)))
|
|
// All descendants of the "parent" should also be deleted.
|
|
.with_children(|parent| {
|
|
parent
|
|
.spawn((N("First Child, to be deleted".to_owned()), Idx(4)))
|
|
.with_children(|parent| {
|
|
// child
|
|
parent.spawn((
|
|
N("First grand child, to be deleted".to_owned()),
|
|
Idx(5),
|
|
));
|
|
});
|
|
parent.spawn((N("Second child, to be deleted".to_owned()), Idx(6)));
|
|
});
|
|
});
|
|
|
|
commands.spawn((N("An innocent bystander".to_owned()), Idx(7)));
|
|
}
|
|
queue.apply(&mut world);
|
|
|
|
let parent_entity = world.get::<Children>(grandparent_entity).unwrap()[0];
|
|
|
|
{
|
|
let mut commands = Commands::new(&mut queue, &world);
|
|
commands.entity(parent_entity).despawn_recursive();
|
|
// despawning the same entity twice should not panic
|
|
commands.entity(parent_entity).despawn_recursive();
|
|
}
|
|
queue.apply(&mut world);
|
|
|
|
let mut results = world
|
|
.query::<(&N, &Idx)>()
|
|
.iter(&world)
|
|
.map(|(a, b)| (a.clone(), *b))
|
|
.collect::<Vec<_>>();
|
|
results.sort_unstable_by_key(|(_, index)| *index);
|
|
|
|
{
|
|
let children = world.get::<Children>(grandparent_entity).unwrap();
|
|
assert!(
|
|
!children.iter().any(|&i| i == parent_entity),
|
|
"grandparent should no longer know about its child which has been removed"
|
|
);
|
|
}
|
|
|
|
assert_eq!(
|
|
results,
|
|
vec![
|
|
(N("Another parent".to_owned()), Idx(0)),
|
|
(N("Another child".to_owned()), Idx(1)),
|
|
(N("Grandparent".to_owned()), Idx(2)),
|
|
(N("An innocent bystander".to_owned()), Idx(7))
|
|
]
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn despawn_descendants() {
|
|
let mut world = World::default();
|
|
let mut queue = CommandQueue::default();
|
|
let mut commands = Commands::new(&mut queue, &world);
|
|
|
|
let parent = commands.spawn_empty().id();
|
|
let child = commands.spawn_empty().id();
|
|
|
|
commands
|
|
.entity(parent)
|
|
.add_child(child)
|
|
.despawn_descendants();
|
|
|
|
queue.apply(&mut world);
|
|
|
|
// The parent's Children component should be removed.
|
|
assert!(world.entity(parent).get::<Children>().is_none());
|
|
// The child should be despawned.
|
|
assert!(world.get_entity(child).is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn spawn_children_after_despawn_descendants() {
|
|
let mut world = World::default();
|
|
let mut queue = CommandQueue::default();
|
|
let mut commands = Commands::new(&mut queue, &world);
|
|
|
|
let parent = commands.spawn_empty().id();
|
|
let child = commands.spawn_empty().id();
|
|
|
|
commands
|
|
.entity(parent)
|
|
.add_child(child)
|
|
.despawn_descendants()
|
|
.with_children(|parent| {
|
|
parent.spawn_empty();
|
|
parent.spawn_empty();
|
|
});
|
|
|
|
queue.apply(&mut world);
|
|
|
|
// The parent's Children component should still have two children.
|
|
let children = world.entity(parent).get::<Children>();
|
|
assert!(children.is_some());
|
|
assert_eq!(children.unwrap().len(), 2_usize);
|
|
// The original child should be despawned.
|
|
assert!(world.get_entity(child).is_err());
|
|
}
|
|
}
|