mirror of
https://github.com/bevyengine/bevy
synced 2025-01-04 09:18:54 +00:00
9dd8fbc570
# Objective - Fixes #7066 ## Solution - Split the ChangeDetection trait into ChangeDetection and ChangeDetectionMut - Added Ref as equivalent to &T with change detection --- ## Changelog - Support for Ref which allow inspecting change detection flags in an immutable way ## Migration Guide - While bevy prelude includes both ChangeDetection and ChangeDetectionMut any code explicitly referencing ChangeDetection might need to be updated to ChangeDetectionMut or both. Specifically any reading logic requires ChangeDetection while writes requires ChangeDetectionMut. use bevy_ecs::change_detection::DetectChanges -> use bevy_ecs::change_detection::{DetectChanges, DetectChangesMut} - Previously Res had methods to access change detection `is_changed` and `is_added` those methods have been moved to the `DetectChanges` trait. If you are including bevy prelude you will have access to these types otherwise you will need to `use bevy_ecs::change_detection::DetectChanges` to continue using them.
142 lines
4.8 KiB
Rust
142 lines
4.8 KiB
Rust
use crate::{ButtonState, Input};
|
|
use bevy_ecs::{change_detection::DetectChangesMut, 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.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),
|
|
}
|
|
}
|
|
}
|