From 281b8b6b12a545dc60a85a544689c06fc4f9f18d Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 11:02:23 +1000
Subject: [PATCH 01/10] Apply rotation constraints always, not just if there's
 input

---
 src/lib.rs | 62 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index e5cf90d..dacbab1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -395,35 +395,6 @@ fn pan_orbit_camera(
                 pan_orbit.target_alpha -= delta_x;
                 pan_orbit.target_beta += delta_y;
 
-                if let Some(upper_alpha) = pan_orbit.alpha_upper_limit {
-                    if pan_orbit.target_alpha > upper_alpha {
-                        pan_orbit.target_alpha = upper_alpha;
-                    }
-                }
-                if let Some(lower_alpha) = pan_orbit.alpha_lower_limit {
-                    if pan_orbit.target_alpha < lower_alpha {
-                        pan_orbit.target_alpha = lower_alpha;
-                    }
-                }
-                if let Some(upper_beta) = pan_orbit.beta_upper_limit {
-                    if pan_orbit.target_beta > upper_beta {
-                        pan_orbit.target_beta = upper_beta;
-                    }
-                }
-                if let Some(lower_beta) = pan_orbit.beta_lower_limit {
-                    if pan_orbit.target_beta < lower_beta {
-                        pan_orbit.target_beta = lower_beta;
-                    }
-                }
-
-                if !pan_orbit.allow_upside_down {
-                    if pan_orbit.target_beta < -PI / 2.0 {
-                        pan_orbit.target_beta = -PI / 2.0;
-                    }
-                    if pan_orbit.target_beta > PI / 2.0 {
-                        pan_orbit.target_beta = PI / 2.0;
-                    }
-                }
                 has_moved = true;
             }
         } else if pan.length_squared() > 0.0 {
@@ -463,7 +434,38 @@ fn pan_orbit_camera(
             has_moved = true;
         }
 
-        // 3 - Apply orbit rotation based on target alpha/beta
+        // 3 - Apply rotation constraints
+
+        if let Some(upper_alpha) = pan_orbit.alpha_upper_limit {
+            if pan_orbit.target_alpha > upper_alpha {
+                pan_orbit.target_alpha = upper_alpha;
+            }
+        }
+        if let Some(lower_alpha) = pan_orbit.alpha_lower_limit {
+            if pan_orbit.target_alpha < lower_alpha {
+                pan_orbit.target_alpha = lower_alpha;
+            }
+        }
+        if let Some(upper_beta) = pan_orbit.beta_upper_limit {
+            if pan_orbit.target_beta > upper_beta {
+                pan_orbit.target_beta = upper_beta;
+            }
+        }
+        if let Some(lower_beta) = pan_orbit.beta_lower_limit {
+            if pan_orbit.target_beta < lower_beta {
+                pan_orbit.target_beta = lower_beta;
+            }
+        }
+        if !pan_orbit.allow_upside_down {
+            if pan_orbit.target_beta < -PI / 2.0 {
+                pan_orbit.target_beta = -PI / 2.0;
+            }
+            if pan_orbit.target_beta > PI / 2.0 {
+                pan_orbit.target_beta = PI / 2.0;
+            }
+        }
+
+        // 4 - Apply orbit rotation based on target alpha/beta
 
         if has_moved
             || pan_orbit.target_alpha != pan_orbit.alpha

From 49092fee5f6f857daecbb2ee1d88eb7246b242ae Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 11:55:09 +1000
Subject: [PATCH 02/10] Add force_update option

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

diff --git a/src/lib.rs b/src/lib.rs
index dacbab1..8c9ba4b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -145,6 +145,11 @@ pub struct PanOrbitCamera {
     /// Set to `true` if you want the camera to smoothly animate to its initial position.
     /// Defaults to `false`.
     pub initialized: bool,
+    /// Whether to update the camera's transform regardless of whether there are any changes/input.
+    /// Set this to `true` if you want to modify alpha/beta/radius/focus directly.
+    /// This will be automatically set back to `false` after one frame.
+    /// Defaults to `false`.
+    pub force_update: bool,
 }
 
 impl Default for PanOrbitCamera {
@@ -173,6 +178,7 @@ impl Default for PanOrbitCamera {
             alpha_lower_limit: None,
             beta_upper_limit: None,
             beta_lower_limit: None,
+            force_update: false,
         }
     }
 }
