PublicArchive/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy.git synced 2026-05-06 06:06:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match input common_conditions bounds with ButtonInput (#21554)

Browse Source 
# Objective

- `ButtonInput` has `T: Clone + Eq + Hash + Send + Sync + 'static`
bounds,
but functions in `bevy_input::common_conditions` has `T: Copy + Eq +
Hash + Send + Sync + 'static` bounds.
  This prevents use of `!Copy` inputs like `Key` for the latter.

## Solution

- Replace `Copy` -> `Clone` in `bevy_input::common_conditions`
This commit is contained in:
akimakinai
2025-10-16 08:13:56 +09:00
committed by GitHub
parent 3ca67f042a
commit 8f53fe3ccd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/bevy_input/src/common_conditions.rs
+8 -8
View File
@@ -53,11 +53,11 @@ pub fn input_toggle_active<T>(
input: T,
) -> impl FnMut(Res<ButtonInput<T>>) -> bool + Clone
where
T: Copy + Eq + Hash + Send + Sync + 'static,
T: Clone + Eq + Hash + Send + Sync + 'static,
{
let mut active = default;
move |inputs: Res<ButtonInput<T>>| {
active ^= inputs.just_pressed(input);
active ^= inputs.just_pressed(input.clone());
active
}
}
@@ -65,9 +65,9 @@ where
/// Run condition that is active if [`ButtonInput::pressed`] is true for the given input.
pub fn input_pressed<T>(input: T) -> impl FnMut(Res<ButtonInput<T>>) -> bool + Clone
where
T: Copy + Eq + Hash + Send + Sync + 'static,
T: Clone + Eq + Hash + Send + Sync + 'static,
{
move |inputs: Res<ButtonInput<T>>| inputs.pressed(input)
move |inputs: Res<ButtonInput<T>>| inputs.pressed(input.clone())
}
/// Run condition that is active if [`ButtonInput::just_pressed`] is true for the given input.
@@ -87,17 +87,17 @@ where
/// ```
pub fn input_just_pressed<T>(input: T) -> impl FnMut(Res<ButtonInput<T>>) -> bool + Clone
where
T: Copy + Eq + Hash + Send + Sync + 'static,
T: Clone + Eq + Hash + Send + Sync + 'static,
{
move |inputs: Res<ButtonInput<T>>| inputs.just_pressed(input)
move |inputs: Res<ButtonInput<T>>| inputs.just_pressed(input.clone())
}
/// Run condition that is active if [`ButtonInput::just_released`] is true for the given input.
pub fn input_just_released<T>(input: T) -> impl FnMut(Res<ButtonInput<T>>) -> bool + Clone
where
T: Copy + Eq + Hash + Send + Sync + 'static,
T: Clone + Eq + Hash + Send + Sync + 'static,
{
move |inputs: Res<ButtonInput<T>>| inputs.just_released(input)
move |inputs: Res<ButtonInput<T>>| inputs.just_released(input.clone())
}
#[cfg(test)]