From e4443fe4dc26cf04ab819ec94297ed0bddffbac3 Mon Sep 17 00:00:00 2001
From: tigerplush <64077786+tigerplush@users.noreply.github.com>
Date: Tue, 3 Sep 2024 19:01:34 +0200
Subject: [PATCH 1/4] added screenshot function and workflow for krypta

---
 .github/workflows/perf.yml | 34 ++++++++++++++++++++++++++++++++
 Cargo.toml                 |  1 +
 examples/krypta.rs         | 40 +++++++++++++++++++++++++++++++++++---
 3 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/perf.yml

diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
new file mode 100644
index 0000000..584355f
--- /dev/null
+++ b/.github/workflows/perf.yml
@@ -0,0 +1,34 @@
+name: Performance Check
+permissions: read-all
+
+on: workflow_dispatch
+
+env:
+    CARGO_TERM_COLOR: always
+
+jobs:
+    performance:
+        name: Performance Check
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v3
+            - uses: Swatinem/rust-cache@v2
+            - uses: dtolnay/rust-toolchain@master
+              with:
+                toolchain: nightly
+                components: clippy, rustfmt
+
+            - name: Install alsa and udev
+              run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+
+            - name: Cargo Build Krypta Example
+              run: cargo run --release --example krypta --features benchmark
+
+            - name: ls
+              run: ls -la
+
+            - uses: actions/upload-artifact@v4
+              with:
+                name: upload screenshot
+                path: ./screenshot.png
diff --git a/Cargo.toml b/Cargo.toml
index f7b7f0c..de224be 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ readme = "README.md"
 [features]
 default = ["egui"]
 egui = ["dep:bevy-inspector-egui"]
