Add alternative touch controls (#53)

README.md

@@ -19,7 +19,6 @@ Use it to quickly prototype, experiment, for model viewers, and more!
 - Works with orthographic camera projection in addition to perspective
 - Customisable controls, sensitivity, and more
 - Touch support
-    - Currently 'beta' - please report any issues!
 - Works with multiple viewports and/or windows
 - Easy to control manually, e.g. for keyboard control or animation
 - Can control cameras that render to a texture
@@ -34,15 +33,12 @@ Default mouse controls:
 - Right Mouse - Pan
 - Scroll Wheel - Zoom
 
-Touch controls:
+Default touch controls:
 
 - One finger - Orbit
 - Two fingers - Pan
 - Pinch - Zoom
 
-Note: touch controls are currently not customisable. Please create an issue if you would like to customise the touch
-controls.
-
 ## Quick Start
 
 Add the plugin:
@@ -85,7 +81,7 @@ Note that if you change the up vector either by changing `PanOrbitCamera.base_tr
 
 ## Cargo Features
 
-- `bevy_egui` (optional): makes `PanOrbitCamera` ignore any input that `egui` uses, thus preventing moving the camera
+- `bevy_egui` (optional): Makes `PanOrbitCamera` ignore any input that `egui` uses, thus preventing moving the camera
   when interacting with egui windows
 
 ## Version Compatibility

examples/advanced.rs

@@ -7,7 +7,7 @@
 //!   Zoom: Mousewheel
 
 use bevy::prelude::*;
-use bevy_panorbit_camera::{PanOrbitCamera, PanOrbitCameraPlugin};
+use bevy_panorbit_camera::{PanOrbitCamera, PanOrbitCameraPlugin, TouchControls};
 use std::f32::consts::TAU;
 
 fn main() {
@@ -78,6 +78,8 @@ fn setup(
             modifier_pan: Some(KeyCode::ShiftLeft),
             // Reverse the zoom direction
             reversed_zoom: true,
+            // Use alternate touch controls
+            touch_controls: TouchControls::TwoFingerOrbit,
             ..default()
         },
     ));

examples/egui.rs

@@ -1,18 +1,25 @@
 //! Demonstrates the bevy_egui feature which allows bevy_panorbit_camera to ignore input events in
 //! egui windows
 
+use bevy::ecs::event::EventUpdateSignal;
 use bevy::prelude::*;
 use bevy_egui::{egui, EguiContexts, EguiPlugin};
 use bevy_panorbit_camera::{PanOrbitCamera, PanOrbitCameraPlugin};
 
 fn main() {
-    App::new()
-        .add_plugins(DefaultPlugins)
+    let mut app = App::new();
+    app.add_plugins(DefaultPlugins)
         .add_plugins(EguiPlugin)
         .add_plugins(PanOrbitCameraPlugin)
         .add_systems(Startup, setup)
-        .add_systems(Update, ui_example_system)
-        .run();
+        .add_systems(Update, ui_example_system);
+
+    // Make Bevy drop unconsumed events every frame to prevent weird behaviour when moving mouse
+    // out of an egui window right after scrolling (zooming)
+    // See: https://bevyengine.org/news/bevy-0-13/#events-live-longer
+    app.world.remove_resource::<EventUpdateSignal>();
+
+    app.run();
 }
 
 fn setup(

examples/egui_multiple_windows.rs

@@ -2,20 +2,27 @@
 //! This is a combination of the egui and multiple_windows examples, and doesn't show anything new,
 //! it's primarily here for easy e2e testing.
 
+use bevy::ecs::event::EventUpdateSignal;
 use bevy::prelude::*;
 use bevy::render::camera::RenderTarget;
 use bevy::window::WindowRef;
 use bevy_egui::{egui, EguiContexts, EguiPlugin};
 use bevy_panorbit_camera::{PanOrbitCamera, PanOrbitCameraPlugin};
 
 fn main() {
-    App::new()
-        .add_plugins(DefaultPlugins)
+    let mut app = App::new();
+    app.add_plugins(DefaultPlugins)
         .add_plugins(EguiPlugin)
         .add_plugins(PanOrbitCameraPlugin)
         .add_systems(Startup, setup)
-        .add_systems(Update, ui_example_system)
-        .run();
+        .add_systems(Update, ui_example_system);
+
+    // Make Bevy drop unconsumed events every frame to prevent weird behaviour when moving mouse
+    // out of an egui window right after scrolling (zooming)
+    // See: https://bevyengine.org/news/bevy-0-13/#events-live-longer
+    app.world.remove_resource::<EventUpdateSignal>();
+
+    app.run();
 }
 
 fn setup(