From c3362f5f94498fbc43ed7f0c28b222fcc554e3b2 Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@gmail.com>
Date: Thu, 17 Sep 2020 21:52:32 +0200
Subject: [PATCH 1/5] Port to bevy post-0.1.3

---
 src/lib.rs | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 005d85a..c51cfb0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -90,19 +90,19 @@ impl Default for FlyCamera {
 	}
 }
 
-fn forward_vector(rotation: &Rotation) -> Vec3 {
+fn forward_vector(rotation: &Quat) -> Vec3 {
 	rotation.mul_vec3(Vec3::unit_z()).normalize()
 }
 
-fn forward_walk_vector(rotation: &Rotation) -> Vec3 {
+fn forward_walk_vector(rotation: &Quat) -> Vec3 {
 	let f = forward_vector(rotation);
 	let f_flattened = Vec3::new(f.x(), 0.0, f.z()).normalize();
 	f_flattened
 }
 
-fn strafe_vector(rotation: &Rotation) -> Vec3 {
+fn strafe_vector(rotation: &Quat) -> Vec3 {
 	// Rotate it 90 degrees to get the strafe direction
-	Rotation::from_rotation_y(90.0f32.to_radians())
+	Quat::from_rotation_y(90.0f32.to_radians())
 		.mul_vec3(forward_walk_vector(rotation))
 		.normalize()
 }
@@ -125,9 +125,9 @@ fn movement_axis(
 fn camera_movement_system(
 	time: Res<Time>,
 	keyboard_input: Res<Input<KeyCode>>,
-	mut query: Query<(&mut FlyCamera, &mut Translation, &Rotation)>,
+	mut query: Query<(&mut FlyCamera, &mut Transform)>,
 ) {
-	for (mut options, mut translation, rotation) in &mut query.iter() {
+	for (mut options, mut transform) in &mut query.iter() {
 		let axis_h =
 			movement_axis(&keyboard_input, options.key_right, options.key_left);
 		let axis_v =
@@ -138,8 +138,9 @@ fn camera_movement_system(
 
 		let any_button_down = axis_h != 0.0 || axis_v != 0.0 || axis_float != 0.0;
 
-		let accel: Vec3 = ((strafe_vector(rotation) * axis_h)
-			+ (forward_walk_vector(rotation) * axis_v)
+		let rotation = transform.rotation();
+		let accel: Vec3 = ((strafe_vector(&rotation) * axis_h)
+			+ (forward_walk_vector(&rotation) * axis_v)
 			+ (Vec3::unit_y() * axis_float))
 			* options.speed;
 
@@ -167,7 +168,7 @@ fn camera_movement_system(
 			options.velocity + delta_friction
 		};
 
-		translation.0 += options.velocity;
+		transform.translate(options.velocity);
 	}
 }
 
@@ -180,7 +181,7 @@ fn mouse_motion_system(
 	time: Res<Time>,
 	mut state: ResMut<State>,
 	mouse_motion_events: Res<Events<MouseMotion>>,
-	mut query: Query<(&mut FlyCamera, &mut Rotation)>,
+	mut query: Query<(&mut FlyCamera, &mut Transform)>,
 ) {
 	let mut delta: Vec2 = Vec2::zero();
 	for event in state.mouse_motion_event_reader.iter(&mouse_motion_events) {
@@ -190,7 +191,7 @@ fn mouse_motion_system(
 		return;
 	}
 
-	for (mut options, mut rotation) in &mut query.iter() {
+	for (mut options, mut transform) in &mut query.iter() {
 		options.yaw -= delta.x() * options.sensitivity * time.delta_seconds;
 		options.pitch += delta.y() * options.sensitivity * time.delta_seconds;
 
@@ -205,8 +206,8 @@ fn mouse_motion_system(
 		let yaw_radians = options.yaw.to_radians();
 		let pitch_radians = options.pitch.to_radians();
 
-		rotation.0 = Quat::from_axis_angle(Vec3::unit_y(), yaw_radians)
-			* Quat::from_axis_angle(-Vec3::unit_x(), pitch_radians);
+		transform.set_rotation(Quat::from_axis_angle(Vec3::unit_y(), yaw_radians)
+			* Quat::from_axis_angle(-Vec3::unit_x(), pitch_radians));
 	}
 }
 

From 0a893a99defc98e366e41ba91584ed2c2631cf33 Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@gmail.com>
Date: Sun, 20 Sep 2020 10:33:34 +0200
Subject: [PATCH 2/5] Base on bevy 0.2.0

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index e54cae9..45126b4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,4 +12,4 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.1.3"
\ No newline at end of file
+bevy = "0.2.0"

From 22c43e6128c6d7a6c009107c7bbf845d7fcfcf92 Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@gmail.com>
Date: Sun, 20 Sep 2020 12:18:04 +0200
Subject: [PATCH 3/5] Add key/button for activating movement

If activate_is_toggle is true, then the configured mouse button and/or
key will toggle movement on/off. If activate_is_toggle is false, then
the button must be held down to activate the fly camera movement
systems. This allows for example holding down the right mouse button for
navigating a scene or releasing it to interact with UI elements.
---
 src/lib.rs | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index c51cfb0..017b8a9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,7 +28,7 @@
 //!
 //! There's also a basic piece of example code included in `/examples/basic.rs`
 use bevy::{
-	input::mouse::MouseMotion,
+	input::mouse::{MouseButton, MouseButtonInput, MouseMotion},
 	prelude::*,
 };
 
@@ -69,6 +69,12 @@ pub struct FlyCamera {
 	pub key_up: KeyCode,
 	/// Key used to move forward. Defaults to `LShift`
 	pub key_down: KeyCode,
+	/// Whether activate movement is a toggle or has to be held down. Defaults to `false`
+	pub activate_is_toggle: bool,
+	/// Mouse button used to activate movement. Defaults to `None`
+	pub mouse_button_activate: Option<MouseButton>,
+	/// Key used to activate movement. Defaults to `None`
+	pub key_activate: Option<KeyCode>,
 }
 impl Default for FlyCamera {
 	fn default() -> Self {
@@ -86,6 +92,35 @@ impl Default for FlyCamera {
 			key_right: KeyCode::D,
 			key_up: KeyCode::Space,
 			key_down: KeyCode::LShift,
+			activate_is_toggle: false,
+			mouse_button_activate: None,
+			key_activate: None,
+		}
+	}
+}
+
+fn activate_motion_system(
+	mut state: ResMut<State>,
+	mouse_button_input: Res<Input<MouseButton>>,
+	keyboard_input: Res<Input<KeyCode>>,
+	fly_camera: &FlyCamera,
+) {
+	if let Some(key_activate) = fly_camera.key_activate {
+		if fly_camera.activate_is_toggle {
+			if keyboard_input.just_pressed(key_activate) {
+				state.activated = !state.activated;
+			}
+		} else {
+			state.activated = keyboard_input.pressed(key_activate);
+		}
+	}
+	if let Some(mouse_button_activate) = fly_camera.mouse_button_activate {
+		if fly_camera.activate_is_toggle {
+			if mouse_button_input.just_pressed(mouse_button_activate) {
+				state.activated = !state.activated;
+			}
+		} else {
+			state.activated = mouse_button_input.pressed(mouse_button_activate);
 		}
 	}
 }
@@ -124,9 +159,13 @@ fn movement_axis(
 
 fn camera_movement_system(
 	time: Res<Time>,
+	state: Res<State>,
 	keyboard_input: Res<Input<KeyCode>>,
 	mut query: Query<(&mut FlyCamera, &mut Transform)>,
 ) {
+	if !state.activated {
+		return;
+	}
 	for (mut options, mut transform) in &mut query.iter() {
 		let axis_h =
 			movement_axis(&keyboard_input, options.key_right, options.key_left);
@@ -175,6 +214,7 @@ fn camera_movement_system(
 #[derive(Default)]
 struct State {
 	mouse_motion_event_reader: EventReader<MouseMotion>,
+	activated: bool,
 }
 
 fn mouse_motion_system(
@@ -183,6 +223,9 @@ fn mouse_motion_system(
 	mouse_motion_events: Res<Events<MouseMotion>>,
 	mut query: Query<(&mut FlyCamera, &mut Transform)>,
 ) {
+	if !state.activated {
+		return;
+	}
 	let mut delta: Vec2 = Vec2::zero();
 	for event in state.mouse_motion_event_reader.iter(&mouse_motion_events) {
 		delta += event.delta;
@@ -228,6 +271,7 @@ impl Plugin for FlyCameraPlugin {
 	fn build(&self, app: &mut AppBuilder) {
 		app
 			.init_resource::<State>()
+			.add_system(activate_motion_system.system())
 			.add_system(camera_movement_system.system())
 			.add_system(mouse_motion_system.system());
 	}

From 7db2fd4dcb680cc71fea40b4bbfd6e5af6259dfc Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@gmail.com>
Date: Sun, 20 Sep 2020 12:24:02 +0200
Subject: [PATCH 4/5] Tweaks to preserve existing behavior as default

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

diff --git a/src/lib.rs b/src/lib.rs
index 017b8a9..010c3de 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -69,7 +69,7 @@ pub struct FlyCamera {
 	pub key_up: KeyCode,
 	/// Key used to move forward. Defaults to `LShift`
 	pub key_down: KeyCode,
-	/// Whether activate movement is a toggle or has to be held down. Defaults to `false`
+	/// Whether activate movement is a toggle or has to be held down. Defaults to `true`
 	pub activate_is_toggle: bool,
 	/// Mouse button used to activate movement. Defaults to `None`
 	pub mouse_button_activate: Option<MouseButton>,
@@ -92,7 +92,7 @@ impl Default for FlyCamera {
 			key_right: KeyCode::D,
 			key_up: KeyCode::Space,
 			key_down: KeyCode::LShift,
-			activate_is_toggle: false,
+			activate_is_toggle: true,
 			mouse_button_activate: None,
 			key_activate: None,
 		}
@@ -211,12 +211,20 @@ fn camera_movement_system(
 	}
 }
 
-#[derive(Default)]
 struct State {
 	mouse_motion_event_reader: EventReader<MouseMotion>,
 	activated: bool,
 }
 
+impl Default for State {
+	fn default() -> Self {
+		State {
+			mouse_motion_event_reader: EventReader::default(),
+			activated: true,
+		}
+	}
+}
+
 fn mouse_motion_system(
 	time: Res<Time>,
 	mut state: ResMut<State>,

From a026e6aa8e8f431bb60ab9ac1460d11855975ce6 Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@gmail.com>
Date: Sun, 20 Sep 2020 14:08:34 +0200
Subject: [PATCH 5/5] Remove unused type

---
 src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index 010c3de..a5891ba 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,7 +28,7 @@
 //!
 //! There's also a basic piece of example code included in `/examples/basic.rs`
 use bevy::{
-	input::mouse::{MouseButton, MouseButtonInput, MouseMotion},
+	input::mouse::{MouseButton, MouseMotion},
 	prelude::*,
 };