+benchmark = ["default"]
 
 [dependencies]
 bevy = { version = "0.14.1", default-features = false, features = [
diff --git a/examples/krypta.rs b/examples/krypta.rs
index 008b906..dc949b1 100644
--- a/examples/krypta.rs
+++ b/examples/krypta.rs
@@ -1,8 +1,13 @@
+#[cfg(feature = "benchmark")]
+use std::path::Path;
+
 use bevy::color::palettes;
 use bevy::input::mouse::MouseWheel;
 use bevy::prelude::*;
 use bevy::render::camera::RenderTarget;
 use bevy::render::texture::{ImageFilterMode, ImageSamplerDescriptor};
+#[cfg(feature = "benchmark")]
+use bevy::render::view::screenshot::ScreenshotManager;
 use bevy::render::view::RenderLayers;
 use bevy::sprite::MaterialMesh2dBundle;
 use bevy::window::PrimaryWindow;
@@ -29,7 +34,8 @@ pub struct Movable;
 fn main()
 {
     // Basic setup.
-    App::new()
+    let mut app = App::new();
+    app
         .insert_resource(ClearColor(Color::srgba_u8(0, 0, 0, 0)))
         .add_plugins((
             DefaultPlugins
@@ -74,8 +80,12 @@ fn main()
         .register_type::<LightPassParams>()
         .add_systems(Startup, setup.after(setup_post_processing_camera))
         .add_systems(Update, (system_move_camera, system_camera_zoom))
-        .add_systems(Update, system_control_mouse_light.after(system_move_camera))
-        .run();
+        .add_systems(Update, system_control_mouse_light.after(system_move_camera));
+
+        #[cfg(feature = "benchmark")]
+        app.add_systems(Update, take_screenshot);
+
+        app.run();
 }
 
 #[allow(clippy::identity_op)]
@@ -985,4 +995,28 @@ fn system_camera_zoom(
         camera.scale = (camera.scale - projection_delta * time.delta_seconds())
             .clamp(CAMERA_SCALE_BOUNDS.0, CAMERA_SCALE_BOUNDS.1);
     }
+}
+
+#[cfg(feature = "benchmark")]
+fn take_screenshot(
+    time: Res<Time>,
+    main_window: Query<Entity, With<PrimaryWindow>>,
+    mut screenshot_manager: ResMut<ScreenshotManager>,
+    mut exit: EventWriter<AppExit>,
+    mut screenshot_requested: Local<bool>,
+) {
+    const SCREENSHOT_AFTER_SECONDS: f32 = 10.0;
+
+    if time.elapsed_seconds() > SCREENSHOT_AFTER_SECONDS && !*screenshot_requested {
+        // take screenshot
+        screenshot_manager
+            .save_screenshot_to_disk(main_window.single(), "./screenshot.png")
+            .unwrap();
+        *screenshot_requested = true;
+    }
+
+    if *screenshot_requested && Path::new("./screenshot.png").exists() {
+        // exit
+        exit.send(AppExit::Success);
+    }
 }
\ No newline at end of file

From 80ecfdd7a6f4acd61b92b10749813db81df471a1 Mon Sep 17 00:00:00 2001
From: tigerplush <64077786+tigerplush@users.noreply.github.com>
Date: Tue, 3 Sep 2024 19:25:12 +0200
Subject: [PATCH 2/4] trunk fmt

---
 .github/workflows/perf.yml | 52 +++++++++++++++++------------------
 examples/krypta.rs         | 56 ++++++++++++++++++--------------------
 2 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
index 584355f..e4a7e12 100644
--- a/.github/workflows/perf.yml
+++ b/.github/workflows/perf.yml
@@ -4,31 +4,31 @@ permissions: read-all
 on: workflow_dispatch
 
 env:
-    CARGO_TERM_COLOR: always
+  CARGO_TERM_COLOR: always
 
 jobs:
-    performance:
-        name: Performance Check
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v3
-            - uses: Swatinem/rust-cache@v2
-            - uses: dtolnay/rust-toolchain@master
-              with:
-                toolchain: nightly
-                components: clippy, rustfmt
-
-            - name: Install alsa and udev
-              run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
-
-            - name: Cargo Build Krypta Example
-              run: cargo run --release --example krypta --features benchmark
-
-            - name: ls
-              run: ls -la
-
-            - uses: actions/upload-artifact@v4
-              with:
-                name: upload screenshot
-                path: ./screenshot.png
+  performance:
+    name: Performance Check
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Swatinem/rust-cache@v2
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly
+          components: clippy, rustfmt
+
+      - name: Install alsa and udev
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+
+      - name: Cargo Build Krypta Example
+        run: cargo run --release --example krypta --features benchmark
+
+      - name: ls
+        run: ls -la
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: upload screenshot
+          path: ./screenshot.png
diff --git a/examples/krypta.rs b/examples/krypta.rs
index dc949b1..b3f2433 100644
--- a/examples/krypta.rs
+++ b/examples/krypta.rs
@@ -31,12 +31,10 @@ pub struct MouseLight;
 #[derive(Component)]
 pub struct Movable;
 
-fn main()
-{
+fn main() {
     // Basic setup.
     let mut app = App::new();
-    app
-        .insert_resource(ClearColor(Color::srgba_u8(0, 0, 0, 0)))
+    app.insert_resource(ClearColor(Color::srgba_u8(0, 0, 0, 0)))
         .add_plugins((
             DefaultPlugins
                 .set(AssetPlugin {
@@ -82,10 +80,10 @@ fn main()
         .add_systems(Update, (system_move_camera, system_camera_zoom))
         .add_systems(Update, system_control_mouse_light.after(system_move_camera));
 
-        #[cfg(feature = "benchmark")]
-        app.add_systems(Update, take_screenshot);
+    #[cfg(feature = "benchmark")]
+    app.add_systems(Update, take_screenshot);
 
-        app.run();
+    app.run();
 }
 
 #[allow(clippy::identity_op)]
@@ -97,8 +95,7 @@ fn setup(
     camera_targets: Res<CameraTargets>,
     asset_server: Res<AssetServer>,
     mut texture_atlases: ResMut<Assets<TextureAtlasLayout>>,
-)
-{
+) {
     // Utility functions to compute Z coordinate for floor and ground objects.
     let get_floor_z = |y| -> f32 { Z_BASE_FLOOR - y / SCREEN_SIZE.1 };
     let get_object_z = |y| -> f32 { Z_BASE_OBJECTS - y / SCREEN_SIZE.1 };
@@ -200,7 +197,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: floor_atlas.clone(),
-                            index:  id as usize,
+                            index: id as usize,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_FLOOR))
@@ -330,7 +327,7 @@ fn setup(
                             },
                             TextureAtlas {
                                 layout: wall_atlas.clone(),
-                                index:  id as usize,
+                                index: id as usize,
                             },
                         ))
                         .insert(RenderLayers::from_layers(CAMERA_LAYER_WALLS))
@@ -400,7 +397,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index:  candle_rect_1,
+                            index: candle_rect_1,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -435,7 +432,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index:  candle_rect_2,
+                            index: candle_rect_2,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -470,7 +467,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index:  candle_rect_3,
+                            index: candle_rect_3,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -505,7 +502,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index:  candle_rect_4,
+                            index: candle_rect_4,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -539,7 +536,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index:  tomb_rect_1,
+                            index: tomb_rect_1,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -573,7 +570,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index:  tomb_rect_1,
+                            index: tomb_rect_1,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -608,7 +605,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index:  sewerage_rect_1,
+                            index: sewerage_rect_1,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_FLOOR)) // Add to floor
@@ -759,10 +756,10 @@ fn setup(
             -1163.2,
             "outdoor_light_9",
             OmniLightSource2D {
-                intensity:          1.2,
-                falloff:            Vec3::new(50.0, 40.0, 0.03),
-                color:              Color::srgb_u8(0, 206, 94),
-                jitter_intensity:   0.7,
+                intensity: 1.2,
+                falloff: Vec3::new(50.0, 40.0, 0.03),
+                color: Color::srgb_u8(0, 206, 94),
+                jitter_intensity: 0.7,
                 jitter_translation: 3.0,
             },
         ));
@@ -773,10 +770,10 @@ fn setup(
             -1210.0,
             "outdoor_light_10",
             OmniLightSource2D {
-                intensity:          1.2,
-                falloff:            Vec3::new(50.0, 40.0, 0.03),
-                color:              Color::srgb_u8(0, 206, 94),
-                jitter_intensity:   0.7,
+                intensity: 1.2,
+                falloff: Vec3::new(50.0, 40.0, 0.03),
+                color: Color::srgb_u8(0, 206, 94),
+                jitter_intensity: 0.7,
                 jitter_translation: 3.0,
             },
         ));
@@ -815,7 +812,7 @@ fn setup(
     // Add skylight light.
     commands.spawn((
         SkylightLight2D {
-            color:     Color::srgb_u8(93, 158, 179),
+            color: Color::srgb_u8(93, 158, 179),
             intensity: 0.025,
         },
         Name::new("global_skylight"),
@@ -908,8 +905,7 @@ fn system_control_mouse_light(
     query_cameras: Query<(&Camera, &GlobalTransform), With<SpriteCamera>>,
     mouse: Res<ButtonInput<MouseButton>>,
     keyboard: Res<ButtonInput<KeyCode>>,
-)
-{
+) {
     let mut rng = thread_rng();
 
     // We only need to iter over first camera matched.
@@ -1019,4 +1015,4 @@ fn take_screenshot(
         // exit
         exit.send(AppExit::Success);
     }
-}
\ No newline at end of file
+}

From ca884caaffb393233929927cd32f6281c9ecd43e Mon Sep 17 00:00:00 2001
From: tigerplush <64077786+tigerplush@users.noreply.github.com>
Date: Tue, 3 Sep 2024 19:55:31 +0200
Subject: [PATCH 3/4] trunk fmt

---
 examples/krypta.rs | 51 +++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/examples/krypta.rs b/examples/krypta.rs
index b3f2433..b48ea05 100644
--- a/examples/krypta.rs
+++ b/examples/krypta.rs
@@ -31,7 +31,8 @@ pub struct MouseLight;
 #[derive(Component)]
 pub struct Movable;
 
-fn main() {
+fn main()
+{
     // Basic setup.
     let mut app = App::new();
     app.insert_resource(ClearColor(Color::srgba_u8(0, 0, 0, 0)))
@@ -95,7 +96,8 @@ fn setup(
     camera_targets: Res<CameraTargets>,
     asset_server: Res<AssetServer>,
     mut texture_atlases: ResMut<Assets<TextureAtlasLayout>>,
-) {
+)
+{
     // Utility functions to compute Z coordinate for floor and ground objects.
     let get_floor_z = |y| -> f32 { Z_BASE_FLOOR - y / SCREEN_SIZE.1 };
     let get_object_z = |y| -> f32 { Z_BASE_OBJECTS - y / SCREEN_SIZE.1 };
@@ -197,7 +199,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: floor_atlas.clone(),
-                            index: id as usize,
+                            index:  id as usize,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_FLOOR))
@@ -327,7 +329,7 @@ fn setup(
                             },
                             TextureAtlas {
                                 layout: wall_atlas.clone(),
-                                index: id as usize,
+                                index:  id as usize,
                             },
                         ))
                         .insert(RenderLayers::from_layers(CAMERA_LAYER_WALLS))
@@ -397,7 +399,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index: candle_rect_1,
+                            index:  candle_rect_1,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -432,7 +434,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index: candle_rect_2,
+                            index:  candle_rect_2,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -467,7 +469,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index: candle_rect_3,
+                            index:  candle_rect_3,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -502,7 +504,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index: candle_rect_4,
+                            index:  candle_rect_4,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -536,7 +538,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index: tomb_rect_1,
+                            index:  tomb_rect_1,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -570,7 +572,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index: tomb_rect_1,
+                            index:  tomb_rect_1,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_OBJECTS))
@@ -605,7 +607,7 @@ fn setup(
                         },
                         TextureAtlas {
                             layout: texture_atlas_handle.clone(),
-                            index: sewerage_rect_1,
+                            index:  sewerage_rect_1,
                         },
                     ))
                     .insert(RenderLayers::from_layers(CAMERA_LAYER_FLOOR)) // Add to floor
