From 1a4b378da96810725db0da3c6b3f341f2c8f65a9 Mon Sep 17 00:00:00 2001
From: Fabrizio Pelosi <tesfabpel@gmail.com>
Date: Wed, 10 Nov 2021 21:58:30 +0100
Subject: [PATCH 1/4] Allow key bindings customization

---
 examples/key_bindings.rs | 57 ++++++++++++++++++++++++++++++++++++++++
 src/lib.rs               | 57 +++++++++++++++++++++++++++++++++-------
 2 files changed, 104 insertions(+), 10 deletions(-)
 create mode 100644 examples/key_bindings.rs

diff --git a/examples/key_bindings.rs b/examples/key_bindings.rs
new file mode 100644
index 0000000..6e28a17
--- /dev/null
+++ b/examples/key_bindings.rs
@@ -0,0 +1,57 @@
+// Remove the line below if you are copying this to your own project
+extern crate bevy_flycam;
+
+use bevy::prelude::*;
+use bevy_flycam::PlayerPlugin;
+use bevy_flycam::{KeyBindings, MovementSettings};
+
+//From bevy examples:
+//https://github.com/bevyengine/bevy/blob/latest/examples/3d/3d_scene.rs
+
+fn main() {
+    App::build()
+        .insert_resource(Msaa { samples: 4 })
+        .add_plugins(DefaultPlugins)
+        .add_plugin(PlayerPlugin)
+        .insert_resource(MovementSettings {
+            sensitivity: 0.00015, // default: 0.00012
+            speed: 12.0,          // default: 12.0
+        })
+        .insert_resource(KeyBindings {
+            move_forward: KeyCode::A,
+            move_backward: KeyCode::Z,
+            move_left: KeyCode::Q,
+            move_right: KeyCode::W,
+            move_ascend: KeyCode::C,
+            move_descend: KeyCode::V,
+            toggle_grab_cursor: KeyCode::F,
+        })
+        .add_startup_system(setup.system())
+        .run();
+}
+
+/// set up a simple 3D scene
+fn setup(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    // plane
+    commands.spawn_bundle(PbrBundle {
+        mesh: meshes.add(Mesh::from(shape::Plane { size: 5.0 })),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        ..Default::default()
+    });
+    // cube
+    commands.spawn_bundle(PbrBundle {
+        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        transform: Transform::from_xyz(0.0, 0.5, 0.0),
+        ..Default::default()
+    });
+    // light
+    commands.spawn_bundle(LightBundle {
+        transform: Transform::from_xyz(4.0, 8.0, 4.0),
+        ..Default::default()
+    });
+}
diff --git a/src/lib.rs b/src/lib.rs
index 45b44c3..5501492 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -25,6 +25,31 @@ impl Default for MovementSettings {
     }
 }
 
+/// Key configuration
+pub struct KeyBindings {
+    pub move_forward: KeyCode,
+    pub move_backward: KeyCode,
+    pub move_left: KeyCode,
+    pub move_right: KeyCode,
+    pub move_ascend: KeyCode,
+    pub move_descend: KeyCode,
+    pub toggle_grab_cursor: KeyCode,
+}
+
+impl Default for KeyBindings {
+    fn default() -> Self {
+        Self {
+            move_forward: KeyCode::W,
+            move_backward: KeyCode::S,
+            move_left: KeyCode::A,
+            move_right: KeyCode::D,
+            move_ascend: KeyCode::Space,
+            move_descend: KeyCode::LShift,
+            toggle_grab_cursor: KeyCode::Escape,
+        }
+    }
+}
+
 /// Used in queries when you want flycams and not other cameras
 pub struct FlyCam;
 
