From c8162dc2de9bd11ad8a85aefc56072598625fc39 Mon Sep 17 00:00:00 2001
From: Carson <carsonburke22@gmail.com>
Date: Thu, 29 Aug 2024 23:30:20 -0700
Subject: [PATCH 1/2] krypta zooming and LMB readme correction

---
 README.md          |  2 +-
 examples/krypta.rs | 29 ++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e6bcf43..7c704f4 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ cargo run --example krypta
 ```
 
 - WASD to control camera.
-- LMC to place a light source.
+- SHIFT+LMC to place a light source.
 - RMC to change color of light source.
 
 ## TODOs
diff --git a/examples/krypta.rs b/examples/krypta.rs
index b6c8bc3..e3dac7a 100644
--- a/examples/krypta.rs
+++ b/examples/krypta.rs
@@ -1,4 +1,5 @@
 use bevy::color::palettes;
+use bevy::input::mouse::MouseWheel;
 use bevy::prelude::*;
 use bevy::render::camera::RenderTarget;
 use bevy::render::texture::{ImageFilterMode, ImageSamplerDescriptor};
@@ -70,7 +71,7 @@ fn main()
         .register_type::<BevyMagicLight2DSettings>()
         .register_type::<LightPassParams>()
         .add_systems(Startup, setup.after(setup_post_processing_camera))
-        .add_systems(Update, system_move_camera)
+        .add_systems(Update, (system_move_camera, system_camera_zoom))
         .add_systems(Update, system_control_mouse_light.after(system_move_camera))
         .run();
 }
@@ -962,3 +963,29 @@ fn system_move_camera(
         camera_transform.translation.y = camera_current.y;
     }
 }
+
+mod camera {
+    pub const MIN_SCALE: f32 =1.;
+    pub const MAX_SCALE: f32 = 20.;
+}
+
+fn system_camera_zoom(
+    mut cameras: Query<&mut OrthographicProjection, With<SpriteCamera>>,
+    time: Res<Time>,
+    mut scroll_event_reader: EventReader<MouseWheel>,
+) {
+    let mut projection_delta = 0.;
+
+    for event in scroll_event_reader.read() {
+        projection_delta += event.y * 3.;
+    }
+
+    if projection_delta == 0. {
+        return;
+    }
+
+    for mut camera in cameras.iter_mut() {
+        camera.scale = (camera.scale - projection_delta * time.delta_seconds())
+            .clamp(camera::MIN_SCALE, camera::MAX_SCALE);
+    }
+}
\ No newline at end of file

From 3142053efd136cc4b941c618abb1b2f1cddb2d77 Mon Sep 17 00:00:00 2001
From: Carson <carsonburke22@gmail.com>
Date: Fri, 30 Aug 2024 16:40:10 -0700
Subject: [PATCH 2/2] camera constants

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

diff --git a/examples/krypta.rs b/examples/krypta.rs
index e3dac7a..008b906 100644
--- a/examples/krypta.rs
+++ b/examples/krypta.rs
@@ -17,6 +17,8 @@ pub const Z_BASE_FLOOR: f32 = 100.0; // Base z-coordinate for 2D layers.
 pub const Z_BASE_OBJECTS: f32 = 200.0; // Ground object sprites.
 pub const SCREEN_SIZE: (f32, f32) = (1280.0, 720.0);
 pub const CAMERA_SCALE: f32 = 1.0;
+pub const CAMERA_SCALE_BOUNDS: (f32, f32) = (1., 20.);
+pub const CAMERA_ZOOM_SPEED: f32 = 3.;
 
 // Misc components.
 #[derive(Component)]
@@ -964,11 +966,6 @@ fn system_move_camera(
     }
 }
 
-mod camera {
-    pub const MIN_SCALE: f32 =1.;
-    pub const MAX_SCALE: f32 = 20.;
-}
-
 fn system_camera_zoom(
     mut cameras: Query<&mut OrthographicProjection, With<SpriteCamera>>,
     time: Res<Time>,
@@ -977,7 +974,7 @@ fn system_camera_zoom(
     let mut projection_delta = 0.;
 
     for event in scroll_event_reader.read() {
-        projection_delta += event.y * 3.;
+        projection_delta += event.y * CAMERA_ZOOM_SPEED;
     }
 
     if projection_delta == 0. {
@@ -986,6 +983,6 @@ fn system_camera_zoom(
 
     for mut camera in cameras.iter_mut() {
         camera.scale = (camera.scale - projection_delta * time.delta_seconds())
-            .clamp(camera::MIN_SCALE, camera::MAX_SCALE);
+            .clamp(CAMERA_SCALE_BOUNDS.0, CAMERA_SCALE_BOUNDS.1);
     }
 }
\ No newline at end of file