
# Objective There are currently too many disparate ways to handle entity mapping, especially after #17687. We now have MapEntities, VisitEntities, VisitEntitiesMut, Component::visit_entities, Component::visit_entities_mut. Our only known use case at the moment for these is entity mapping. This means we have significant consolidation potential. Additionally, VisitEntitiesMut cannot be implemented for map-style collections like HashSets, as you cant "just" mutate a `&mut Entity`. Our current approach to Component mapping requires VisitEntitiesMut, meaning this category of entity collection isn't mappable. `MapEntities` is more generally applicable. Additionally, the _existence_ of the blanket From impl on VisitEntitiesMut blocks us from implementing MapEntities for HashSets (or any types we don't own), because the owner could always add a conflicting impl in the future. ## Solution Use `MapEntities` everywhere and remove all "visit entities" usages. * Add `Component::map_entities` * Remove `Component::visit_entities`, `Component::visit_entities_mut`, `VisitEntities`, and `VisitEntitiesMut` * Support deriving `Component::map_entities` in `#[derive(Coomponent)]` * Add `#[derive(MapEntities)]`, and share logic with the `Component::map_entities` derive. * Add `ComponentCloneCtx::queue_deferred`, which is command-like logic that runs immediately after normal clones. Reframe `FromWorld` fallback logic in the "reflect clone" impl to use it. This cuts out a lot of unnecessary work and I think justifies the existence of a pseudo-command interface (given how niche, yet performance sensitive this is). Note that we no longer auto-impl entity mapping for ` IntoIterator<Item = &'a Entity>` types, as this would block our ability to implement cases like `HashMap`. This means the onus is on us (or type authors) to add explicit support for types that should be mappable. Also note that the Component-related changes do not require a migration guide as there hasn't been a release with them yet. ## Migration Guide If you were previously implementing `VisitEntities` or `VisitEntitiesMut` (likely via a derive), instead use `MapEntities`. Those were almost certainly used in the context of Bevy Scenes or reflection via `ReflectMapEntities`. If you have a case that uses `VisitEntities` or `VisitEntitiesMut` directly, where `MapEntities` is not a viable replacement, please let us know! ```rust // before #[derive(VisitEntities, VisitEntitiesMut)] struct Inventory { items: Vec<Entity>, #[visit_entities(ignore)] label: String, } // after #[derive(MapEntities)] struct Inventory { #[entities] items: Vec<Entity>, label: String, } ```
146 lines
4.4 KiB
Rust
146 lines
4.4 KiB
Rust
//! Types that enable reflection support.
|
|
|
|
use core::{
|
|
any::TypeId,
|
|
ops::{Deref, DerefMut},
|
|
};
|
|
|
|
use crate::{resource::Resource, world::World};
|
|
use bevy_reflect::{
|
|
std_traits::ReflectDefault, PartialReflect, Reflect, ReflectFromReflect, TypePath,
|
|
TypeRegistry, TypeRegistryArc,
|
|
};
|
|
|
|
mod bundle;
|
|
mod component;
|
|
mod entity_commands;
|
|
mod from_world;
|
|
mod map_entities;
|
|
mod resource;
|
|
|
|
pub use bundle::{ReflectBundle, ReflectBundleFns};
|
|
pub use component::{ReflectComponent, ReflectComponentFns};
|
|
pub use entity_commands::ReflectCommandExt;
|
|
pub use from_world::{ReflectFromWorld, ReflectFromWorldFns};
|
|
pub use map_entities::ReflectMapEntities;
|
|
pub use resource::{ReflectResource, ReflectResourceFns};
|
|
|
|
/// A [`Resource`] storing [`TypeRegistry`] for
|
|
/// type registrations relevant to a whole app.
|
|
#[derive(Resource, Clone, Default)]
|
|
pub struct AppTypeRegistry(pub TypeRegistryArc);
|
|
|
|
impl Deref for AppTypeRegistry {
|
|
type Target = TypeRegistryArc;
|
|
|
|
#[inline]
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl DerefMut for AppTypeRegistry {
|
|
#[inline]
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
&mut self.0
|
|
}
|
|
}
|
|
|
|
/// A [`Resource`] storing [`FunctionRegistry`] for
|
|
/// function registrations relevant to a whole app.
|
|
///
|
|
/// [`FunctionRegistry`]: bevy_reflect::func::FunctionRegistry
|
|
#[cfg(feature = "reflect_functions")]
|
|
#[derive(Resource, Clone, Default)]
|
|
pub struct AppFunctionRegistry(pub bevy_reflect::func::FunctionRegistryArc);
|
|
|
|
#[cfg(feature = "reflect_functions")]
|
|
impl Deref for AppFunctionRegistry {
|
|
type Target = bevy_reflect::func::FunctionRegistryArc;
|
|
|
|
#[inline]
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "reflect_functions")]
|
|
impl DerefMut for AppFunctionRegistry {
|
|
#[inline]
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
&mut self.0
|
|
}
|
|
}
|
|
|
|
/// Creates a `T` from a `&dyn PartialReflect`.
|
|
///
|
|
/// This will try the following strategies, in this order:
|
|
///
|
|
/// - use the reflected `FromReflect`, if it's present and doesn't fail;
|
|
/// - use the reflected `Default`, if it's present, and then call `apply` on the result;
|
|
/// - use the reflected `FromWorld`, just like the `Default`.
|
|
///
|
|
/// The first one that is present and doesn't fail will be used.
|
|
///
|
|
/// # Panics
|
|
///
|
|
/// If any strategy produces a `Box<dyn Reflect>` that doesn't store a value of type `T`
|
|
/// this method will panic.
|
|
///
|
|
/// If none of the strategies succeed, this method will panic.
|
|
pub fn from_reflect_with_fallback<T: Reflect + TypePath>(
|
|
reflected: &dyn PartialReflect,
|
|
world: &mut World,
|
|
registry: &TypeRegistry,
|
|
) -> T {
|
|
fn different_type_error<T: TypePath>(reflected: &str) -> ! {
|
|
panic!(
|
|
"The registration for the reflected `{}` trait for the type `{}` produced \
|
|
a value of a different type",
|
|
reflected,
|
|
T::type_path(),
|
|
);
|
|
}
|
|
|
|
// First, try `FromReflect`. This is handled differently from the others because
|
|
// it doesn't need a subsequent `apply` and may fail.
|
|
if let Some(reflect_from_reflect) =
|
|
registry.get_type_data::<ReflectFromReflect>(TypeId::of::<T>())
|
|
{
|
|
// If it fails it's ok, we can continue checking `Default` and `FromWorld`.
|
|
if let Some(value) = reflect_from_reflect.from_reflect(reflected) {
|
|
return value
|
|
.take::<T>()
|
|
.unwrap_or_else(|_| different_type_error::<T>("FromReflect"));
|
|
}
|
|
}
|
|
|
|
// Create an instance of `T` using either the reflected `Default` or `FromWorld`.
|
|
let mut value = if let Some(reflect_default) =
|
|
registry.get_type_data::<ReflectDefault>(TypeId::of::<T>())
|
|
{
|
|
reflect_default
|
|
.default()
|
|
.take::<T>()
|
|
.unwrap_or_else(|_| different_type_error::<T>("Default"))
|
|
} else if let Some(reflect_from_world) =
|
|
registry.get_type_data::<ReflectFromWorld>(TypeId::of::<T>())
|
|
{
|
|
reflect_from_world
|
|
.from_world(world)
|
|
.take::<T>()
|
|
.unwrap_or_else(|_| different_type_error::<T>("FromWorld"))
|
|
} else {
|
|
panic!(
|
|
"Couldn't create an instance of `{}` using the reflected `FromReflect`, \
|
|
`Default` or `FromWorld` traits. Are you perhaps missing a `#[reflect(Default)]` \
|
|
or `#[reflect(FromWorld)]`?",
|
|
// FIXME: once we have unique reflect, use `TypePath`.
|
|
core::any::type_name::<T>(),
|
|
);
|
|
};
|
|
|
|
value.apply(reflected);
|
|
value
|
|
}
|