From 25b3580384884d8879dfaf7b4250dde4636483d5 Mon Sep 17 00:00:00 2001
From: yukkop <hectic.yukkop@gmail.com>
Date: Sat, 17 Feb 2024 22:53:04 +0100
Subject: [PATCH] build: examples target directory

---
 crate/bevy_controls/example/basic/Cargo.toml  |  3 +
 crate/bevy_controls/example/basic/src/main.rs | 88 +++++++------------
 2 files changed, 34 insertions(+), 57 deletions(-)

diff --git a/crate/bevy_controls/example/basic/Cargo.toml b/crate/bevy_controls/example/basic/Cargo.toml
index a7c00d5..15d8e52 100644
--- a/crate/bevy_controls/example/basic/Cargo.toml
+++ b/crate/bevy_controls/example/basic/Cargo.toml
@@ -3,6 +3,9 @@ name = "basic"
 version = "0.1.0"
 edition = "2021"
 
+[build]
+target-dir = "../../../../target"
+
 [features]
 x11 = ["bevy/x11", "bevy/bevy_winit"]
 wayland = ["bevy/wayland", "bevy/bevy_winit"]
diff --git a/crate/bevy_controls/example/basic/src/main.rs b/crate/bevy_controls/example/basic/src/main.rs
index 8907b47..0c72637 100644
--- a/crate/bevy_controls/example/basic/src/main.rs
+++ b/crate/bevy_controls/example/basic/src/main.rs
@@ -10,7 +10,7 @@ use bevy_controls::{
     InputsContainer, InputsContainerInner,
   },
   plugin::ControlsPlugin,
-  resource::{Binding, ButtonCombination, Controls, InputType, InputValue, PlayerInputs},
+  resource::{Binding, ButtonCombination, Controls, InputType, InputValue, Keyboard, PlayerInputs},
 };
 use strum_macros::EnumIter;
 use bevy_controls_derive::{Action, GameState};
@@ -55,7 +55,8 @@ impl InputsContainerInner<MyAction> for MyInputsContainer {
 #[derive(Resource, Default, Deref, DerefMut)]
 struct JumpsCount(i32);
 
-fn main() { App::new()
+fn main() {
+  App::new()
     .add_plugins((
       DefaultPlugins,
       ControlsPlugin::<MyAction, MyInputsContainer, MyGameState>::default(),
@@ -68,94 +69,67 @@ fn main() { App::new()
 
 // TODO: default bingings...
 fn add_bindings(mut controls: ResMut<Controls<MyAction, MyGameState>>) {
-<<<<<<< HEAD
   controls.force_push(
     MyAction::Left,
-    Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::A))),
+    // this way input will work only on latin layout only on `A`
+    Binding::new(ButtonCombination::Single(InputType::Keyboard(
+      Keyboard::KeyCode(KeyCode::A),
+    ))),
   );
   controls.force_push(
     MyAction::Left,
-    Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::H))),
+    // this way input will work only on any layout on same button, 35 is `H` for `us` layout or
+    // `О` for `ru` layout
+    Binding::new(ButtonCombination::Single(InputType::Keyboard(
+      Keyboard::ScanCode(ScanCode(35)),
+    ))),
   );
 
   controls.force_push(
     MyAction::Back,
-    Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::S))),
+    Binding::new(ButtonCombination::Single(InputType::Keyboard(
+      Keyboard::KeyCode(KeyCode::S),
+    ))),
   );
   controls.force_push(
     MyAction::Back,
-    Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::J))),
+    Binding::new(ButtonCombination::Single(InputType::Keyboard(
+      Keyboard::ScanCode(ScanCode(36)),
+    ))),
   );
 
   controls.force_push(
     MyAction::Forward,
-    Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::W))),
+    Binding::new(ButtonCombination::Single(InputType::Keyboard(
+      Keyboard::KeyCode(KeyCode::W),
+    ))),
   );
   controls.force_push(
     MyAction::Forward,
-    Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::K))),
+    Binding::new(ButtonCombination::Single(InputType::Keyboard(
+      Keyboard::ScanCode(ScanCode(37)),
+    ))),
   );
 
   controls.force_push(
     MyAction::Right,
-    Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::D))),
+    Binding::new(ButtonCombination::Single(InputType::Keyboard(
+      Keyboard::KeyCode(KeyCode::D),
+    ))),
   );
   controls.force_push(
     MyAction::Right,
-    Binding::new(ButtonCombination::Single(InputType::Keyboard(KeyCode::L))),
+    Binding::new(ButtonCombination::Single(InputType::Keyboard(
+      Keyboard::ScanCode(ScanCode(38)),
+    ))),
   );
 
   controls.force_push(
     MyAction::Up,
     Binding::new(ButtonCombination::Single(InputType::Keyboard(
-      KeyCode::Space,
+      Keyboard::KeyCode(KeyCode::Space),
     ))),
   );
-=======
-    controls.force_push(
-        MyAction::Left,
-        // this way input will work only on latin layout only on `A`
-        Binding::new(ButtonCombination::Single(InputType::Keyboard(Keyboard::KeyCode(KeyCode::A)))),
-    );
-    controls.force_push(
-        MyAction::Left,
-        // this way input will work only on any layout on same button, 35 is `H` for `us` layout or 
-        // `О` for `ru` layout 
-        Binding::new(ButtonCombination::Single(InputType::Keyboard(Keyboard::ScanCode(ScanCode(35))))),
-    );
-
-    controls.force_push(
-        MyAction::Back,
-        Binding::new(ButtonCombination::Single(InputType::Keyboard(Keyboard::KeyCode(KeyCode::S)))),
-    );
-    controls.force_push(
-        MyAction::Back,
-        Binding::new(ButtonCombination::Single(InputType::Keyboard(Keyboard::ScanCode(ScanCode(36))))),
-    );
-
-    controls.force_push(
-        MyAction::Forward,
-        Binding::new(ButtonCombination::Single(InputType::Keyboard(Keyboard::KeyCode(KeyCode::W)))),
-    );
-    controls.force_push(
-        MyAction::Forward,
-        Binding::new(ButtonCombination::Single(InputType::Keyboard(Keyboard::ScanCode(ScanCode(37))))),
-    );
-
-    controls.force_push(
-        MyAction::Right,
-        Binding::new(ButtonCombination::Single(InputType::Keyboard(Keyboard::KeyCode(KeyCode::D)))),
-    );
-    controls.force_push(
-        MyAction::Right,
-        Binding::new(ButtonCombination::Single(InputType::Keyboard(Keyboard::ScanCode(ScanCode(38))))),
-    );
-
-    controls.force_push(
-        MyAction::Up,
-        Binding::new(ButtonCombination::Single(InputType::Keyboard(Keyboard::KeyCode(KeyCode::Space)))),
-    );
->>>>>>> b2e0bd2 (feat: scancode support)
 }
 
 #[derive(Component)]