@@ -467,10 +473,7 @@ fn pan_orbit_camera(
 
         // 4 - Apply orbit rotation based on target alpha/beta
 
-        if has_moved
-            || pan_orbit.target_alpha != pan_orbit.alpha
-            || pan_orbit.target_beta != pan_orbit.beta
-        {
+        if has_moved || pan_orbit.force_update {
             // Interpolate towards the target value
             let t = 1.0 - pan_orbit.orbit_smoothness;
             let mut target_alpha = pan_orbit.alpha.lerp(&pan_orbit.target_alpha, &t);

From f57f063c346ba2f3f0315f370ab647a831070705 Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 11:55:23 +1000
Subject: [PATCH 03/10] Update animate example to use force_update

---
 examples/animate.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/examples/animate.rs b/examples/animate.rs
index 0282ff3..548742e 100644
--- a/examples/animate.rs
+++ b/examples/animate.rs
@@ -45,8 +45,8 @@ fn setup(
     commands.spawn((
         Camera3dBundle::default(),
         PanOrbitCamera {
-            // Optionally disable smoothing to have full control over the camera's position
-            // orbit_smoothness: 0.0,
+            // Disable smoothing, since the animation takes care of that
+            orbit_smoothness: 0.0,
             // Might want to disable the controls
             enabled: false,
             ..default()
@@ -61,5 +61,8 @@ fn animate(time: Res<Time>, mut pan_orbit_query: Query<&mut PanOrbitCamera>) {
         pan_orbit.target_alpha += 15f32.to_radians() * time.delta_seconds();
         pan_orbit.target_beta = time.elapsed_seconds_wrapped().sin() * TAU * 0.1;
         pan_orbit.radius = (((time.elapsed_seconds_wrapped() * 2.0).cos() + 1.0) * 0.5) * 2.0 + 4.0;
+
+        // Force camera to update its transform
+        pan_orbit.force_update = true;
     }
 }

From e6ad90d113dea4ccdb765a535c8c8a4f40cea54b Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 11:56:17 +1000
Subject: [PATCH 04/10] Add keyboard controls example

---
 examples/keyboard_controls.rs | 115 ++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 examples/keyboard_controls.rs

diff --git a/examples/keyboard_controls.rs b/examples/keyboard_controls.rs
new file mode 100644
index 0000000..bab6833
--- /dev/null
+++ b/examples/keyboard_controls.rs
@@ -0,0 +1,115 @@
+//! Demonstrates how to control the camera using the keyboard
+
+use bevy::prelude::*;
+use bevy_panorbit_camera::{PanOrbitCamera, PanOrbitCameraPlugin};
+use std::f32::consts::TAU;
+
+fn main() {
+    App::new()
+        .add_plugins(DefaultPlugins)
+        .add_plugin(PanOrbitCameraPlugin)
+        .add_startup_system(setup)
+        .add_system(keyboard_controls)
+        .run();
+}
+
+fn setup(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    // Ground
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        ..default()
+    });
+    // Cube
+    commands.spawn(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()
+    });
+    // Light
+    commands.spawn(PointLightBundle {
+        point_light: PointLight {
+            intensity: 1500.0,
+            shadows_enabled: true,
+            ..default()
+        },
+        transform: Transform::from_xyz(4.0, 8.0, 4.0),
+        ..default()
+    });
+    // Camera
+    commands.spawn((Camera3dBundle::default(), PanOrbitCamera::default()));
+}
+
+fn keyboard_controls(
+    time: Res<Time>,
+    key_input: Res<Input<KeyCode>>,
+    mut pan_orbit_query: Query<(&mut PanOrbitCamera, &mut Transform)>,
+) {
+    for (mut pan_orbit, mut transform) in pan_orbit_query.iter_mut() {
+        // Jump by 45 degrees using Left Ctrl + Arrows
+        if key_input.pressed(KeyCode::LControl) {
+            if key_input.just_pressed(KeyCode::Right) {
+                pan_orbit.target_alpha += 45f32.to_radians();
+            }
+            if key_input.just_pressed(KeyCode::Left) {
+                pan_orbit.target_alpha -= 45f32.to_radians();
+            }
+            if key_input.just_pressed(KeyCode::Up) {
+                pan_orbit.target_beta += 45f32.to_radians();
+            }
+            if key_input.just_pressed(KeyCode::Down) {
+                pan_orbit.target_beta -= 45f32.to_radians();
+            }
+        }
+        // Pan using Left Shift + Arrows
+        else if key_input.pressed(KeyCode::LShift) {
+            let mut delta_translation = Vec3::ZERO;
+            if key_input.pressed(KeyCode::Right) {
+                delta_translation += transform.rotation * Vec3::X * time.delta_seconds();
+            }
+            if key_input.pressed(KeyCode::Left) {
+                delta_translation += transform.rotation * Vec3::NEG_X * time.delta_seconds();
+            }
+            if key_input.pressed(KeyCode::Up) {
+                delta_translation += transform.rotation * Vec3::Y * time.delta_seconds();
+            }
+            if key_input.pressed(KeyCode::Down) {
+                delta_translation += transform.rotation * Vec3::NEG_Y * time.delta_seconds();
+            }
+            transform.translation += delta_translation;
+            pan_orbit.focus += delta_translation;
+        }
+        // Smooth rotation using arrow keys without modifier
+        else {
+            if key_input.pressed(KeyCode::Right) {
+                pan_orbit.target_alpha += 50f32.to_radians() * time.delta_seconds();
+            }
+            if key_input.pressed(KeyCode::Left) {
+                pan_orbit.target_alpha -= 50f32.to_radians() * time.delta_seconds();
+            }
+            if key_input.pressed(KeyCode::Up) {
+                pan_orbit.target_beta += 50f32.to_radians() * time.delta_seconds();
+            }
+            if key_input.pressed(KeyCode::Down) {
+                pan_orbit.target_beta -= 50f32.to_radians() * time.delta_seconds();
+            }
+
+            // Zoom with Z and X
+            // Note: currently does not work with orthographic cameras
+            if key_input.pressed(KeyCode::Z) {
+                pan_orbit.radius -= 5.0 * time.delta_seconds();
+            }
+            if key_input.pressed(KeyCode::X) {
+                pan_orbit.radius += 5.0 * time.delta_seconds();
+            }
+        }
+
+        // Force camera to update its transform
+        pan_orbit.force_update = true;
+    }
+}

From cc6dec0916358dceccce3d5e63bd38848eba770d Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 11:59:18 +1000
Subject: [PATCH 05/10] Reset force_update

---
 src/lib.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index 8c9ba4b..aa30615 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -492,6 +492,10 @@ fn pan_orbit_camera(
             // Update current alpha and beta values
             pan_orbit.alpha = target_alpha;
             pan_orbit.beta = target_beta;
+
+            if pan_orbit.force_update {
+                pan_orbit.forc_update = false;
+            }
         }
     }
 }

From 1890a50177a823087a0203f4c7f8014d4f1a656f Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 12:02:35 +1000
Subject: [PATCH 06/10] Fix some documentation on the options

---
 src/lib.rs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index aa30615..5165d47 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -90,30 +90,40 @@ pub struct PanOrbitCamera {
     /// Rotation in radians around the global Y axis (longitudinal). Updated automatically.
     /// If both `alpha` and `beta` are `0.0`, then the camera will be looking forward, i.e. in
     /// the `Vec3::NEG_Z` direction, with up being `Vec3::Y`.
+    /// You should not update this manually - use `target_alpha` instead.
     /// Defaults to `0.0`.
     pub alpha: f32,
     /// Rotation in radians around the local X axis (latitudinal). Updated automatically.
     /// If both `alpha` and `beta` are `0.0`, then the camera will be looking forward, i.e. in
     /// the `Vec3::NEG_Z` direction, with up being `Vec3::Y`.
+    /// You should not update this manually - use `target_beta` instead.
     /// Defaults to `0.0`.
     pub beta: f32,
-    /// The target alpha value. The camera will smoothly transition to this value. Used internally
-    /// and typically you won't set this manually.
+    /// The target alpha value. The camera will smoothly transition to this value. Updated
+    /// automatically, but you can also update it manually to control the camera independently of
+    /// the mouse controls, e.g. with the keyboard.
+    /// Defaults to `0.0`.
     pub target_alpha: f32,
-    /// The target beta value. The camera will smoothly transition to this value. Used internally
-    /// and typically you won't set this manually.
+    /// The target beta value. The camera will smoothly transition to this value Updated
+    /// automatically, but you can also update it manually to control the camera independently of
+    /// the mouse controls, e.g. with the keyboard.
+    /// Defaults to `0.0`.
     pub target_beta: f32,
     /// Upper limit on the `alpha` value, in radians. Use this to restrict the maximum rotation
     /// around the global Y axis.
+    /// Defaults to `None`.
     pub alpha_upper_limit: Option<f32>,
     /// Lower limit on the `alpha` value, in radians. Use this to restrict the maximum rotation
     /// around the global Y axis.
+    /// Defaults to `None`.
     pub alpha_lower_limit: Option<f32>,
     /// Upper limit on the `beta` value, in radians. Use this to restrict the maximum rotation
     /// around the local X axis.
+    /// Defaults to `None`.
     pub beta_upper_limit: Option<f32>,
     /// Lower limit on the `beta` value, in radians. Use this to restrict the maximum rotation
     /// around the local X axis.
+    /// Defaults to `None`.
     pub beta_lower_limit: Option<f32>,
     /// The sensitivity of the orbiting motion. Defaults to `1.0`.
     pub orbit_sensitivity: f32,
@@ -146,7 +156,7 @@ pub struct PanOrbitCamera {
     /// Defaults to `false`.
     pub initialized: bool,
     /// Whether to update the camera's transform regardless of whether there are any changes/input.
-    /// Set this to `true` if you want to modify alpha/beta/radius/focus directly.
+    /// Set this to `true` if you want to modify values directly.
     /// This will be automatically set back to `false` after one frame.
     /// Defaults to `false`.
     pub force_update: bool,

From 7bb114f555f2ca7b9f3112ab4dcb59a02935b7b7 Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 12:10:16 +1000
Subject: [PATCH 07/10] Fix force_update

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

diff --git a/src/lib.rs b/src/lib.rs
index 5165d47..cba069a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -435,16 +435,24 @@ fn pan_orbit_camera(
                 has_moved = true;
             }
         } else if scroll.abs() > 0.0 {
+            pan_orbit.radius -= scroll * pan_orbit.radius * 0.2;
+            // Prevent zoom to zero otherwise we can get stuck there
+            pan_orbit.radius = f32::max(pan_orbit.radius, 0.05);
+
             match *projection {
                 Projection::Perspective(_) => {
-                    pan_orbit.radius -= scroll * pan_orbit.radius * 0.2;
+                    // pan_orbit.radius -= scroll * pan_orbit.radius * 0.2;
                     // Prevent zoom to zero otherwise we can get stuck there
-                    pan_orbit.radius = f32::max(pan_orbit.radius, 0.05);
+                    // pan_orbit.radius = f32::max(pan_orbit.radius, 0.05);
                 }
                 Projection::Orthographic(ref mut p) => {
-                    p.scale -= scroll * p.scale * 0.2;
+                    // Calculate scale based on radius, so that one can manually update radius and
+                    // have that work with orthographic cameras
+                    p.scale = pan_orbit.radius;
+
+                    // p.scale -= scroll * p.scale * 0.2;
                     // Prevent zoom to zero otherwise we can get stuck there
-                    p.scale = f32::max(p.scale, 0.05);
+                    // p.scale = f32::max(p.scale, 0.05);
                 }
             }
             has_moved = true;
@@ -504,7 +512,7 @@ fn pan_orbit_camera(
             pan_orbit.beta = target_beta;
 
             if pan_orbit.force_update {
-                pan_orbit.forc_update = false;
+                pan_orbit.force_update = false;
             }
         }
     }

From 8435b0d17e28f1bf3a5709f92efde4414d30ea65 Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 12:13:11 +1000
Subject: [PATCH 08/10] Base orthographic scale off radius

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

diff --git a/src/lib.rs b/src/lib.rs
index cba069a..f87e19f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -343,6 +343,11 @@ fn pan_orbit_camera(
                     pan_orbit.beta = lower_beta;
                 }
             }
+
+            if let Projection::Orthographic(ref mut p) = *projection {
+                p.scale = pan_orbit.radius;
+            }
+
             update_orbit_transform(pan_orbit.alpha, pan_orbit.beta, &pan_orbit, &mut transform);
             pan_orbit.target_alpha = pan_orbit.alpha;
             pan_orbit.target_beta = pan_orbit.beta;
@@ -438,22 +443,8 @@ fn pan_orbit_camera(
             pan_orbit.radius -= scroll * pan_orbit.radius * 0.2;
             // Prevent zoom to zero otherwise we can get stuck there
             pan_orbit.radius = f32::max(pan_orbit.radius, 0.05);
-
-            match *projection {
-                Projection::Perspective(_) => {
-                    // pan_orbit.radius -= scroll * pan_orbit.radius * 0.2;
-                    // Prevent zoom to zero otherwise we can get stuck there
-                    // pan_orbit.radius = f32::max(pan_orbit.radius, 0.05);
-                }
-                Projection::Orthographic(ref mut p) => {
-                    // Calculate scale based on radius, so that one can manually update radius and
-                    // have that work with orthographic cameras
-                    p.scale = pan_orbit.radius;
-
-                    // p.scale -= scroll * p.scale * 0.2;
-                    // Prevent zoom to zero otherwise we can get stuck there
-                    // p.scale = f32::max(p.scale, 0.05);
-                }
+            if let Projection::Orthographic(ref mut p) = *projection {
+                p.scale = pan_orbit.radius;
             }
             has_moved = true;
         }

From 1c10aadbdf8495ff0b6ca792c4b8c2aaeed961cc Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 12:13:32 +1000
Subject: [PATCH 09/10] Remove note about orthographic not working in kb
 example

---
 examples/keyboard_controls.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/keyboard_controls.rs b/examples/keyboard_controls.rs
index bab6833..d04dec8 100644
--- a/examples/keyboard_controls.rs
+++ b/examples/keyboard_controls.rs
@@ -100,7 +100,6 @@ fn keyboard_controls(
             }
 
             // Zoom with Z and X
-            // Note: currently does not work with orthographic cameras
             if key_input.pressed(KeyCode::Z) {
                 pan_orbit.radius -= 5.0 * time.delta_seconds();
             }

From a230426a18dae771c06a451df02d24b92b6ee247 Mon Sep 17 00:00:00 2001
From: Huon Imberger <huon@plonq.org>
Date: Sat, 29 Apr 2023 13:17:19 +1000
Subject: [PATCH 10/10] Update readme features

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e21aeea..036f013 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Default controls:
 - Works with orthographic camera projection in addition to perspective
 - Customisable controls, sensitivity, and more
 - Works with multiple viewports and/or windows
-- Easy to animate, e.g. to slowly rotate around an object
+- Easy to control manually, e.g. for keyboard control or animation
 
 ## Quick Start