From e816e9ba0f3ae6809f0ac9d4ecf536e568021a5c Mon Sep 17 00:00:00 2001
From: Lee-Orr <lee-orr@users.noreply.github.com>
Date: Fri, 15 Mar 2024 15:26:16 -0400
Subject: [PATCH] animation works

---
 Cargo.lock                            | 133 ++++++++++-----
 studio/Cargo.toml                     |   1 +
 studio/src/anim/timeline_animation.rs | 237 +++++++++++++++++++++++++-
 studio/src/main-headless.rs           |   6 +-
 studio/src/screenshot.rs              |  13 +-
 5 files changed, 331 insertions(+), 59 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a514c1a..6959403 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -290,7 +290,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
 dependencies = [
- "event-listener",
+ "event-listener 2.5.3",
  "futures-core",
 ]
 
@@ -301,21 +301,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-core",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.5.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f2db9467baa66a700abce2a18c5ad793f6f83310aca1284796fc3921d113fd"
+checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c"
 dependencies = [
- "async-lock",
+ "async-lock 3.3.0",
  "async-task",
  "concurrent-queue",
  "fastrand 2.0.1",
- "futures-lite 1.13.0",
+ "futures-lite 2.2.0",
  "slab",
 ]
 
@@ -325,7 +325,7 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
 dependencies = [
- "async-lock",
+ "async-lock 2.8.0",
  "autocfg",
  "blocking",
  "futures-lite 1.13.0",
@@ -337,7 +337,18 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
- "event-listener",
+ "event-listener 2.5.3",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+dependencies = [
+ "event-listener 4.0.3",
+ "event-listener-strategy",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -498,7 +509,7 @@ checksum = "935984568f75867dd7357133b06f4b1502cd2be55e4642d483ce597e46e63bff"
 dependencies = [
  "async-broadcast",
  "async-fs",
- "async-lock",
+ "async-lock 2.8.0",
  "bevy_app",
  "bevy_asset_macros",
  "bevy_ecs",
@@ -647,7 +658,7 @@ dependencies = [
  "bevy_tasks",
  "bevy_utils",
  "downcast-rs",
- "event-listener",
+ "event-listener 2.5.3",
  "fixedbitset",
  "rustc-hash",
  "serde",
@@ -1357,6 +1368,16 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "bevy_tweening"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216b3cb82fd0d149c5a9abfb5e382d8a671ff469f8759116e091c710bfa37139"
+dependencies = [
+ "bevy",
+ "interpolation 0.2.0",
+]
+
 [[package]]
 name = "bevy_ui"
 version = "0.12.1"
@@ -1617,7 +1638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a"
 dependencies = [
  "async-channel",
- "async-lock",
+ "async-lock 2.8.0",
  "async-task",
  "fastrand 2.0.1",
  "futures-io",
@@ -2312,6 +2333,27 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
+[[package]]
+name = "event-listener"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+dependencies = [
+ "event-listener 4.0.3",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "exr"
 version = "1.72.0"
@@ -3062,7 +3104,7 @@ dependencies = [
  "curl",
  "curl-sys",
  "encoding_rs",
- "event-listener",
+ "event-listener 2.5.3",
  "futures-lite 1.13.0",
  "http",
  "log",
@@ -3171,9 +3213,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.65"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3252,9 +3294,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libloading"
@@ -3846,9 +3888,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl"
@@ -4394,15 +4436,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4495,9 +4537,9 @@ checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
 
 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
@@ -4515,9 +4557,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4815,6 +4857,7 @@ dependencies = [
  "bevy_mod_picking",
  "bevy_mod_raycast",
  "bevy_rapier3d",
+ "bevy_tweening",
  "bevy_web_asset",
  "bitflags 2.4.0",
  "bytemuck",
@@ -4951,18 +4994,18 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
@@ -4989,9 +5032,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5342,9 +5385,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5352,9 +5395,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
@@ -5367,9 +5410,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5379,9 +5422,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5389,9 +5432,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5402,9 +5445,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-streams"
@@ -5432,9 +5475,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.65"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/studio/Cargo.toml b/studio/Cargo.toml
index 4f6b018..2a958e0 100644
--- a/studio/Cargo.toml
+++ b/studio/Cargo.toml
@@ -49,6 +49,7 @@ bytemuck = "1.14.1"
 space_editor = {git = "https://github.com/rewin123/space_editor", rev = "ce83f86dc902787ab16213f3209276a784654df6"}
 anyhow.workspace = true
 serde_repr = "0.1.18"
+bevy_tweening = "0.9"
 
 [dependencies.reqwest]
 version = "0.11.24"
diff --git a/studio/src/anim/timeline_animation.rs b/studio/src/anim/timeline_animation.rs
index 4de1262..98a697c 100644
--- a/studio/src/anim/timeline_animation.rs
+++ b/studio/src/anim/timeline_animation.rs
@@ -1,11 +1,20 @@
+use std::time::Duration;
+
 use bevy::{
     ecs::{
         entity::{EntityMapper, MapEntities},
         reflect::ReflectMapEntities,
     },
     prelude::*,
+    utils::HashSet,
 };
 
+use bevy_tweening::{
+    lens::{TransformPositionLens, TransformRotationLens, TransformScaleLens},
+    Animator, AnimatorState, EaseFunction, EaseMethod, Sequence, Targetable, Tracks, Tween,
+    TweenCompleted, TweeningPlugin,
+};
+use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use space_editor::space_prefab::editor_registry::EditorRegistryExt;
 
@@ -31,11 +40,21 @@ impl Plugin for TimelinePlugin {
         app.insert_resource(GlobalSeekTime {
             time: 0.,
             playing: false,
-        });
+            delta: None,
+        })
+        .add_event::<TweenCompleted>();
 
         app.add_systems(PreUpdate, (process_timeline_events, update_tick).chain());
 
-        app.add_systems(Update, process_keyframe_events);
+        app.add_systems(
+            Update,
+            (
+                process_keyframe_events,
+                timeline_bound_component_animator_system::<Transform>,
+            ),
+        );
+
+        app.add_systems(PostUpdate, generate_transform_animation);
 
         #[cfg(feature = "wasm")]
         {
@@ -76,6 +95,7 @@ pub enum KeyframeInteractionEvent {
 pub struct GlobalSeekTime {
     pub time: f32,
     pub playing: bool,
+    pub delta: Option<f32>,
 }
 
 #[derive(Clone, Debug, Copy, Default, Reflect, PartialEq, Serialize, Deserialize)]
@@ -180,15 +200,23 @@ fn process_timeline_events(
     for event in e_timeline_event.read() {
         match event {
             TimelineInteractionEvent::Play => r_global_seek_time.playing = true,
-            TimelineInteractionEvent::Pause => r_global_seek_time.playing = false,
-            TimelineInteractionEvent::Seek(time) => r_global_seek_time.time = *time,
+            TimelineInteractionEvent::Pause => {
+                r_global_seek_time.playing = false;
+            }
+            TimelineInteractionEvent::Seek(time) => {
+                r_global_seek_time.time = *time;
+            }
         }
+        
+        r_global_seek_time.delta = None;
     }
 }
 
 fn update_tick(mut r_global_seek_time: ResMut<GlobalSeekTime>, time: Res<Time>) {
     if r_global_seek_time.playing {
-        r_global_seek_time.time += time.delta_seconds();
+        let delta = time.delta_seconds();
+        r_global_seek_time.time += delta;
+        r_global_seek_time.delta = Some(delta);
     }
 }
 
@@ -227,6 +255,205 @@ fn process_keyframe_events(
     }
 }
 
+fn generate_transform_animation(
+    mut commands: Commands,
+    changed: Query<&Keyframe, (With<TransformKeyframe>, Changed<Keyframe>)>,
+    keyframes: Query<(&Keyframe, &Transform, &TransformKeyframe, Entity)>,
+) {
+    let changed_targets = changed
+        .iter()
+        .map(|keyframe| keyframe.target)
+        .collect::<HashSet<_>>();
+    let keyframes = keyframes
+        .iter()
+        .filter(|(keyframe, _, _, _)| changed_targets.contains(&keyframe.target))
+        .group_by(|(keyframe, _, _, _)| keyframe.target);
+
+    for (target, keyframes) in &keyframes {
+        let keyframes = keyframes.sorted_by(|a, b| a.0.time.total_cmp(&b.0.time));
+
+        let (_, _, _, translation, rotation, scale) = keyframes.fold(
+            (
+                Option::<(f32, Vec3)>::None,
+                Option::<(f32, Quat)>::None,
+                Option::<(f32, Vec3)>::None,
+                Vec::<Tween<Transform>>::new(),
+                Vec::<Tween<Transform>>::new(),
+                Vec::<Tween<Transform>>::new(),
+            ),
+            |(
+                last_translation,
+                last_rotation,
+                last_scale,
+                mut translation_list,
+                mut rotation_list,
+                mut scale_list,
+            ),
+             (keyframe, transform, transform_keyframe, _)| {
+                
+                let time = keyframe.time;
+                let translation = transform.translation;
+                let rotation = transform.rotation;
+                let scale = transform.scale;
+
+                info!("Processing Keyframe: {time} previous: {last_rotation:?}");
+
+                if (transform_keyframe.affect_translation) {
+                    let (last_time, start) = match last_translation {
+                        Some(v) => v,
+                        None => (0., translation),
+                    };
+                    info!("Should apply translation");
+                    if (time - last_time).abs() > 0.00001 {
+                        translation_list.push(Tween::new(
+                            EaseMethod::Linear,
+                            Duration::from_secs_f32(time - last_time),
+                            TransformPositionLens {
+                                start,
+                                end: translation,
+                            },
+                        ));
+                    }
+                }
+
+                if (transform_keyframe.affect_rotation) {
+                    let (last_time, start) = match last_rotation {
+                        Some(v) => v,
+                        None => (0., rotation),
+                    };
+
+                    
+
+                info!("Should apply rotation");
+
+                    if (time - last_time).abs() > 0.00001 {
+                        rotation_list.push(Tween::new(
+                            EaseMethod::Linear,
+                            Duration::from_secs_f32(time - last_time),
+                            TransformRotationLens {
+                                start,
+                                end: rotation,
+                            },
+                        ));
+                    }
+                }
+                if (transform_keyframe.affect_scale) {
+                    let (last_time, start) = match last_scale {
+                        Some(v) => v,
+                        None => (0., scale),
+                    };
+                    info!("Should apply scale");
+                    if (time - last_time).abs() > 0.00001 {
+                        scale_list.push(Tween::new(
+                            EaseMethod::Linear,
+                            Duration::from_secs_f32(time - last_time),
+                            TransformScaleLens { start, end: scale },
+                        ));
+                    }
+                }
+
+                let next_translation = if transform_keyframe.affect_translation {
+                    Some((time, translation))
+                } else {
+                    last_translation
+                };
+                let next_rotation = if transform_keyframe.affect_rotation {
+                    Some((time, rotation))
+                } else {
+                    last_rotation
+                };
+                let next_scale = if transform_keyframe.affect_scale {
+                    Some((time, scale))
+                } else {
+                    last_scale
+                };
+
+                (
+                    next_translation,
+                    next_rotation,
+                    next_scale,
+                    translation_list,
+                    rotation_list,
+                    scale_list,
+                )
+            },
+        );
+
+        let mut tracks = Vec::with_capacity(3);
+
+        if !translation.is_empty() {
+            tracks.push(Sequence::new(translation));
+        } else {
+            info!("No translation");
+        }
+        if !rotation.is_empty() {
+            tracks.push(Sequence::new(rotation));
+        }else {
+            info!("No rotation");
+        }
+        if !scale.is_empty() {
+            tracks.push(Sequence::new(scale));
+        }else {
+            info!("No scale");
+        }
+
+        if tracks.is_empty() {
+            commands.entity(target).remove::<Animator<Transform>>();
+        } else {
+            let tracks = Tracks::new(tracks);
+
+            commands.entity(target).insert(Animator::new(tracks));
+        }
+    }
+}
+
+struct ComponentTarget<'a, T: Component>(&'a mut T);
+
+impl<'a, T: Component> ComponentTarget<'a, T> {
+    fn new(target: Mut<'a, T>) -> Self {
+        Self(target.into_inner())
+    }
+}
+
+impl<'a, T: Component> Targetable<T> for ComponentTarget<'a, T> {
+    fn target_mut(&mut self) -> &mut T {
+        self.0
+    }
+}
+
+pub fn timeline_bound_component_animator_system<T: Component>(
+    time: Res<GlobalSeekTime>,
+    mut query: Query<(Entity, &mut T, &mut Animator<T>)>,
+    events: ResMut<Events<TweenCompleted>>,
+) {
+    if time.is_changed() {
+        info!("Animating with time: {time:?}");
+        let mut events: Mut<Events<TweenCompleted>> = events.into();
+        for (entity, target, mut animator) in query.iter_mut() {
+            if animator.tweenable().duration() <= Duration::from_secs_f32(0.0001) {
+                continue;
+            }
+            let mut target = ComponentTarget::new(target);
+            if let Some(delta) = time.delta {
+                info!("Playing animation with delta {delta}");
+                animator.tweenable_mut().tick(
+                    Duration::from_secs_f32(delta),
+                    &mut target,
+                    entity,
+                    &mut events,
+                );
+            } else {
+                info!("setting tween time to {}", time.time);
+                let mut tween = animator
+                    .tweenable_mut();
+                tween.set_elapsed(Duration::from_secs_f32(time.time));
+                info!("Tween time set successfully");
+                tween.tick(Duration::ZERO, &mut target, entity, &mut events);
+            }
+        }
+    }
+}
+
 #[cfg(feature = "wasm")]
 mod wasm {
     use bevy::{prelude::*, utils::hashbrown::HashMap, window::PrimaryWindow};
diff --git a/studio/src/main-headless.rs b/studio/src/main-headless.rs
index cedd04f..a6dc1d1 100644
--- a/studio/src/main-headless.rs
+++ b/studio/src/main-headless.rs
@@ -218,7 +218,7 @@ pub(crate) fn update_camera_motion(
     // main_cam_transform.look_at(Vec3::ZERO, Vec3::Y);
 }
 
-fn zoom_camera(main_cam_transform: &mut Transform, time: &Time<()>, speed : f32) {
+fn zoom_camera(main_cam_transform: &mut Transform, time: &Time<()>, speed: f32) {
     let scaled_time = time.elapsed().as_secs_f32() * speed;
     let normalized_cos = (-scaled_time.cos() + 1.0) / 2.0;
     let start_pos = Vec3::new(0.366, 1.1, 2.5);
@@ -228,7 +228,7 @@ fn zoom_camera(main_cam_transform: &mut Transform, time: &Time<()>, speed : f32)
     main_cam_transform.rotation = Quat::from_euler(EulerRot::XYZ, 0.0, 0.0, 0.0);
 }
 
-fn pan_camera(main_cam_transform: &mut Transform, time: &Time<()>, speed : f32) {
+fn pan_camera(main_cam_transform: &mut Transform, time: &Time<()>, speed: f32) {
     let scaled_time = time.elapsed().as_secs_f32() * speed;
     let normalized_cos = (-scaled_time.cos() + 1.0) / 2.0;
     let start_pos = Vec3::new(0.676, 1.1, 0.119);
@@ -238,7 +238,7 @@ fn pan_camera(main_cam_transform: &mut Transform, time: &Time<()>, speed : f32)
     main_cam_transform.rotation = Quat::from_euler(EulerRot::XYZ, 0.0, 0.0, 0.0);
 }
 
-fn orbit_camera(main_cam_transform: &mut Mut<'_, Transform>, time: &Res<'_, Time>, speed : f32) {
+fn orbit_camera(main_cam_transform: &mut Mut<'_, Transform>, time: &Res<'_, Time>, speed: f32) {
     let scaled_time = time.elapsed().as_secs_f32() * speed;
     let max_angle = std::f32::consts::PI / 2.0;
     let normalized_cos = (scaled_time.cos() + 1.0) / 2.0;
diff --git a/studio/src/screenshot.rs b/studio/src/screenshot.rs
index 9569a89..043f0dd 100644
--- a/studio/src/screenshot.rs
+++ b/studio/src/screenshot.rs
@@ -144,9 +144,11 @@ fn update_screen_capture_on_extract_step(
 fn extract_screen_capture_components(
     mut commands: Commands,
     screen_capure_comps: Extract<Query<(Entity, &ScreenCapture), With<Camera>>>,
-    scene_state : Extract<Res<State<SceneState>>>
+    scene_state: Extract<Res<State<SceneState>>>,
 ) {
-    if scene_state.get() != &SceneState::Active { return };
+    if scene_state.get() != &SceneState::Active {
+        return;
+    };
     for (entity, screen_capture) in screen_capure_comps.iter() {
         if screen_capture.should_capture() {
             info!(
@@ -252,25 +254,24 @@ impl ViewNode for ScreenCaptureNode {
 //==============================================================================
 
 fn save_buffer_to_file(
-    mut frames_to_skip : Local<Option<u32>>,
+    mut frames_to_skip: Local<Option<u32>>,
     buffers: Query<(&ScreenCapture, &ScreenCaptureBuffers)>,
     device: Res<RenderDevice>,
 ) {
     for (screen_capture, buffers) in buffers.iter() {
-        
         // ALERT!! ALERT!! Filthy Hack in effect
         // Engine does not load scene in time for the first 3 frames
         // So we skip them. Oops :(
         // TODO: Fix the Race Condition and properly take screenshots.
         let frames_skipped = frames_to_skip.unwrap_or(3);
-        
+
         if frames_skipped > 0 {
             println!("Skipping Frame");
             *frames_to_skip = Some(frames_skipped - 1);
             return;
         }
         // Filthy Hack Ends
-        
+
         if buffers.main_bytes_per_row != buffers.main_padded_bytes_per_row {
             println!("These don't match!");
         }