-
-
Notifications
You must be signed in to change notification settings - Fork 3.9k
feat: Add World::get_reflect()
and World::get_reflect_mut()
#14416
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
alice-i-cecile
merged 14 commits into
bevyengine:main
from
futile:feat/world-get-component-reflect
Jul 23, 2024
Merged
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
50eb902
WIP
futile 9e0b4f5
wip: Add first test
futile 1dd7517
wip: finish tests
futile 4d75d59
wip: first version of docs, with Example! :)
futile bd4e607
wip: Also add docs for `World::get_reflect_mut()`
futile 2cd3e2f
wip: Adapt World::get_reflect() to return GetComponentReflectError
futile 5210a30
wip: Add error-returns + error-docs to `World::get_reflect{_mut}()`
futile 5f8e571
fix: Fix typo
futile 2d5a09b
feedback: From PR
futile 242c5ea
docs: Feedback from PR
futile bb54563
refactor: Move `World::get_reflect{_mut}` to new module `world::reflect`
futile c46f911
refactor: Also move tests to world::reflect
futile 0cea40b
chore: Drop changes to `world/error.rs`, as we didn't need to change it
futile f203113
chore: Cleanup imports since it's now in it's own module
futile File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,344 @@ | ||
//! Provides additional functionality for [`World`] when the `bevy_reflect` feature is enabled. | ||
|
||
use crate::prelude::*; | ||
use crate::world::ComponentId; | ||
use core::any::TypeId; | ||
|
||
use thiserror::Error; | ||
|
||
impl World { | ||
/// Retrieves a reference to the given `entity`'s [`Component`] of the given `type_id` using | ||
/// reflection. | ||
/// | ||
/// Requires implementing [`Reflect`] for the [`Component`] (e.g., using [`#[derive(Reflect)`](derive@bevy_reflect::Reflect)) | ||
/// and `app.register_type::<TheComponent>()` to have been called[^note-reflect-impl]. | ||
/// | ||
/// If you want to call this with a [`ComponentId`], see [`World::components`] and [`Components::get_id`] to get | ||
/// the corresponding [`TypeId`]. | ||
/// | ||
/// Also see the crate documentation for [`bevy_reflect`] for more information on | ||
/// [`Reflect`] and bevy's reflection capabilities. | ||
/// | ||
/// # Errors | ||
/// | ||
/// See [`GetComponentReflectError`] for the possible errors and their descriptions. | ||
/// | ||
/// # Example | ||
/// | ||
/// ``` | ||
/// use bevy_ecs::prelude::*; | ||
/// use bevy_reflect::Reflect; | ||
/// use std::any::TypeId; | ||
/// | ||
/// // define a `Component` and derive `Reflect` for it | ||
/// #[derive(Component, Reflect)] | ||
/// struct MyComponent; | ||
/// | ||
/// // create a `World` for this example | ||
/// let mut world = World::new(); | ||
/// | ||
/// // Note: This is usually handled by `App::register_type()`, but this example cannot use `App`. | ||
/// world.init_resource::<AppTypeRegistry>(); | ||
/// world.get_resource_mut::<AppTypeRegistry>().unwrap().write().register::<MyComponent>(); | ||
/// | ||
/// // spawn an entity with a `MyComponent` | ||
/// let entity = world.spawn(MyComponent).id(); | ||
/// | ||
/// // retrieve a reflected reference to the entity's `MyComponent` | ||
/// let comp_reflected: &dyn Reflect = world.get_reflect(entity, TypeId::of::<MyComponent>()).unwrap(); | ||
/// | ||
/// // make sure we got the expected type | ||
/// assert!(comp_reflected.is::<MyComponent>()); | ||
/// ``` | ||
/// | ||
/// # Note | ||
/// Requires the `bevy_reflect` feature (included in the default features). | ||
/// | ||
/// [`Components::get_id`]: crate::component::Components::get_id | ||
/// [`ReflectFromPtr`]: bevy_reflect::ReflectFromPtr | ||
/// [`TypeData`]: bevy_reflect::TypeData | ||
/// [`Reflect`]: bevy_reflect::Reflect | ||
/// [`App::register_type`]: ../../bevy_app/struct.App.html#method.register_type | ||
/// [^note-reflect-impl]: More specifically: Requires [`TypeData`] for [`ReflectFromPtr`] to be registered for the given `type_id`, | ||
/// which is automatically handled when deriving [`Reflect`] and calling [`App::register_type`]. | ||
#[inline] | ||
#[cfg(feature = "bevy_reflect")] | ||
pub fn get_reflect( | ||
&self, | ||
entity: Entity, | ||
type_id: TypeId, | ||
) -> Result<&dyn bevy_reflect::Reflect, GetComponentReflectError> { | ||
use bevy_reflect::ReflectFromPtr; | ||
|
||
use crate::prelude::AppTypeRegistry; | ||
futile marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
let Some(component_id) = self.components().get_id(type_id) else { | ||
return Err(GetComponentReflectError::NoCorrespondingComponentId( | ||
type_id, | ||
)); | ||
}; | ||
|
||
let Some(comp_ptr) = self.get_by_id(entity, component_id) else { | ||
let component_name = self | ||
.components() | ||
.get_name(component_id) | ||
.map(ToString::to_string); | ||
|
||
return Err(GetComponentReflectError::EntityDoesNotHaveComponent { | ||
entity, | ||
type_id, | ||
component_id, | ||
component_name, | ||
}); | ||
}; | ||
|
||
let Some(type_registry) = self.get_resource::<AppTypeRegistry>().map(|atr| atr.read()) | ||
else { | ||
return Err(GetComponentReflectError::MissingAppTypeRegistry); | ||
}; | ||
|
||
let Some(reflect_from_ptr) = type_registry.get_type_data::<ReflectFromPtr>(type_id) else { | ||
return Err(GetComponentReflectError::MissingReflectFromPtrTypeData( | ||
type_id, | ||
)); | ||
}; | ||
|
||
// SAFETY: | ||
// - `comp_ptr` is guaranteed to point to an object of type `type_id` | ||
// - `reflect_from_ptr` was constructed for type `type_id` | ||
// - Assertion that checks this equality is present | ||
unsafe { | ||
assert_eq!( | ||
reflect_from_ptr.type_id(), | ||
type_id, | ||
"Mismatch between Ptr's type_id and ReflectFromPtr's type_id", | ||
); | ||
|
||
Ok(reflect_from_ptr.as_reflect(comp_ptr)) | ||
} | ||
} | ||
|
||
/// Retrieves a mutable reference to the given `entity`'s [`Component`] of the given `type_id` using | ||
/// reflection. | ||
/// | ||
/// Requires implementing [`Reflect`] for the [`Component`] (e.g., using [`#[derive(Reflect)`](derive@bevy_reflect::Reflect)) | ||
/// and `app.register_type::<TheComponent>()` to have been called. | ||
/// | ||
/// This is the mutable version of [`World::get_reflect`], see its docs for more information | ||
/// and an example. | ||
/// | ||
/// Just calling this method does not trigger [change detection](crate::change_detection). | ||
/// | ||
/// # Errors | ||
/// | ||
/// See [`GetComponentReflectError`] for the possible errors and their descriptions. | ||
/// | ||
/// # Example | ||
/// | ||
/// See the documentation for [`World::get_reflect`]. | ||
/// | ||
/// # Note | ||
/// Requires the feature `bevy_reflect` (included in the default features). | ||
/// | ||
/// [`Reflect`]: bevy_reflect::Reflect | ||
#[inline] | ||
#[cfg(feature = "bevy_reflect")] | ||
pub fn get_reflect_mut( | ||
&mut self, | ||
entity: Entity, | ||
type_id: TypeId, | ||
) -> Result<Mut<'_, dyn bevy_reflect::Reflect>, GetComponentReflectError> { | ||
use bevy_reflect::ReflectFromPtr; | ||
|
||
use crate::prelude::AppTypeRegistry; | ||
|
||
// little clone() + read() dance so we a) don't keep a borrow of `self` and b) don't drop a | ||
// temporary (from read()) too early. | ||
let Some(app_type_registry) = self.get_resource::<AppTypeRegistry>().cloned() else { | ||
return Err(GetComponentReflectError::MissingAppTypeRegistry); | ||
}; | ||
let type_registry = app_type_registry.read(); | ||
|
||
let Some(reflect_from_ptr) = type_registry.get_type_data::<ReflectFromPtr>(type_id) else { | ||
return Err(GetComponentReflectError::MissingReflectFromPtrTypeData( | ||
type_id, | ||
)); | ||
}; | ||
|
||
let Some(component_id) = self.components().get_id(type_id) else { | ||
return Err(GetComponentReflectError::NoCorrespondingComponentId( | ||
type_id, | ||
)); | ||
}; | ||
|
||
// HACK: Only required for the `None`-case/`else`-branch, but it borrows `self`, which will | ||
// already be mutablyy borrowed by `self.get_mut_by_id()`, and I didn't find a way around it. | ||
let component_name = self | ||
.components() | ||
.get_name(component_id) | ||
.map(ToString::to_string); | ||
|
||
let Some(comp_mut_untyped) = self.get_mut_by_id(entity, component_id) else { | ||
return Err(GetComponentReflectError::EntityDoesNotHaveComponent { | ||
entity, | ||
type_id, | ||
component_id, | ||
component_name, | ||
}); | ||
}; | ||
|
||
// SAFETY: | ||
// - `comp_mut_untyped` is guaranteed to point to an object of type `type_id` | ||
// - `reflect_from_ptr` was constructed for type `type_id` | ||
// - Assertion that checks this equality is present | ||
let comp_mut_typed = comp_mut_untyped.map_unchanged(|ptr_mut| unsafe { | ||
assert_eq!( | ||
reflect_from_ptr.type_id(), | ||
type_id, | ||
"Mismatch between PtrMut's type_id and ReflectFromPtr's type_id", | ||
); | ||
|
||
reflect_from_ptr.as_reflect_mut(ptr_mut) | ||
}); | ||
|
||
Ok(comp_mut_typed) | ||
} | ||
} | ||
|
||
/// The error type returned by [`World::get_reflect`] and [`World::get_reflect_mut`]. | ||
#[derive(Error, Debug)] | ||
pub enum GetComponentReflectError { | ||
/// There is no [`ComponentId`] corresponding to the given [`TypeId`]. | ||
/// | ||
/// This is usually handled by calling [`App::register_type`] for the type corresponding to | ||
/// the given [`TypeId`]. | ||
/// | ||
/// See the documentation for [`bevy_reflect`] for more information. | ||
/// | ||
/// [`App::register_type`]: ../../../bevy_app/struct.App.html#method.register_type | ||
#[error("No `ComponentId` corresponding to {0:?} found (did you call App::register_type()?)")] | ||
NoCorrespondingComponentId(TypeId), | ||
|
||
/// The given [`Entity`] does not have a [`Component`] corresponding to the given [`TypeId`]. | ||
#[error("The given `Entity` {entity:?} does not have a `{component_name:?}` component ({component_id:?}, which corresponds to {type_id:?})")] | ||
EntityDoesNotHaveComponent { | ||
/// The given [`Entity`]. | ||
entity: Entity, | ||
/// The given [`TypeId`]. | ||
type_id: TypeId, | ||
/// The [`ComponentId`] corresponding to the given [`TypeId`]. | ||
component_id: ComponentId, | ||
/// The name corresponding to the [`Component`] with the given [`TypeId`], or `None` | ||
/// if not available. | ||
component_name: Option<String>, | ||
}, | ||
|
||
/// The [`World`] was missing the [`AppTypeRegistry`] resource. | ||
#[error("The `World` was missing the `AppTypeRegistry` resource")] | ||
MissingAppTypeRegistry, | ||
|
||
/// The [`World`]'s [`TypeRegistry`] did not contain [`TypeData`] for [`ReflectFromPtr`] for the given [`TypeId`]. | ||
/// | ||
/// This is usually handled by calling [`App::register_type`] for the type corresponding to | ||
/// the given [`TypeId`]. | ||
/// | ||
/// See the documentation for [`bevy_reflect`] for more information. | ||
/// | ||
/// [`TypeData`]: bevy_reflect::TypeData | ||
/// [`TypeRegistry`]: bevy_reflect::TypeRegistry | ||
/// [`ReflectFromPtr`]: bevy_reflect::ReflectFromPtr | ||
/// [`App::register_type`]: ../../../bevy_app/struct.App.html#method.register_type | ||
#[error("The `World`'s `TypeRegistry` did not contain `TypeData` for `ReflectFromPtr` for the given {0:?} (did you call `App::register_type()`?)")] | ||
MissingReflectFromPtrTypeData(TypeId), | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use std::any::TypeId; | ||
|
||
use bevy_reflect::Reflect; | ||
|
||
use crate::{ | ||
// For bevy_ecs_macros | ||
self as bevy_ecs, | ||
prelude::{AppTypeRegistry, Component, DetectChanges, World}, | ||
}; | ||
|
||
#[derive(Component, Reflect)] | ||
struct RFoo(i32); | ||
|
||
#[derive(Component)] | ||
struct Bar; | ||
|
||
#[test] | ||
fn get_component_as_reflect() { | ||
let mut world = World::new(); | ||
world.init_resource::<AppTypeRegistry>(); | ||
|
||
let app_type_registry = world.get_resource_mut::<AppTypeRegistry>().unwrap(); | ||
app_type_registry.write().register::<RFoo>(); | ||
|
||
{ | ||
let entity_with_rfoo = world.spawn(RFoo(42)).id(); | ||
let comp_reflect = world | ||
.get_reflect(entity_with_rfoo, TypeId::of::<RFoo>()) | ||
.expect("Reflection of RFoo-component failed"); | ||
|
||
assert!(comp_reflect.is::<RFoo>()); | ||
} | ||
|
||
{ | ||
let entity_without_rfoo = world.spawn_empty().id(); | ||
let reflect_opt = world.get_reflect(entity_without_rfoo, TypeId::of::<RFoo>()); | ||
|
||
assert!(reflect_opt.is_err()); | ||
} | ||
|
||
{ | ||
let entity_with_bar = world.spawn(Bar).id(); | ||
let reflect_opt = world.get_reflect(entity_with_bar, TypeId::of::<Bar>()); | ||
|
||
assert!(reflect_opt.is_err()); | ||
} | ||
} | ||
|
||
#[test] | ||
fn get_component_as_mut_reflect() { | ||
let mut world = World::new(); | ||
world.init_resource::<AppTypeRegistry>(); | ||
|
||
let app_type_registry = world.get_resource_mut::<AppTypeRegistry>().unwrap(); | ||
app_type_registry.write().register::<RFoo>(); | ||
|
||
{ | ||
let entity_with_rfoo = world.spawn(RFoo(42)).id(); | ||
let mut comp_reflect = world | ||
.get_reflect_mut(entity_with_rfoo, TypeId::of::<RFoo>()) | ||
.expect("Mutable reflection of RFoo-component failed"); | ||
|
||
let comp_rfoo_reflected = comp_reflect | ||
.downcast_mut::<RFoo>() | ||
.expect("Wrong type reflected (expected RFoo)"); | ||
assert_eq!(comp_rfoo_reflected.0, 42); | ||
comp_rfoo_reflected.0 = 1337; | ||
|
||
let rfoo_ref = world.entity(entity_with_rfoo).get_ref::<RFoo>().unwrap(); | ||
assert!(rfoo_ref.is_changed()); | ||
assert_eq!(rfoo_ref.0, 1337); | ||
} | ||
|
||
{ | ||
let entity_without_rfoo = world.spawn_empty().id(); | ||
let reflect_opt = world.get_reflect_mut(entity_without_rfoo, TypeId::of::<RFoo>()); | ||
|
||
assert!(reflect_opt.is_err()); | ||
} | ||
|
||
{ | ||
let entity_with_bar = world.spawn(Bar).id(); | ||
let reflect_opt = world.get_reflect_mut(entity_with_bar, TypeId::of::<Bar>()); | ||
|
||
assert!(reflect_opt.is_err()); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.