 aeeb20ec4c
			
		
	
	
		aeeb20ec4c
		
			
		
	
	
	
	
		
			
			# Objective **This implementation is based on https://github.com/bevyengine/rfcs/pull/59.** --- Resolves #4597 Full details and motivation can be found in the RFC, but here's a brief summary. `FromReflect` is a very powerful and important trait within the reflection API. It allows Dynamic types (e.g., `DynamicList`, etc.) to be formed into Real ones (e.g., `Vec<i32>`, etc.). This mainly comes into play concerning deserialization, where the reflection deserializers both return a `Box<dyn Reflect>` that almost always contain one of these Dynamic representations of a Real type. To convert this to our Real type, we need to use `FromReflect`. It also sneaks up in other ways. For example, it's a required bound for `T` in `Vec<T>` so that `Vec<T>` as a whole can be made `FromReflect`. It's also required by all fields of an enum as it's used as part of the `Reflect::apply` implementation. So in other words, much like `GetTypeRegistration` and `Typed`, it is very much a core reflection trait. The problem is that it is not currently treated like a core trait and is not automatically derived alongside `Reflect`. This makes using it a bit cumbersome and easy to forget. ## Solution Automatically derive `FromReflect` when deriving `Reflect`. Users can then choose to opt-out if needed using the `#[reflect(from_reflect = false)]` attribute. ```rust #[derive(Reflect)] struct Foo; #[derive(Reflect)] #[reflect(from_reflect = false)] struct Bar; fn test<T: FromReflect>(value: T) {} test(Foo); // <-- OK test(Bar); // <-- Panic! Bar does not implement trait `FromReflect` ``` #### `ReflectFromReflect` This PR also automatically adds the `ReflectFromReflect` (introduced in #6245) registration to the derived `GetTypeRegistration` impl— if the type hasn't opted out of `FromReflect` of course. <details> <summary><h4>Improved Deserialization</h4></summary> > **Warning** > This section includes changes that have since been descoped from this PR. They will likely be implemented again in a followup PR. I am mainly leaving these details in for archival purposes, as well as for reference when implementing this logic again. And since we can do all the above, we might as well improve deserialization. We can now choose to deserialize into a Dynamic type or automatically convert it using `FromReflect` under the hood. `[Un]TypedReflectDeserializer::new` will now perform the conversion and return the `Box`'d Real type. `[Un]TypedReflectDeserializer::new_dynamic` will work like what we have now and simply return the `Box`'d Dynamic type. ```rust // Returns the Real type let reflect_deserializer = UntypedReflectDeserializer::new(®istry); let mut deserializer = ron:🇩🇪:Deserializer::from_str(input)?; let output: SomeStruct = reflect_deserializer.deserialize(&mut deserializer)?.take()?; // Returns the Dynamic type let reflect_deserializer = UntypedReflectDeserializer::new_dynamic(®istry); let mut deserializer = ron:🇩🇪:Deserializer::from_str(input)?; let output: DynamicStruct = reflect_deserializer.deserialize(&mut deserializer)?.take()?; ``` </details> --- ## Changelog * `FromReflect` is now automatically derived within the `Reflect` derive macro * This includes auto-registering `ReflectFromReflect` in the derived `GetTypeRegistration` impl * ~~Renamed `TypedReflectDeserializer::new` and `UntypedReflectDeserializer::new` to `TypedReflectDeserializer::new_dynamic` and `UntypedReflectDeserializer::new_dynamic`, respectively~~ **Descoped** * ~~Changed `TypedReflectDeserializer::new` and `UntypedReflectDeserializer::new` to automatically convert the deserialized output using `FromReflect`~~ **Descoped** ## Migration Guide * `FromReflect` is now automatically derived within the `Reflect` derive macro. Items with both derives will need to remove the `FromReflect` one. ```rust // OLD #[derive(Reflect, FromReflect)] struct Foo; // NEW #[derive(Reflect)] struct Foo; ``` If using a manual implementation of `FromReflect` and the `Reflect` derive, users will need to opt-out of the automatic implementation. ```rust // OLD #[derive(Reflect)] struct Foo; impl FromReflect for Foo {/* ... */} // NEW #[derive(Reflect)] #[reflect(from_reflect = false)] struct Foo; impl FromReflect for Foo {/* ... */} ``` <details> <summary><h4>Removed Migrations</h4></summary> > **Warning** > This section includes changes that have since been descoped from this PR. They will likely be implemented again in a followup PR. I am mainly leaving these details in for archival purposes, as well as for reference when implementing this logic again. * The reflect deserializers now perform a `FromReflect` conversion internally. The expected output of `TypedReflectDeserializer::new` and `UntypedReflectDeserializer::new` is no longer a Dynamic (e.g., `DynamicList`), but its Real counterpart (e.g., `Vec<i32>`). ```rust let reflect_deserializer = UntypedReflectDeserializer::new_dynamic(®istry); let mut deserializer = ron:🇩🇪:Deserializer::from_str(input)?; // OLD let output: DynamicStruct = reflect_deserializer.deserialize(&mut deserializer)?.take()?; // NEW let output: SomeStruct = reflect_deserializer.deserialize(&mut deserializer)?.take()?; ``` Alternatively, if this behavior isn't desired, use the `TypedReflectDeserializer::new_dynamic` and `UntypedReflectDeserializer::new_dynamic` methods instead: ```rust // OLD let reflect_deserializer = UntypedReflectDeserializer::new(®istry); // NEW let reflect_deserializer = UntypedReflectDeserializer::new_dynamic(®istry); ``` </details> --------- Co-authored-by: Carter Anderson <mcanders1@gmail.com>
		
			
				
	
	
		
			197 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			197 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use bevy_ecs::{
 | |
|     component::Component, entity::Entity, query::WorldQuery, reflect::ReflectComponent,
 | |
| };
 | |
