Touchpad magnify and rotate events

crates/bevy_input/src/lib.rs

@@ -30,8 +30,8 @@ use bevy_ecs::prelude::*;
 use bevy_reflect::{FromReflect, Reflect};
 use keyboard::{keyboard_input_system, KeyCode, KeyboardInput, ScanCode};
 use mouse::{
-    mouse_button_input_system, MouseButton, MouseButtonInput, MouseMotion, MouseScrollUnit,
-    MouseWheel,
+    mouse_button_input_system, Magnify, MouseButton, MouseButtonInput, MouseMotion,
+    MouseScrollUnit, MouseWheel, Rotate,
 };
 use touch::{touch_screen_input_system, ForceTouch, TouchInput, TouchPhase, Touches};
 
@@ -67,6 +67,8 @@ impl Plugin for InputPlugin {
             .add_event::<MouseWheel>()
             .init_resource::<Input<MouseButton>>()
             .add_systems(PreUpdate, mouse_button_input_system.in_set(InputSystem))
+            .add_event::<Magnify>()
+            .add_event::<Rotate>()
             // gamepad
             .add_event::<GamepadConnectionEvent>()
             .add_event::<GamepadButtonChangedEvent>()
@@ -112,6 +114,9 @@ impl Plugin for InputPlugin {
             .register_type::<MouseScrollUnit>()
             .register_type::<MouseWheel>();
 
+        // Register touchpad types
+        app.register_type::<Magnify>().register_type::<Rotate>();
+
         // Register touch types
         app.register_type::<TouchInput>()
             .register_type::<ForceTouch>()

crates/bevy_input/src/mouse.rs

@@ -126,6 +126,32 @@ pub struct MouseWheel {
     pub y: f32,
 }
 
+/// Touchpad magnification event with two-finger pinch gesture.
+///
+/// Positive delta values indicate magnification (zooming in) and
+/// negative delta values indicate shrinking (zooming out).
+#[derive(Event, Debug, Clone, Copy, PartialEq, Reflect, FromReflect)]
+#[reflect(Debug, PartialEq)]
+#[cfg_attr(
+    feature = "serialize",
+    derive(serde::Serialize, serde::Deserialize),
+    reflect(Serialize, Deserialize)
+)]
+pub struct Magnify(pub f32);
+
+/// Touchpad rotation event with two-finger rotation gesture.
+///
+/// Positive delta values indicate rotation counterclockwise and
+/// negative delta values indicate rotation clockwise.
+#[derive(Event, Debug, Clone, Copy, PartialEq, Reflect, FromReflect)]
+#[reflect(Debug, PartialEq)]
+#[cfg_attr(
+    feature = "serialize",
+    derive(serde::Serialize, serde::Deserialize),
+    reflect(Serialize, Deserialize)
+)]
+pub struct Rotate(pub f32);
+
 /// Updates the [`Input<MouseButton>`] resource with the latest [`MouseButtonInput`] events.
 ///
 /// ## Differences

crates/bevy_winit/src/lib.rs

@@ -29,7 +29,7 @@ use bevy_ecs::event::{Events, ManualEventReader};
 use bevy_ecs::prelude::*;
 use bevy_input::{
     keyboard::KeyboardInput,
-    mouse::{MouseButtonInput, MouseMotion, MouseScrollUnit, MouseWheel},
+    mouse::{Magnify, MouseButtonInput, MouseMotion, MouseScrollUnit, MouseWheel, Rotate},
     touch::TouchInput,
 };
 use bevy_math::{ivec2, DVec2, Vec2};
@@ -236,6 +236,8 @@ struct InputEvents<'w> {
     keyboard_input: EventWriter<'w, KeyboardInput>,
     character_input: EventWriter<'w, ReceivedCharacter>,
     mouse_button_input: EventWriter<'w, MouseButtonInput>,
+    magnify_input: EventWriter<'w, Magnify>,
+    rotate_input: EventWriter<'w, Rotate>,
     mouse_wheel_input: EventWriter<'w, MouseWheel>,
     touch_input: EventWriter<'w, TouchInput>,
     ime_input: EventWriter<'w, Ime>,
@@ -481,6 +483,12 @@ pub fn winit_runner(mut app: App) {
                             state: converters::convert_element_state(state),
                         });
                     }
+                    WindowEvent::TouchpadMagnify { delta, .. } => {
+                        input_events.magnify_input.send(Magnify(delta as f32));
+                    }
+                    WindowEvent::TouchpadRotate { delta, .. } => {
+                        input_events.rotate_input.send(Rotate(delta as f32));
+                    }
                     WindowEvent::MouseWheel { delta, .. } => match delta {
                         event::MouseScrollDelta::LineDelta(x, y) => {
                             input_events.mouse_wheel_input.send(MouseWheel {

examples/input/mouse_input_events.rs

@@ -1,7 +1,7 @@
 //! Prints all mouse events to the console.
 
 use bevy::{
-    input::mouse::{MouseButtonInput, MouseMotion, MouseWheel},
+    input::mouse::{Magnify, MouseButtonInput, MouseMotion, MouseWheel, Rotate},
     prelude::*,
 };
 
@@ -18,6 +18,8 @@ fn print_mouse_events_system(
     mut mouse_motion_events: EventReader<MouseMotion>,
     mut cursor_moved_events: EventReader<CursorMoved>,
     mut mouse_wheel_events: EventReader<MouseWheel>,
+    mut magnify_events: EventReader<Magnify>,
+    mut rotate_events: EventReader<Rotate>,
 ) {
     for event in mouse_button_input_events.iter() {
         info!("{:?}", event);
@@ -34,4 +36,12 @@ fn print_mouse_events_system(
     for event in mouse_wheel_events.iter() {
         info!("{:?}", event);
     }
+
+    for event in magnify_events.iter() {
+        info!("{:?}", event);
+    }
+
+    for event in rotate_events.iter() {
+        info!("{:?}", event);
+    }
 }