
# Objective My motivation are to resolve some of the issues I describe in this [PR](https://github.com/bevyengine/bevy/issues/11415): - not being able to easily mapping entities because the current EntityMapper requires `&mut World` access - not being able to create my own `EntityMapper` because some components (`Parent` or `Children`) do not provide any public way of modifying the inner entities This PR makes the `MapEntities` trait accept a generic type that implements `Mapper` to perform the mapping. This means we don't need to use `EntityMapper` to perform our mapping, we can use any type that implements `Mapper`. Basically this change is very similar to what `serde` does. Instead of specifying directly how to map entities for a given type, we have 2 distinct steps: - the user implements `MapEntities` to define how the type will be traversed and which `Entity`s will be mapped - the `Mapper` defines how the mapping is actually done This is similar to the distinction between `Serialize` (`MapEntities`) and `Serializer` (`Mapper`). This allows networking library to map entities without having to use the existing `EntityMapper` (which requires `&mut World` access and the use of `world_scope()`) ## Migration Guide - The existing `EntityMapper` (notably used to replicate `Scenes` across different `World`s) has been renamed to `SceneEntityMapper` - The `MapEntities` trait now works with a generic `EntityMapper` instead of the specific struct `EntityMapper`. Calls to `fn map_entities(&mut self, entity_mapper: &mut EntityMapper)` need to be updated to `fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M)` - The new trait `EntityMapper` has been added to the prelude --------- Co-authored-by: Charles Bournhonesque <cbournhonesque@snapchat.com> Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com> Co-authored-by: UkoeHB <37489173+UkoeHB@users.noreply.github.com>
165 lines
5.5 KiB
Rust
165 lines
5.5 KiB
Rust
#[cfg(feature = "reflect")]
|
|
use bevy_ecs::reflect::{ReflectComponent, ReflectMapEntities};
|
|
use bevy_ecs::{
|
|
component::Component,
|
|
entity::{Entity, EntityMapper, MapEntities},
|
|
prelude::FromWorld,
|
|
world::World,
|
|
};
|
|
use bevy_utils::smallvec::SmallVec;
|
|
use core::slice;
|
|
use std::ops::Deref;
|
|
|
|
/// Contains references to the child entities of this entity.
|
|
///
|
|
/// Each child must contain a [`Parent`] component that points back to this entity.
|
|
/// This component rarely needs to be created manually,
|
|
/// consider using higher level utilities like [`BuildChildren::with_children`]
|
|
/// which are safer and easier to use.
|
|
///
|
|
/// See [`HierarchyQueryExt`] for hierarchy related methods on [`Query`].
|
|
///
|
|
/// [`HierarchyQueryExt`]: crate::query_extension::HierarchyQueryExt
|
|
/// [`Query`]: bevy_ecs::system::Query
|
|
/// [`Parent`]: crate::components::parent::Parent
|
|
/// [`BuildChildren::with_children`]: crate::child_builder::BuildChildren::with_children
|
|
#[derive(Component, Debug)]
|
|
#[cfg_attr(feature = "reflect", derive(bevy_reflect::Reflect))]
|
|
#[cfg_attr(feature = "reflect", reflect(Component, MapEntities))]
|
|
pub struct Children(pub(crate) SmallVec<[Entity; 8]>);
|
|
|
|
impl MapEntities for Children {
|
|
fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
|
|
for entity in &mut self.0 {
|
|
*entity = entity_mapper.map_entity(*entity);
|
|
}
|
|
}
|
|
}
|
|
|
|
// TODO: We need to impl either FromWorld or Default so Children can be registered as Reflect.
|
|
// This is because Reflect deserialize by creating an instance and apply a patch on top.
|
|
// However Children should only ever be set with a real user-defined entities. Its worth looking
|
|
// into better ways to handle cases like this.
|
|
impl FromWorld for Children {
|
|
#[inline]
|
|
fn from_world(_world: &mut World) -> Self {
|
|
Children(SmallVec::new())
|
|
}
|
|
}
|
|
|
|
impl Children {
|
|
/// Constructs a [`Children`] component with the given entities.
|
|
#[inline]
|
|
pub(crate) fn from_entities(entities: &[Entity]) -> Self {
|
|
Self(SmallVec::from_slice(entities))
|
|
}
|
|
|
|
/// Swaps the child at `a_index` with the child at `b_index`.
|
|
#[inline]
|
|
pub fn swap(&mut self, a_index: usize, b_index: usize) {
|
|
self.0.swap(a_index, b_index);
|
|
}
|
|
|
|
/// Sorts children [stably](https://en.wikipedia.org/wiki/Sorting_algorithm#Stability)
|
|
/// in place using the provided comparator function.
|
|
///
|
|
/// For the underlying implementation, see [`slice::sort_by`].
|
|
///
|
|
/// For the unstable version, see [`sort_unstable_by`](Children::sort_unstable_by).
|
|
///
|
|
/// See also [`sort_by_key`](Children::sort_by_key), [`sort_by_cached_key`](Children::sort_by_cached_key).
|
|
#[inline]
|
|
pub fn sort_by<F>(&mut self, compare: F)
|
|
where
|
|
F: FnMut(&Entity, &Entity) -> std::cmp::Ordering,
|
|
{
|
|
self.0.sort_by(compare);
|
|
}
|
|
|
|
/// Sorts children [stably](https://en.wikipedia.org/wiki/Sorting_algorithm#Stability)
|
|
/// in place using the provided key extraction function.
|
|
///
|
|
/// For the underlying implementation, see [`slice::sort_by_key`].
|
|
///
|
|
/// For the unstable version, see [`sort_unstable_by_key`](Children::sort_unstable_by_key).
|
|
///
|
|
/// See also [`sort_by`](Children::sort_by), [`sort_by_cached_key`](Children::sort_by_cached_key).
|
|
#[inline]
|
|
pub fn sort_by_key<K, F>(&mut self, compare: F)
|
|
where
|
|
F: FnMut(&Entity) -> K,
|
|
K: Ord,
|
|
{
|
|
self.0.sort_by_key(compare);
|
|
}
|
|
|
|
/// Sorts children [stably](https://en.wikipedia.org/wiki/Sorting_algorithm#Stability)
|
|
/// in place using the provided key extraction function. Only evaluates each key at most
|
|
/// once per sort, caching the intermediate results in memory.
|
|
///
|
|
/// For the underlying implementation, see [`slice::sort_by_cached_key`].
|
|
///
|
|
/// See also [`sort_by`](Children::sort_by), [`sort_by_key`](Children::sort_by_key).
|
|
#[inline]
|
|
pub fn sort_by_cached_key<K, F>(&mut self, compare: F)
|
|
where
|
|
F: FnMut(&Entity) -> K,
|
|
K: Ord,
|
|
{
|
|
self.0.sort_by_cached_key(compare);
|
|
}
|
|
|
|
/// Sorts children [unstably](https://en.wikipedia.org/wiki/Sorting_algorithm#Stability)
|
|
/// in place using the provided comparator function.
|
|
///
|
|
/// For the underlying implementation, see [`slice::sort_unstable_by`].
|
|
///
|
|
/// For the stable version, see [`sort_by`](Children::sort_by).
|
|
///
|
|
/// See also [`sort_unstable_by_key`](Children::sort_unstable_by_key).
|
|
#[inline]
|
|
pub fn sort_unstable_by<F>(&mut self, compare: F)
|
|
where
|
|
F: FnMut(&Entity, &Entity) -> std::cmp::Ordering,
|
|
{
|
|
self.0.sort_unstable_by(compare);
|
|
}
|
|
|
|
/// Sorts children [unstably](https://en.wikipedia.org/wiki/Sorting_algorithm#Stability)
|
|
/// in place using the provided key extraction function.
|
|
///
|
|
/// For the underlying implementation, see [`slice::sort_unstable_by_key`].
|
|
///
|
|
/// For the stable version, see [`sort_by_key`](Children::sort_by_key).
|
|
///
|
|
/// See also [`sort_unstable_by`](Children::sort_unstable_by).
|
|
#[inline]
|
|
pub fn sort_unstable_by_key<K, F>(&mut self, compare: F)
|
|
where
|
|
F: FnMut(&Entity) -> K,
|
|
K: Ord,
|
|
{
|
|
self.0.sort_unstable_by_key(compare);
|
|
}
|
|
}
|
|
|
|
impl Deref for Children {
|
|
type Target = [Entity];
|
|
|
|
#[inline(always)]
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0[..]
|
|
}
|
|
}
|
|
|
|
impl<'a> IntoIterator for &'a Children {
|
|
type Item = <Self::IntoIter as Iterator>::Item;
|
|
|
|
type IntoIter = slice::Iter<'a, Entity>;
|
|
|
|
#[inline(always)]
|
|
fn into_iter(self) -> Self::IntoIter {
|
|
self.0.iter()
|
|
}
|
|
}
|