| use bevy_reflect::std_traits::ReflectDefault;
 | |
| use bevy_reflect::Reflect;
 | |
| use bevy_utils::AHasher;
 | |
| use std::{
 | |
|     borrow::Cow,
 | |
|     hash::{Hash, Hasher},
 | |
|     ops::Deref,
 | |
| };
 | |
| 
 | |
| /// Component used to identify an entity. Stores a hash for faster comparisons.
 | |
| ///
 | |
| /// The hash is eagerly re-computed upon each update to the name.
 | |
| ///
 | |
| /// [`Name`] should not be treated as a globally unique identifier for entities,
 | |
| /// as multiple entities can have the same name.  [`bevy_ecs::entity::Entity`] should be
 | |
| /// used instead as the default unique identifier.
 | |
| #[derive(Reflect, Component, Clone)]
 | |
| #[reflect(Component, Default, Debug)]
 | |
| pub struct Name {
 | |
|     hash: u64, // TODO: Shouldn't be serialized
 | |
|     name: Cow<'static, str>,
 | |
| }
 | |
| 
 | |
| impl Default for Name {
 | |
|     fn default() -> Self {
 | |
|         Name::new("")
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl Name {
 | |
|     /// Creates a new [`Name`] from any string-like type.
 | |
|     ///
 | |
|     /// The internal hash will be computed immediately.
 | |
|     pub fn new(name: impl Into<Cow<'static, str>>) -> Self {
 | |
|         let name = name.into();
 | |
|         let mut name = Name { name, hash: 0 };
 | |
|         name.update_hash();
 | |
|         name
 | |
|     }
 | |
| 
 | |
|     /// Sets the entity's name.
 | |
|     ///
 | |
|     /// The internal hash will be re-computed.
 | |
|     #[inline(always)]
 | |
|     pub fn set(&mut self, name: impl Into<Cow<'static, str>>) {
 | |
|         *self = Name::new(name);
 | |
|     }
 | |
| 
 | |
|     /// Updates the name of the entity in place.
 | |
|     ///
 | |
|     /// This will allocate a new string if the name was previously
 | |
|     /// created from a borrow.
 | |
|     #[inline(always)]
 | |
|     pub fn mutate<F: FnOnce(&mut String)>(&mut self, f: F) {
 | |
|         f(self.name.to_mut());
 | |
|         self.update_hash();
 | |
|     }
 | |
| 
 | |
|     /// Gets the name of the entity as a `&str`.
 | |
|     #[inline(always)]
 | |
|     pub fn as_str(&self) -> &str {
 | |
|         &self.name
 | |
|     }
 | |
| 
 | |
|     fn update_hash(&mut self) {
 | |
|         let mut hasher = AHasher::default();
 | |
|         self.name.hash(&mut hasher);
 | |
|         self.hash = hasher.finish();
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl std::fmt::Display for Name {
 | |
|     #[inline(always)]
 | |
|     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
 | |
|         std::fmt::Display::fmt(&self.name, f)
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl std::fmt::Debug for Name {
 | |
|     #[inline(always)]
 | |
|     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
 | |
|         std::fmt::Debug::fmt(&self.name, f)
 | |
|     }
 | |
| }
 | |
| 
 | |
| /// Convenient query for giving a human friendly name to an entity.
 | |
| ///
 | |
| /// ```rust
 | |
| /// # use bevy_core::prelude::*;
 | |
| /// # use bevy_ecs::prelude::*;
 | |
| /// # #[derive(Component)] pub struct Score(f32);
 | |
| /// fn increment_score(mut scores: Query<(DebugName, &mut Score)>) {
 | |
| ///     for (name, mut score) in &mut scores {
 | |
| ///         score.0 += 1.0;
 | |
| ///         if score.0.is_nan() {
 | |
| ///             bevy_utils::tracing::error!("Score for {:?} is invalid", name);
 | |
| ///         }
 | |
| ///     }
 | |
| /// }
 | |
| /// # bevy_ecs::system::assert_is_system(increment_score);
 | |
| /// ```
 | |
| #[derive(WorldQuery)]
 | |
| pub struct DebugName {
 | |
|     /// A [`Name`] that the entity might have that is displayed if available.
 | |
|     pub name: Option<&'static Name>,
 | |
|     /// The unique identifier of the entity as a fallback.
 | |
|     pub entity: Entity,
 | |
| }
 | |
| 
 | |
| impl<'a> std::fmt::Debug for DebugNameItem<'a> {
 | |
|     #[inline(always)]
 | |
|     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
 | |
|         match self.name {
 | |
|             Some(name) => write!(f, "{:?} ({:?})", &name, &self.entity),
 | |
|             None => std::fmt::Debug::fmt(&self.entity, f),
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| /* Conversions from strings */
 | |
| 
 | |
| impl From<&str> for Name {
 | |
|     #[inline(always)]
 | |
|     fn from(name: &str) -> Self {
 | |
|         Name::new(name.to_owned())
 | |
|     }
 | |
| }
 | |
| impl From<String> for Name {
 | |
|     #[inline(always)]
 | |
|     fn from(name: String) -> Self {
 | |
|         Name::new(name)
 | |
|     }
 | |
| }
 | |
| 
 | |
| /* Conversions to strings */
 | |
| 
 | |
| impl AsRef<str> for Name {
 | |
|     #[inline(always)]
 | |
|     fn as_ref(&self) -> &str {
 | |
|         &self.name
 | |
|     }
 | |
| }
 | |
| impl From<&Name> for String {
 | |
|     #[inline(always)]
 | |
|     fn from(val: &Name) -> String {
 | |
|         val.as_str().to_owned()
 | |
|     }
 | |
| }
 | |
| impl From<Name> for String {
 | |
|     #[inline(always)]
 | |
|     fn from(val: Name) -> String {
 | |
|         val.name.into_owned()
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl Hash for Name {
 | |
|     fn hash<H: Hasher>(&self, state: &mut H) {
 | |
|         self.name.hash(state);
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl PartialEq for Name {
 | |
|     fn eq(&self, other: &Self) -> bool {
 | |
|         if self.hash != other.hash {
 | |
|             // Makes the common case of two strings not been equal very fast
 | |
|             return false;
 | |
|         }
 | |
| 
 | |
|         self.name.eq(&other.name)
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl Eq for Name {}
 | |
| 
 | |
| impl PartialOrd for Name {
 | |
|     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
 | |
|         Some(self.cmp(other))
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl Ord for Name {
 | |
|     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
 | |
|         self.name.cmp(&other.name)
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl Deref for Name {
 | |
|     type Target = str;
 | |
| 
 | |
|     fn deref(&self) -> &Self::Target {
 | |
|         self.name.as_ref()
 | |
|     }
 | |
| }
 |