added logical key from winit ; removed ScanCode ; removed copy from I…

…nput
bevyengine · Jun 4, 2023 · 54483f9 · 54483f9
1 parent a93bf05
commit 54483f9
Show file tree

Hide file tree

Showing 6 changed files with 1,132 additions and 52 deletions.
diff --git a/crates/bevy_input/Cargo.toml b/crates/bevy_input/Cargo.toml
@@ -18,7 +18,9 @@ bevy_app = { path = "../bevy_app", version = "0.11.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.11.0-dev" }
 bevy_math = { path = "../bevy_math", version = "0.11.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }
-bevy_reflect = { path = "../bevy_reflect", version = "0.11.0-dev", features = ["glam"] }
+bevy_reflect = { path = "../bevy_reflect", version = "0.11.0-dev", features = [
+    "glam",
+] }
 
 # other
 serde = { version = "1", features = ["derive"], optional = true }

diff --git a/crates/bevy_input/src/input.rs b/crates/bevy_input/src/input.rs
@@ -43,7 +43,7 @@ use bevy_ecs::schedule::State;
 ///[`DetectChangesMut::bypass_change_detection`]: bevy_ecs::change_detection::DetectChangesMut::bypass_change_detection
 #[derive(Debug, Clone, Resource, Reflect)]
 #[reflect(Default)]
-pub struct Input<T: Copy + Eq + Hash + Send + Sync + 'static> {
+pub struct Input<T: Clone + Eq + Hash + Send + Sync + 'static> {
     /// A collection of every button that is currently being pressed.
     pressed: HashSet<T>,
     /// A collection of every button that has just been pressed.
@@ -52,7 +52,7 @@ pub struct Input<T: Copy + Eq + Hash + Send + Sync + 'static> {
     just_released: HashSet<T>,
 }
 
-impl<T: Copy + Eq + Hash + Send + Sync + 'static> Default for Input<T> {
+impl<T: Clone + Eq + Hash + Send + Sync + 'static> Default for Input<T> {
     fn default() -> Self {
         Self {
             pressed: Default::default(),
@@ -64,13 +64,13 @@ impl<T: Copy + Eq + Hash + Send + Sync + 'static> Default for Input<T> {
 
 impl<T> Input<T>
 where
-    T: Copy + Eq + Hash + Send + Sync + 'static,
+    T: Clone + Eq + Hash + Send + Sync + 'static,
 {
     /// Registers a press for the given `input`.
     pub fn press(&mut self, input: T) {
         // Returns `true` if the `input` wasn't pressed.
-        if self.pressed.insert(input) {
-            self.just_pressed.insert(input);
+        if self.pressed.insert(input.clone()) {
+            self.just_pressed.insert(input.clone());
         }
     }
 
@@ -177,7 +177,7 @@ mod test {
     use crate::Input;
 
     /// Used for testing the functionality of [`Input`].
-    #[derive(Copy, Clone, Eq, PartialEq, Hash)]
+    #[derive(Clone, Eq, PartialEq, Hash)]
     enum DummyInput {
         Input1,
         Input2,