@@ -55,6 +80,7 @@ fn player_move(
     time: Res<Time>,
     windows: Res<Windows>,
     settings: Res<MovementSettings>,
+    key_bindings: Res<KeyBindings>,
     mut query: Query<(&FlyCam, &mut Transform)>,
 ) {
     let window = windows.get_primary().unwrap();
@@ -66,14 +92,19 @@ fn player_move(
 
         for key in keys.get_pressed() {
             if window.cursor_locked() {
-                match key {
-                    KeyCode::W => velocity += forward,
-                    KeyCode::S => velocity -= forward,
-                    KeyCode::A => velocity -= right,
-                    KeyCode::D => velocity += right,
-                    KeyCode::Space => velocity += Vec3::Y,
-                    KeyCode::LShift => velocity -= Vec3::Y,
-                    _ => (),
+                let key = *key;
+                if key == key_bindings.move_forward {
+                    velocity += forward;
+                } else if key == key_bindings.move_backward {
+                    velocity -= forward;
+                } else if key == key_bindings.move_left {
+                    velocity -= right;
+                } else if key == key_bindings.move_right {
+                    velocity += right;
+                } else if key == key_bindings.move_ascend {
+                    velocity += Vec3::Y;
+                } else if key == key_bindings.move_descend {
+                    velocity -= Vec3::Y;
                 }
             }
         }
@@ -114,9 +145,13 @@ fn player_look(
     }
 }
 
-fn cursor_grab(keys: Res<Input<KeyCode>>, mut windows: ResMut<Windows>) {
+fn cursor_grab(
+    keys: Res<Input<KeyCode>>,
+    key_bindings: Res<KeyBindings>,
+    mut windows: ResMut<Windows>,
+) {
     let window = windows.get_primary_mut().unwrap();
-    if keys.just_pressed(KeyCode::Escape) {
+    if keys.just_pressed(key_bindings.toggle_grab_cursor) {
         toggle_grab_cursor(window);
     }
 }
@@ -127,6 +162,7 @@ impl Plugin for PlayerPlugin {
     fn build(&self, app: &mut AppBuilder) {
         app.init_resource::<InputState>()
             .init_resource::<MovementSettings>()
+            .init_resource::<KeyBindings>()
             .add_startup_system(setup_player.system())
             .add_startup_system(initial_grab_cursor.system())
             .add_system(player_move.system())
@@ -141,6 +177,7 @@ impl Plugin for NoCameraPlayerPlugin {
     fn build(&self, app: &mut AppBuilder) {
         app.init_resource::<InputState>()
             .init_resource::<MovementSettings>()
+            .init_resource::<KeyBindings>()
             .add_startup_system(initial_grab_cursor.system())
             .add_system(player_move.system())
             .add_system(player_look.system())

From 9dce6ac9ec8aa83813a249ce14c2b574ce0c9e1a Mon Sep 17 00:00:00 2001
From: "Robert G. Jakabosky" <rjakabosky+neopallium@neoawareness.com>
Date: Sun, 21 Aug 2022 23:44:07 +0800
Subject: [PATCH 2/4] Use yaw/pitch from Camera's rotation.

---
 src/lib.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 160a2ed..a0608ad 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,8 +6,6 @@ use bevy::prelude::*;
 #[derive(Default)]
 struct InputState {
     reader_motion: ManualEventReader<MouseMotion>,
-    pitch: f32,
-    yaw: f32,
 }
 
 /// Mouse sensitivity and movement speed
@@ -101,23 +99,21 @@ fn player_look(
     mut query: Query<&mut Transform, With<FlyCam>>,
 ) {
     if let Some(window) = windows.get_primary() {
-        let mut delta_state = state.as_mut();
         for mut transform in query.iter_mut() {
-            for ev in delta_state.reader_motion.iter(&motion) {
+            for ev in state.reader_motion.iter(&motion) {
+                let (mut yaw, mut pitch, _) = transform.rotation.to_euler(EulerRot::YXZ);
                 if window.cursor_locked() {
                     // Using smallest of height or width ensures equal vertical and horizontal sensitivity
                     let window_scale = window.height().min(window.width());
-                    delta_state.pitch -=
-                        (settings.sensitivity * ev.delta.y * window_scale).to_radians();
-                    delta_state.yaw -=
-                        (settings.sensitivity * ev.delta.x * window_scale).to_radians();
+                    pitch -= (settings.sensitivity * ev.delta.y * window_scale).to_radians();
+                    yaw -= (settings.sensitivity * ev.delta.x * window_scale).to_radians();
                 }
 
-                delta_state.pitch = delta_state.pitch.clamp(-1.54, 1.54);
+                pitch = pitch.clamp(-1.54, 1.54);
 
                 // Order is important to prevent unintended roll
-                transform.rotation = Quat::from_axis_angle(Vec3::Y, delta_state.yaw)
-                    * Quat::from_axis_angle(Vec3::X, delta_state.pitch);
+                transform.rotation =
+                    Quat::from_axis_angle(Vec3::Y, yaw) * Quat::from_axis_angle(Vec3::X, pitch);
             }
         }
     } else {

From e54ad46caa0893c58201266dad3354994006e0cd Mon Sep 17 00:00:00 2001
From: eickern <git@nikl.me>
Date: Sat, 4 Mar 2023 16:45:41 +0100
Subject: [PATCH 3/4] Update to current bevy main

Co-authored-by: Zyllian <z@zoey.dev>
---
 .gitignore         |  3 +++
 Cargo.toml         |  5 ++---
 examples/basic.rs  |  9 ++++++---
 examples/scroll.rs | 24 ++++++++++++++----------
 src/lib.rs         | 45 ++++++++++++++++++++++++---------------------
 5 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 088ba6b..40cb88f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+# IDE
+.idea/
diff --git a/Cargo.toml b/Cargo.toml
index 2956730..637c4d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,11 +10,10 @@ repository = "https://github.com/sburris0/bevy_flycam/"
 readme = "README.md"
 keywords = ["gamedev", "bevy", "3d", "camera"]
 categories = ["game-engines", "game-development"]
-resolver = "2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-bevy = {version = "0.9", default-features = false, features = ["bevy_render", "bevy_core_pipeline", "bevy_asset"]}
+bevy = {git = "https://github.com/bevyengine/bevy", default-features = false, features = ["bevy_render", "bevy_core_pipeline", "bevy_asset"]}
 
 [dev-dependencies]
-bevy = {version = "0.9", default-features = false, features = ["x11", "wayland", "bevy_pbr", "bevy_core_pipeline", "bevy_asset"]}
\ No newline at end of file
+bevy = {git = "https://github.com/bevyengine/bevy", default-features = false, features = ["x11", "wayland", "bevy_pbr", "bevy_core_pipeline", "bevy_asset"]}
diff --git a/examples/basic.rs b/examples/basic.rs
index fda0a89..32d00ed 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -7,14 +7,14 @@ use bevy_flycam::PlayerPlugin;
 
 fn main() {
     App::new()
-        .insert_resource(Msaa { samples: 4 })
+        .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
         .add_plugin(PlayerPlugin)
         .insert_resource(MovementSettings {
             sensitivity: 0.00015, // default: 0.00012
             speed: 12.0,          // default: 12.0
         })
-        .add_startup_system(setup)
+        .add_system(setup.on_startup())
         .run();
 }
 
@@ -26,7 +26,10 @@ fn setup(
 ) {
     // plane
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Plane { size: 5.0 })),
+        mesh: meshes.add(Mesh::from(shape::Plane {
+            size: 5.0,
+            subdivisions: 0,
+        })),
         material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
         ..Default::default()
     });
diff --git a/examples/scroll.rs b/examples/scroll.rs
index 524621c..2daf09d 100644
--- a/examples/scroll.rs
+++ b/examples/scroll.rs
@@ -4,15 +4,16 @@ use bevy_flycam::{FlyCam, MovementSettings, NoCameraPlayerPlugin};
 // From bevy examples:
 // https://github.com/bevyengine/bevy/blob/latest/examples/3d/3d_scene.rs
 
-#[derive(Clone, Eq, PartialEq, Debug, Hash)]
+#[derive(States, Default, Clone, Eq, PartialEq, Debug, Hash)]
 enum ScrollType {
+    #[default]
     MovementSpeed,
     Zoom,
 }
 
 fn main() {
     App::new()
-        .insert_resource(Msaa { samples: 4 })
+        .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
         //NoCameraPlayerPlugin as we provide the camera
         .add_plugin(NoCameraPlayerPlugin)
@@ -20,8 +21,8 @@ fn main() {
             ..Default::default()
         })
         // Setting initial state
-        .add_state(ScrollType::MovementSpeed)
-        .add_startup_system(setup)
+        .add_state::<ScrollType>()
+        .add_system(setup.on_startup())
         .add_system(switch_scroll_type)
         .add_system(scroll)
         .run();
@@ -35,7 +36,10 @@ fn setup(
 ) {
     // plane
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Plane { size: 5.0 })),
+        mesh: meshes.add(Mesh::from(shape::Plane {
+            size: 5.0,
+            subdivisions: 0,
+        })),
         material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
         ..Default::default()
     });
@@ -66,19 +70,19 @@ fn setup(
 }
 
 /// Listens for Z key being pressed and toggles between the two scroll-type states [`ScrollType`]
-#[allow(unused_must_use)]
 fn switch_scroll_type(
-    mut scroll_type: ResMut<State<ScrollType>>,
+    scroll_type: Res<State<ScrollType>>,
+    mut next_scroll_type: ResMut<NextState<ScrollType>>,
     keyboard_input: Res<Input<KeyCode>>,
 ) {
     if keyboard_input.just_pressed(KeyCode::Z) {
-        let result = match scroll_type.current() {
+        let result = match scroll_type.0 {
             ScrollType::MovementSpeed => ScrollType::Zoom,
             ScrollType::Zoom => ScrollType::MovementSpeed,
         };
 
         println!("{:?}", result);
-        scroll_type.set(result);
+        next_scroll_type.set(result);
     }
 }
 
@@ -90,7 +94,7 @@ fn scroll(
     mut query: Query<(&FlyCam, &mut Projection)>,
 ) {
     for event in mouse_wheel_events.iter() {
-        if *scroll_type.current() == ScrollType::MovementSpeed {
+        if scroll_type.0 == ScrollType::MovementSpeed {
             settings.speed = (settings.speed + event.y * 0.1).abs();
             println!("Speed: {:?}", settings.speed);
         } else {
diff --git a/src/lib.rs b/src/lib.rs
index 8a9db3d..e01eff7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 use bevy::ecs::event::{Events, ManualEventReader};
 use bevy::input::mouse::MouseMotion;
 use bevy::prelude::*;
-use bevy::window::CursorGrabMode;
+use bevy::window::{CursorGrabMode, PrimaryWindow};
 
 /// Keeps track of mouse motion events, pitch, and yaw
 #[derive(Resource, Default)]
@@ -34,22 +34,22 @@ pub struct FlyCam;
 
 /// Grabs/ungrabs mouse cursor
 fn toggle_grab_cursor(window: &mut Window) {
-    match window.cursor_grab_mode() {
+    match window.cursor.grab_mode {
         CursorGrabMode::None => {
-            window.set_cursor_grab_mode(CursorGrabMode::Confined);
-            window.set_cursor_visibility(false);
+            window.cursor.grab_mode = CursorGrabMode::Confined;
+            window.cursor.visible = false;
         }
         _ => {
-            window.set_cursor_grab_mode(CursorGrabMode::None);
-            window.set_cursor_visibility(true);
+            window.cursor.grab_mode = CursorGrabMode::None;
+            window.cursor.visible = true;
         }
     }
 }
 
 /// Grabs the cursor when game first starts
-fn initial_grab_cursor(mut windows: ResMut<Windows>) {
-    if let Some(window) = windows.get_primary_mut() {
-        toggle_grab_cursor(window);
+fn initial_grab_cursor(mut primary_window: Query<&mut Window, With<PrimaryWindow>>) {
+    if let Ok(mut window) = primary_window.get_single_mut() {
+        toggle_grab_cursor(&mut window);
     } else {
         warn!("Primary window not found for `initial_grab_cursor`!");
     }
@@ -70,11 +70,11 @@ fn setup_player(mut commands: Commands) {
 fn player_move(
     keys: Res<Input<KeyCode>>,
     time: Res<Time>,
-    windows: Res<Windows>,
+    primary_window: Query<&Window, With<PrimaryWindow>>,
     settings: Res<MovementSettings>,
     mut query: Query<&mut Transform, With<FlyCam>>,
 ) {
-    if let Some(window) = windows.get_primary() {
+    if let Ok(window) = primary_window.get_single() {
         for mut transform in query.iter_mut() {
             let mut velocity = Vec3::ZERO;
             let local_z = transform.local_z();
@@ -82,7 +82,7 @@ fn player_move(
             let right = Vec3::new(local_z.z, 0., -local_z.x);
 
             for key in keys.get_pressed() {
-                match window.cursor_grab_mode() {
+                match window.cursor.grab_mode {
                     CursorGrabMode::None => (),
                     _ => match key {
                         KeyCode::W => velocity += forward,
@@ -108,16 +108,16 @@ fn player_move(
 /// Handles looking around if cursor is locked
 fn player_look(
     settings: Res<MovementSettings>,
-    windows: Res<Windows>,
+    primary_window: Query<&Window, With<PrimaryWindow>>,
     mut state: ResMut<InputState>,
     motion: Res<Events<MouseMotion>>,
     mut query: Query<&mut Transform, With<FlyCam>>,
 ) {
-    if let Some(window) = windows.get_primary() {
+    if let Ok(window) = primary_window.get_single() {
         let mut delta_state = state.as_mut();
         for mut transform in query.iter_mut() {
             for ev in delta_state.reader_motion.iter(&motion) {
-                match window.cursor_grab_mode() {
+                match window.cursor.grab_mode {
                     CursorGrabMode::None => (),
                     _ => {
                         // Using smallest of height or width ensures equal vertical and horizontal sensitivity
@@ -141,10 +141,13 @@ fn player_look(
     }
 }
 
-fn cursor_grab(keys: Res<Input<KeyCode>>, mut windows: ResMut<Windows>) {
-    if let Some(window) = windows.get_primary_mut() {
+fn cursor_grab(
+    keys: Res<Input<KeyCode>>,
+    mut primary_window: Query<&mut Window, With<PrimaryWindow>>,
+) {
+    if let Ok(mut window) = primary_window.get_single_mut() {
         if keys.just_pressed(KeyCode::Escape) {
-            toggle_grab_cursor(window);
+            toggle_grab_cursor(&mut window);
         }
     } else {
         warn!("Primary window not found for `cursor_grab`!");
@@ -157,8 +160,8 @@ impl Plugin for PlayerPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<InputState>()
             .init_resource::<MovementSettings>()
-            .add_startup_system(setup_player)
-            .add_startup_system(initial_grab_cursor)
+            .add_system(setup_player.on_startup())
+            .add_system(initial_grab_cursor.on_startup())
             .add_system(player_move)
             .add_system(player_look)
             .add_system(cursor_grab);
@@ -171,7 +174,7 @@ impl Plugin for NoCameraPlayerPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<InputState>()
             .init_resource::<MovementSettings>()
-            .add_startup_system(initial_grab_cursor)
+            .add_system(initial_grab_cursor.on_startup())
             .add_system(player_move)
             .add_system(player_look)
             .add_system(cursor_grab);

From 7d69689606047ff04e8c608f1e62dfb12e2ec002 Mon Sep 17 00:00:00 2001
From: eickern <git@nikl.me>
Date: Mon, 6 Mar 2023 18:56:40 +0100
Subject: [PATCH 4/4] Update to Bevy 0.10

---
 Cargo.toml |  6 +++---
 README.md  | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 637c4d5..8724ae0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_flycam"
-version = "0.9.0"
+version = "0.10.0"
 authors = ["Spencer Burris <sburris@posteo.net>"]
 edition = "2021"
 license = "ISC"
@@ -13,7 +13,7 @@ categories = ["game-engines", "game-development"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-bevy = {git = "https://github.com/bevyengine/bevy", default-features = false, features = ["bevy_render", "bevy_core_pipeline", "bevy_asset"]}
+bevy = { version = "0.10.0", default-features = false, features = ["bevy_render", "bevy_core_pipeline", "bevy_asset"] }
 
 [dev-dependencies]
-bevy = {git = "https://github.com/bevyengine/bevy", default-features = false, features = ["x11", "wayland", "bevy_pbr", "bevy_core_pipeline", "bevy_asset"]}
+bevy = { version = "0.10.0", default-features = false, features = ["x11", "wayland", "bevy_pbr", "bevy_core_pipeline", "bevy_asset"] }
diff --git a/README.md b/README.md
index 72f1872..c2ede40 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 ![docs.rs](https://img.shields.io/docsrs/bevy_flycam)
 
 
-A basic first-person fly camera for Bevy 0.9
+A basic first-person fly camera for Bevy 0.10
 
 ## Controls
 * WASD to move horizontally
@@ -25,7 +25,7 @@ There are a few notable differences from [bevy_fly_camera](https://github.com/mc
 1. Add to `Cargo.toml` or copy `lib.rs` to your own file
 ```toml
 [dependencies]
-bevy = "0.9"
+bevy = "0.10"
 bevy_flycam = "*"
 ```
 
@@ -33,7 +33,7 @@ or
 
 ```toml
 [dependencies]
-bevy = "0.9"
+bevy = "0.10"
 bevy_flycam = { git = "https://github.com/sburris0/bevy_flycam" }
 ```
 
@@ -78,9 +78,9 @@ fn main() {
 [![Bevy tracking](https://img.shields.io/badge/Bevy%20tracking-released%20version-lightblue)](https://github.com/bevyengine/bevy/blob/main/docs/plugins_guidelines.md#main-branch-tracking)
 
 bevy_flycam's crate version follows bevy's X version as shown:
-|bevy|bevy_flycam|
-|---|---|
-|0.X.Y|0.X|
+| bevy     | bevy_flycam |
+| :--      | :--         |
+| `0.10.0` | `0.10`      |
 
 ## Contributing
 PRs are very welcome.