cleanup leafwing usage and add zoom action

Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/johanhelsing/bevy_pancam"
 version = "0.10.0"
 
 [features]
-default = ["leafwing-input-manager"]
+default = []
 bevy_egui = ["dep:bevy_egui"]
 leafwing-input-manager = ["dep:leafwing-input-manager"]
 

examples/leafwing.rs

@@ -1,7 +1,11 @@
 use bevy::prelude::*;
 use bevy_pancam::{PanCam, PanCamPlugin};
 use leafwing_input_manager::{
-    action_state::ActionState, input_map::InputMap, user_input::InputKind, InputManagerBundle,
+    action_state::ActionState,
+    axislike::SingleAxis,
+    input_map::InputMap,
+    user_input::{InputKind, Modifier},
+    InputManagerBundle,
 };
 use rand::prelude::random;
 
@@ -16,11 +20,12 @@ fn setup(mut commands: Commands) {
     let mut input_map = InputMap::default();
     input_map.insert_chord(
         [
+            InputKind::Modifier(Modifier::Alt),
             InputKind::Mouse(MouseButton::Left),
-            InputKind::Keyboard(KeyCode::AltLeft),
         ],
         bevy_pancam::Action::Grab,
     );
+    input_map.insert(SingleAxis::mouse_wheel_y(), bevy_pancam::Action::Zoom);
     commands.spawn((
         Camera2dBundle::default(),
         PanCam::default(),

src/lib.rs

@@ -1,13 +1,10 @@
 #![warn(missing_docs)]
 #![doc = include_str!("../README.md")]
 
-use bevy::{
-    input::mouse::{MouseScrollUnit, MouseWheel},
-    math::vec2,
-    prelude::*,
-    render::camera::CameraProjection,
-    window::PrimaryWindow,
-};
+use bevy::{math::vec2, prelude::*, render::camera::CameraProjection, window::PrimaryWindow};
+
+#[cfg(not(feature = "leafwing-input-manager"))]
+use bevy::input::mouse::{MouseScrollUnit, MouseWheel};
 
 #[cfg(feature = "leafwing-input-manager")]
 use leafwing_input_manager::{action_state::ActionState, plugin::InputManagerPlugin, Actionlike};
@@ -67,17 +64,28 @@ fn check_egui_wants_focus(
 
 fn camera_zoom(
     mut query: Query<(&PanCam, &mut OrthographicProjection, &mut Transform)>,
-    mut scroll_events: EventReader<MouseWheel>,
+    #[cfg(not(feature = "leafwing-input-manager"))] mut scroll_events: EventReader<MouseWheel>,
+    #[cfg(feature = "leafwing-input-manager")] action_query: Query<&ActionState<Action>>,
     primary_window: Query<&Window, With<PrimaryWindow>>,
 ) {
-    let pixels_per_line = 100.; // Maybe make configurable?
-    let scroll = scroll_events
-        .read()
-        .map(|ev| match ev.unit {
-            MouseScrollUnit::Pixel => ev.y,
-            MouseScrollUnit::Line => ev.y * pixels_per_line,
-        })
-        .sum::<f32>();
+    #[cfg(not(feature = "leafwing-input-manager"))]
+    let scroll = {
+        let pixels_per_line = 100.; // Maybe make configurable?
+        scroll_events
+            .read()
+            .map(|ev| match ev.unit {
+                MouseScrollUnit::Pixel => ev.y,
+                MouseScrollUnit::Line => ev.y * pixels_per_line,
+            })
+            .sum::<f32>()
+    };
+
+    #[cfg(feature = "leafwing-input-manager")]
+    let scroll = if let Ok(action_state) = action_query.get_single() {
+        action_state.value(Action::Zoom)
+    } else {
+        0.
+    };
 
     if scroll == 0. {
         return;
@@ -266,6 +274,8 @@ fn camera_movement(
 pub enum Action {
     /// Action to grab the camera
     Grab,
+    /// Action to zoom in and out
+    Zoom,
 }
 
 /// A component that adds panning camera controls to an orthographic camera