mirror of
https://github.com/bevyengine/bevy
synced 2024-12-29 22:43:14 +00:00
2023ce63c7
# Objective Adds support for reflecting many more of the input types. This allows those types to be used via scripting, `bevy-inspector-egui`, etc. These types are registered by the `InputPlugin` so that they're automatically available to anyone who wants to use them Closes #6223 ## Solution Many types now have `#[derive(Reflect, FromReflect)]` added to them in `bevy_input`. Additionally, `#[reflect(traits...)]` has been added for applicable traits to the types. This PR does not add reflection support for types which have private fields. Notably, `Touch` and `Touches` don't implement `Reflect`/`FromReflect`. This adds the "glam" feature to the `bevy_reflect` dependency for package `bevy_input`. Since `bevy_input` transitively depends on `glam` already, all this brings in are the reflection `impl`s. ## Migration Guide - `Input<T>` now implements `Reflect` via `#[reflect]` instead of `#[reflect_value]`. This means it now exposes its private fields via the `Reflect` trait rather than being treated as a value type. For code that relies on the `Input<T>` struct being treated as a value type by reflection, it is still possible to wrap the `Input<T>` type with a wrapper struct and apply `#[reflect_value]` to it. - As a reminder, private fields exposed via reflection are not subject to any stability guarantees. --- ## Changelog Added - Implemented `Reflect` + `FromReflect` for many input-related types. These types are automatically registered when adding the `InputPlugin`.
142 lines
4.8 KiB
Rust
142 lines
4.8 KiB
Rust
use crate::{ButtonState, Input};
|
|
use bevy_ecs::{event::EventReader, system::ResMut};
|
|
use bevy_math::Vec2;
|
|
use bevy_reflect::{FromReflect, 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(Debug, Clone, Copy, PartialEq, Eq, Reflect, FromReflect)]
|
|
#[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,
|
|
}
|
|
|
|
/// 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, FromReflect)]
|
|
#[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(Debug, Clone, Copy, PartialEq, Reflect, FromReflect)]
|
|
#[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, FromReflect)]
|
|
#[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(Debug, Clone, Copy, PartialEq, Reflect, FromReflect)]
|
|
#[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,
|
|
}
|
|
|
|
/// 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.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),
|
|
}
|
|
}
|
|
}
|