@@ -756,10 +758,10 @@ fn setup(
             -1163.2,
             "outdoor_light_9",
             OmniLightSource2D {
-                intensity: 1.2,
-                falloff: Vec3::new(50.0, 40.0, 0.03),
-                color: Color::srgb_u8(0, 206, 94),
-                jitter_intensity: 0.7,
+                intensity:          1.2,
+                falloff:            Vec3::new(50.0, 40.0, 0.03),
+                color:              Color::srgb_u8(0, 206, 94),
+                jitter_intensity:   0.7,
                 jitter_translation: 3.0,
             },
         ));
@@ -770,10 +772,10 @@ fn setup(
             -1210.0,
             "outdoor_light_10",
             OmniLightSource2D {
-                intensity: 1.2,
-                falloff: Vec3::new(50.0, 40.0, 0.03),
-                color: Color::srgb_u8(0, 206, 94),
-                jitter_intensity: 0.7,
+                intensity:          1.2,
+                falloff:            Vec3::new(50.0, 40.0, 0.03),
+                color:              Color::srgb_u8(0, 206, 94),
+                jitter_intensity:   0.7,
                 jitter_translation: 3.0,
             },
         ));
@@ -812,7 +814,7 @@ fn setup(
     // Add skylight light.
     commands.spawn((
         SkylightLight2D {
-            color: Color::srgb_u8(93, 158, 179),
+            color:     Color::srgb_u8(93, 158, 179),
             intensity: 0.025,
         },
         Name::new("global_skylight"),
@@ -905,7 +907,8 @@ fn system_control_mouse_light(
     query_cameras: Query<(&Camera, &GlobalTransform), With<SpriteCamera>>,
     mouse: Res<ButtonInput<MouseButton>>,
     keyboard: Res<ButtonInput<KeyCode>>,
-) {
+)
+{
     let mut rng = thread_rng();
 
     // We only need to iter over first camera matched.
@@ -976,7 +979,8 @@ 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() {
@@ -1000,7 +1004,8 @@ fn take_screenshot(
     mut screenshot_manager: ResMut<ScreenshotManager>,
     mut exit: EventWriter<AppExit>,
     mut screenshot_requested: Local<bool>,
-) {
+)
+{
     const SCREENSHOT_AFTER_SECONDS: f32 = 10.0;
 
     if time.elapsed_seconds() > SCREENSHOT_AFTER_SECONDS && !*screenshot_requested {

From b3e2c39a6078de88bf07a8b75d1a47ffae57b9ec Mon Sep 17 00:00:00 2001
From: tigerplush <64077786+tigerplush@users.noreply.github.com>
Date: Tue, 3 Sep 2024 20:12:23 +0200
Subject: [PATCH 4/4] shut up clippy

---
 src/gi/util.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gi/util.rs b/src/gi/util.rs
index b220740..01c7973 100644
--- a/src/gi/util.rs
+++ b/src/gi/util.rs
@@ -7,19 +7,19 @@ pub struct AssetUtil;
 
 impl AssetUtil
 {
-    pub fn gi(l: &'static str) -> AssetPath
+    pub fn gi(l: &'static str) -> AssetPath<'static>
     {
         AssetPath::parse("gi/target").with_label(l.to_owned())
     }
-    pub fn camera(l: &'static str) -> AssetPath
+    pub fn camera(l: &'static str) -> AssetPath<'static>
     {
         AssetPath::parse("camera/target").with_label(l.to_owned())
     }
-    pub fn material(l: &'static str) -> AssetPath
+    pub fn material(l: &'static str) -> AssetPath<'static>
     {
         AssetPath::parse("material").with_label(l.to_owned())
     }
-    pub fn mesh(l: &'static str) -> AssetPath
+    pub fn mesh(l: &'static str) -> AssetPath<'static>
     {
         AssetPath::parse("mesh").with_label(l.to_owned())
     }