mirror of
https://github.com/bevyengine/bevy
synced 2025-01-04 09:18:54 +00:00
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>
151 lines
4.9 KiB
Rust
151 lines
4.9 KiB
Rust
use crate::{ButtonState, Input};
|
|
use bevy_ecs::entity::Entity;
|
|
use bevy_ecs::{
|
|
change_detection::DetectChangesMut,
|
|
event::{Event, EventReader},
|
|
system::ResMut,
|
|
};
|
|
use bevy_math::Vec2;
|
|
use bevy_reflect::Reflect;
|
|
|
|
#[cfg(feature = "serialize")]
|
|
use bevy_reflect::{ReflectDeserialize, ReflectSerialize};
|
|
|
|
/// A mouse button input event.
|
|
///
|
|
/// This event is the translated version of the `WindowEvent::MouseInput` from the `winit` crate.
|
|
///
|
|
/// ## Usage
|
|
///
|
|
/// The event is read inside of the [`mouse_button_input_system`](crate::mouse::mouse_button_input_system)
|
|
/// to update the [`Input<MouseButton>`](crate::Input<MouseButton>) resource.
|
|
#[derive(Event, Debug, Clone, Copy, PartialEq, Eq, Reflect)]
|
|
#[reflect(Debug, PartialEq)]
|
|
#[cfg_attr(
|
|
feature = "serialize",
|
|
derive(serde::Serialize, serde::Deserialize),
|
|
reflect(Serialize, Deserialize)
|
|
)]
|
|
pub struct MouseButtonInput {
|
|
/// The mouse button assigned to the event.
|
|
pub button: MouseButton,
|
|
/// The pressed state of the button.
|
|
pub state: ButtonState,
|
|
/// Window that received the input.
|
|
pub window: Entity,
|
|
}
|
|
|
|
/// A button on a mouse device.
|
|
///
|
|
/// ## Usage
|
|
///
|
|
/// It is used as the generic `T` value of an [`Input`](crate::Input) to create a `bevy`
|
|
/// resource.
|
|
///
|
|
/// ## Updating
|
|
///
|
|
/// The resource is updated inside of the [`mouse_button_input_system`](crate::mouse::mouse_button_input_system).
|
|
#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy, Reflect)]
|
|
#[reflect(Debug, Hash, PartialEq)]
|
|
#[cfg_attr(
|
|
feature = "serialize",
|
|
derive(serde::Serialize, serde::Deserialize),
|
|
reflect(Serialize, Deserialize)
|
|
)]
|
|
pub enum MouseButton {
|
|
/// The left mouse button.
|
|
Left,
|
|
/// The right mouse button.
|
|
Right,
|
|
/// The middle mouse button.
|
|
Middle,
|
|
/// Another mouse button with the associated number.
|
|
Other(u16),
|
|
}
|
|
|
|
/// An event reporting the change in physical position of a pointing device.
|
|
///
|
|
/// This represents raw, unfiltered physical motion.
|
|
/// It is the translated version of [`DeviceEvent::MouseMotion`] from the `winit` crate.
|
|
///
|
|
/// All pointing devices connected to a single machine at the same time can emit the event independently.
|
|
/// However, the event data does not make it possible to distinguish which device it is referring to.
|
|
///
|
|
/// [`DeviceEvent::MouseMotion`]: https://docs.rs/winit/latest/winit/event/enum.DeviceEvent.html#variant.MouseMotion
|
|
#[derive(Event, Debug, Clone, Copy, PartialEq, Reflect)]
|
|
#[reflect(Debug, PartialEq)]
|
|
#[cfg_attr(
|
|
feature = "serialize",
|
|
derive(serde::Serialize, serde::Deserialize),
|
|
reflect(Serialize, Deserialize)
|
|
)]
|
|
pub struct MouseMotion {
|
|
/// The change in the position of the pointing device since the last event was sent.
|
|
pub delta: Vec2,
|
|
}
|
|
|
|
/// The scroll unit.
|
|
///
|
|
/// Describes how a value of a [`MouseWheel`](crate::mouse::MouseWheel) event has to be interpreted.
|
|
///
|
|
/// The value of the event can either be interpreted as the amount of lines or the amount of pixels
|
|
/// to scroll.
|
|
#[derive(Debug, Clone, Copy, Eq, PartialEq, Reflect)]
|
|
#[reflect(Debug, PartialEq)]
|
|
#[cfg_attr(
|
|
feature = "serialize",
|
|
derive(serde::Serialize, serde::Deserialize),
|
|
reflect(Serialize, Deserialize)
|
|
)]
|
|
pub enum MouseScrollUnit {
|
|
/// The line scroll unit.
|
|
///
|
|
/// The delta of the associated [`MouseWheel`](crate::mouse::MouseWheel) event corresponds
|
|
/// to the amount of lines or rows to scroll.
|
|
Line,
|
|
/// The pixel scroll unit.
|
|
///
|
|
/// The delta of the associated [`MouseWheel`](crate::mouse::MouseWheel) event corresponds
|
|
/// to the amount of pixels to scroll.
|
|
Pixel,
|
|
}
|
|
|
|
/// A mouse wheel event.
|
|
///
|
|
/// This event is the translated version of the `WindowEvent::MouseWheel` from the `winit` crate.
|
|
#[derive(Event, Debug, Clone, Copy, PartialEq, Reflect)]
|
|
#[reflect(Debug, PartialEq)]
|
|
#[cfg_attr(
|
|
feature = "serialize",
|
|
derive(serde::Serialize, serde::Deserialize),
|
|
reflect(Serialize, Deserialize)
|
|
)]
|
|
pub struct MouseWheel {
|
|
/// The mouse scroll unit.
|
|
pub unit: MouseScrollUnit,
|
|
/// The horizontal scroll value.
|
|
pub x: f32,
|
|
/// The vertical scroll value.
|
|
pub y: f32,
|
|
/// Window that received the input.
|
|
pub window: Entity,
|
|
}
|
|
|
|
/// Updates the [`Input<MouseButton>`] resource with the latest [`MouseButtonInput`] events.
|
|
///
|
|
/// ## Differences
|
|
///
|
|
/// The main difference between the [`MouseButtonInput`] event and the [`Input<MouseButton>`] resource is that
|
|
/// the latter has convenient functions like [`Input::pressed`], [`Input::just_pressed`] and [`Input::just_released`].
|
|
pub fn mouse_button_input_system(
|
|
mut mouse_button_input: ResMut<Input<MouseButton>>,
|
|
mut mouse_button_input_events: EventReader<MouseButtonInput>,
|
|
) {
|
|
mouse_button_input.bypass_change_detection().clear();
|
|
for event in mouse_button_input_events.iter() {
|
|
match event.state {
|
|
ButtonState::Pressed => mouse_button_input.press(event.button),
|
|
ButtonState::Released => mouse_button_input.release(event.button),
|
|
}
|
|
}
|
|
}
|