winit 0.29: Ergonomics, examples + keymap cache

crates/bevy_input/src/common_conditions.rs

@@ -1,5 +1,6 @@
 use crate::Input;
 use bevy_ecs::system::Res;
+use bevy_reflect::FromReflect;
 use std::hash::Hash;
 
 /// Stateful run condition that can be toggled via a input press using [`Input::just_pressed`].
@@ -49,7 +50,7 @@ use std::hash::Hash;
 /// ```
 pub fn input_toggle_active<T>(default: bool, input: T) -> impl FnMut(Res<Input<T>>) -> bool + Clone
 where
-    T: Copy + Eq + Hash + Send + Sync + 'static,
+    T: FromReflect + Copy + Eq + Hash + Send + Sync + 'static,
 {
     let mut active = default;
     move |inputs: Res<Input<T>>| {
@@ -61,7 +62,7 @@ where
 /// Run condition that is active if [`Input::pressed`] is true for the given input.
 pub fn input_pressed<T>(input: T) -> impl FnMut(Res<Input<T>>) -> bool + Clone
 where
-    T: Copy + Eq + Hash + Send + Sync + 'static,
+    T: FromReflect + Copy + Eq + Hash + Send + Sync + 'static,
 {
     move |inputs: Res<Input<T>>| inputs.pressed(input)
 }
@@ -82,15 +83,15 @@ where
 /// ```
 pub fn input_just_pressed<T>(input: T) -> impl FnMut(Res<Input<T>>) -> bool + Clone
 where
-    T: Copy + Eq + Hash + Send + Sync + 'static,
+    T: FromReflect + Clone + Eq + Hash + Send + Sync + 'static,
 {
-    move |inputs: Res<Input<T>>| inputs.just_pressed(input)
+    move |inputs: Res<Input<T>>| inputs.just_pressed(input.clone())
 }
 
 /// Run condition that is active if [`Input::just_released`] is true for the given input.
 pub fn input_just_released<T>(input: T) -> impl FnMut(Res<Input<T>>) -> bool + Clone
 where
-    T: Copy + Eq + Hash + Send + Sync + 'static,
+    T: FromReflect + Copy + Eq + Hash + Send + Sync + 'static,
 {
     move |inputs: Res<Input<T>>| inputs.just_released(input)
 }