
# Objective `bevy_ecs`'s `system` module is something of a grab bag, and *very* large. This is particularly true for the `system_param` module, which is more than 2k lines long! While it could be defensible to put `Res` and `ResMut` there (lol no they're in change_detection.rs, obviously), it doesn't make any sense to put the `Resource` trait there. This is confusing to navigate (and painful to work on and review). ## Solution - Create a root level `bevy_ecs/resource.rs` module to mirror `bevy_ecs/component.rs` - move the `Resource` trait to that module - move the `Resource` derive macro to that module as well (Rust really likes when you pun on the names of the derive macro and trait and put them in the same path) - fix all of the imports ## Notes to reviewers - We could probably move more stuff into here, but I wanted to keep this PR as small as possible given the absurd level of import changes. - This PR is ground work for my upcoming attempts to store resource data on components (resources-as-entities). Splitting this code out will make the work and review a bit easier, and is the sort of overdue refactor that's good to do as part of more meaningful work. ## Testing cargo build works! ## Migration Guide `bevy_ecs::system::Resource` has been moved to `bevy_ecs::resource::Resource`.
149 lines
4.6 KiB
Rust
149 lines
4.6 KiB
Rust
//! Types that enable reflection support.
|
|
|
|
use core::{
|
|
any::TypeId,
|
|
ops::{Deref, DerefMut},
|
|
};
|
|
|
|
use crate as bevy_ecs;
|
|
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;
|
|
mod visit_entities;
|
|
|
|
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};
|
|
pub use visit_entities::{ReflectVisitEntities, ReflectVisitEntitiesMut};
|
|
|
|
/// 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
|
|
}
|