diff --git a/.gitignore b/.gitignore
index b555a1d6..2dd44e15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ target
 /bevy-strolle/assets/demo
 /bevy-strolle/examples/bench-*
 /bevy-strolle/examples/scene*
+
diff --git a/Cargo.lock b/Cargo.lock
index cff64f5f..a6b8ad22 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.23"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225"
+checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -20,77 +20,71 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.12.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8410747ed85a17c4a1e9ed3f5a74d3e7bdcc876cf9a18ff40ae21d645997b2"
+checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448"
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.16.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6"
+checksum = "3bdfa1638ddd6eb9c752def95568df8b3ad832df252e9156d2eb783b201ca8a9"
 dependencies = [
  "accesskit",
+ "immutable-chunkmap",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.10.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
+checksum = "c236a84ff1111defc280cee755eaa953d0b24398786851b9d28322c6d3bb1ebd"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
  "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "once_cell",
 ]
 
 [[package]]
 name = "accesskit_windows"
-version = "0.15.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b"
+checksum = "5d7f43d24b16b3e76bef248124fbfd2493c3a9860edb5aae1010c890e826de5e"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "once_cell",
  "paste",
  "static_assertions",
- "windows 0.48.0",
+ "windows 0.54.0",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.15.0"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738"
+checksum = "755535e6bf711a42dac28b888b884b10fc00ff4010d9d3bd871c5f5beae5aa78"
 dependencies = [
  "accesskit",
  "accesskit_macos",
  "accesskit_windows",
+ "raw-window-handle",
  "winit",
 ]
 
 [[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom",
  "once_cell",
@@ -99,9 +93,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -112,29 +106,29 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alsa"
-version = "0.7.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47"
+checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
 dependencies = [
  "alsa-sys",
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
+ "cfg-if",
  "libc",
- "nix 0.24.3",
 ]
 
 [[package]]
@@ -149,20 +143,23 @@ dependencies = [
 
 [[package]]
 name = "android-activity"
-version = "0.4.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
+checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
  "android-properties",
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "cc",
+ "cesu8",
+ "jni",
  "jni-sys",
  "libc",
  "log",
- "ndk",
+ "ndk 0.9.0",
  "ndk-context",
- "ndk-sys",
- "num_enum 0.6.1",
+ "ndk-sys 0.6.0+11769913",
+ "num_enum",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -201,36 +198,50 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d67af77d68a931ecd5cbd8a3b5987d63a1d1d1278f7f6a60ae33db485cdebb69"
 
+[[package]]
+name = "arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arboard"
-version = "3.3.1"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1faa3c733d9a3dd6fbaf85da5d162a2e03b2e0033a90dceb0e2a90fdd1e5380a"
+checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
 dependencies = [
  "clipboard-win",
- "core-graphics 0.23.1",
- "image",
+ "core-graphics",
+ "image 0.25.5",
  "log",
- "objc",
- "objc-foundation",
- "objc_id",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "parking_lot",
- "thiserror",
  "windows-sys 0.48.0",
  "x11rb",
 ]
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "as-raw-xcb-connection"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
 
 [[package]]
 name = "ash"
@@ -253,23 +264,11 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener 2.5.3",
- "futures-core",
-]
-
-[[package]]
-name = "async-channel"
-version = "2.1.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
 dependencies = [
  "concurrent-queue",
- "event-listener 4.0.1",
  "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
@@ -277,55 +276,44 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.8.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
 dependencies = [
- "async-lock 3.2.0",
  "async-task",
  "concurrent-queue",
- "fastrand 2.0.1",
- "futures-lite 2.1.0",
+ "fastrand",
+ "futures-lite",
  "slab",
 ]
 
 [[package]]
 name = "async-fs"
-version = "1.6.0"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
 dependencies = [
- "async-lock 2.8.0",
- "autocfg",
+ "async-lock",
  "blocking",
- "futures-lite 1.13.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener 2.5.3",
+ "futures-lite",
 ]
 
 [[package]]
 name = "async-lock"
-version = "3.2.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 4.0.1",
+ "event-listener 5.3.1",
  "event-listener-strategy",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.6.0"
+version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "atomic-waker"
@@ -335,42 +323,26 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "backtrace"
-version = "0.3.69"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "base64"
-version = "0.13.1"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bevy"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4bc7e09282a82a48d70ade0c4c1154b0fd7882a735a39c66766a5d0f4718ea9"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_internal",
 ]
@@ -382,10 +354,10 @@ dependencies = [
  "bevy",
  "bevy_egui",
  "bevy_mod_raycast",
- "bevy_rapier3d",
  "lazy_static",
  "log",
  "smooth-bevy-cameras",
+ "spirv-std",
  "strolle",
  "wgpu",
  "zip",
@@ -393,64 +365,72 @@ dependencies = [
 
 [[package]]
 name = "bevy_a11y"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68080288c932634f6563d3a8299efe0ddc9ea6787539c4c771ba250d089a94f0"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "accesskit",
  "bevy_app",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
 ]
 
 [[package]]
 name = "bevy_animation"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aa37683b1281e1ba8cf285644e6e3f0704f14b3901c5ee282067ff7ff6f4a56"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
  "bevy_hierarchy",
+ "bevy_log",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
+ "blake3",
+ "fixedbitset 0.5.7",
+ "petgraph",
+ "ron",
+ "serde",
+ "thiserror 1.0.69",
+ "thread_local",
+ "uuid",
 ]
 
 [[package]]
 name = "bevy_app"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41731817993f92e4363dd3335558e779e290bc71eefc0b5547052b85810907e"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
+ "console_error_panic_hook",
  "downcast-rs",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "bevy_asset"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "935984568f75867dd7357133b06f4b1502cd2be55e4642d483ce597e46e63bff"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "async-broadcast",
  "async-fs",
- "async-lock 2.8.0",
+ "async-lock",
  "bevy_app",
  "bevy_asset_macros",
  "bevy_ecs",
- "bevy_log",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
@@ -459,12 +439,13 @@ dependencies = [
  "crossbeam-channel",
  "downcast-rs",
  "futures-io",
- "futures-lite 1.13.0",
+ "futures-lite",
  "js-sys",
  "parking_lot",
  "ron",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
+ "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -472,204 +453,244 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f48b9bbe4ec605e4910b5cd1e1a0acbfbe0b80af5f3bcc4489a9fdd1e80058c"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_audio"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a69889e1bfa4dbac4e641536b94f91c441da55796ad9832e77836b8264688b"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
+ "bevy_hierarchy",
  "bevy_math",
  "bevy_reflect",
  "bevy_transform",
  "bevy_utils",
- "oboe",
+ "cpal",
  "rodio",
 ]
 
+[[package]]
+name = "bevy_color"
+version = "0.14.3"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
+dependencies = [
+ "bevy_math",
+ "bevy_reflect",
+ "bytemuck",
+ "encase",
+ "serde",
+ "thiserror 1.0.69",
+ "wgpu-types",
+]
+
 [[package]]
 name = "bevy_core"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3daa24502a14839509f02407bc7e48299fe84d260877de23b60662de0f4f4b6c"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
- "bevy_math",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bytemuck",
+ "uuid",
 ]
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b77c4fca6e90edbe2e72da7bc9aa7aed7dfdfded0920ae0a0c845f5e11084a"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
- "bevy_log",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
+ "nonmax",
  "radsort",
  "serde",
+ "smallvec",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_derive"
-version = "0.12.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500"
+checksum = "3fbfc33a4c6b80760bb8bf850a2cc65a1e031da62fd3ca8b552189104dc98514"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "bevy_derive"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
+dependencies = [
+ "bevy_macro_utils 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa38ca5967d335cc1006a0e0f1a86c350e2f15fd1878449f61d04cd57a7c4060"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_core",
  "bevy_ecs",
- "bevy_log",
+ "bevy_tasks",
  "bevy_time",
  "bevy_utils",
+ "const-fnv1a-hash",
  "sysinfo",
 ]
 
 [[package]]
 name = "bevy_ecs"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709fbd22f81fb681534cd913c41e1cd18b17143368743281195d7f024b61aea"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "async-channel 1.9.0",
+ "arrayvec",
  "bevy_ecs_macros",
  "bevy_ptr",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "downcast-rs",
- "event-listener 2.5.3",
- "fixedbitset",
- "rustc-hash",
+ "bitflags 2.6.0",
+ "concurrent-queue",
+ "fixedbitset 0.5.7",
+ "nonmax",
+ "petgraph",
  "serde",
- "thiserror",
- "thread_local",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8843aa489f159f25cdcd9fee75cd7d221a7098a71eaa72cb2d6b40ac4e3f1ba"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_egui"
-version = "0.24.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c90c01202dbcebc03315a01ea71553b35e1f20b0da6b1cc8c2605344032a3d96"
+checksum = "128438a8163e49528207aabf20d3ff0890fd6be0f0054626915995efac87922b"
 dependencies = [
  "arboard",
  "bevy",
+ "bytemuck",
+ "console_log",
+ "crossbeam-channel",
  "egui",
+ "js-sys",
+ "log",
  "thread_local",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
  "webbrowser",
+ "wgpu-types",
+ "winit",
 ]
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5328a3715e933ebbff07d0e99528dc423c4f7a53590ed1ac19a120348b028990"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b81ca2ebf66cbc7f998f1f142b15038ffe3c4ae1d51f70adda26dcf51b0c4ca"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
- "bevy_log",
  "bevy_time",
  "bevy_utils",
  "gilrs",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db232274ddca2ae452eb2731b98267b795d133ddd14013121bc7daddde1c7491"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
- "bevy_core",
+ "bevy_color",
  "bevy_core_pipeline",
  "bevy_ecs",
+ "bevy_gizmos_macros",
  "bevy_math",
  "bevy_pbr",
  "bevy_reflect",
  "bevy_render",
  "bevy_sprite",
+ "bevy_time",
  "bevy_transform",
  "bevy_utils",
+ "bytemuck",
+]
+
+[[package]]
+name = "bevy_gizmos_macros"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
+dependencies = [
+ "bevy_macro_utils 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85adc6b1fc86687bf67149e0bafaa4d6da432232fa956472d1b37f19121d3ace"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
  "bevy_animation",
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core",
  "bevy_core_pipeline",
  "bevy_ecs",
  "bevy_hierarchy",
- "bevy_log",
  "bevy_math",
  "bevy_pbr",
  "bevy_reflect",
@@ -682,19 +703,18 @@ dependencies = [
  "percent-encoding",
  "serde",
  "serde_json",
- "thiserror",
+ "smallvec",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06bd477152ce2ae1430f5e0a4f19216e5785c22fee1ab23788b5982dc59d1a55"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_core",
  "bevy_ecs",
- "bevy_log",
  "bevy_reflect",
  "bevy_utils",
  "smallvec",
@@ -702,32 +722,32 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab9a599189b2a694c182d60cd52219dd9364f9892ff542d87799b8e45d9e6dc"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
- "thiserror",
+ "smol_str",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_internal"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f124bece9831afd80897815231072d51bfe3ac58c6bb58eca8880963b6d0487c"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
  "bevy_app",
  "bevy_asset",
  "bevy_audio",
+ "bevy_color",
  "bevy_core",
  "bevy_core_pipeline",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_diagnostic",
  "bevy_ecs",
  "bevy_gilrs",
@@ -743,6 +763,7 @@ dependencies = [
  "bevy_render",
  "bevy_scene",
  "bevy_sprite",
+ "bevy_state",
  "bevy_tasks",
  "bevy_text",
  "bevy_time",
@@ -755,61 +776,72 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc10ba1d225a8477b9e80a1bf797d8a8b8274e83c9b24fb4d9351aec9229755"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "android_log-sys",
  "bevy_app",
  "bevy_ecs",
  "bevy_utils",
- "console_error_panic_hook",
- "tracing-log 0.1.4",
+ "tracing-log",
  "tracing-subscriber",
  "tracing-wasm",
 ]
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.12.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e566640c6b6dced73d2006c764c2cffebe1a82be4809486c4a5d7b4b50efed4d"
+checksum = "bfc65e570012e64a21f3546df68591aaede8349e6174fb500071677f54f06630"
 dependencies = [
  "proc-macro2",
  "quote",
- "rustc-hash",
- "syn 2.0.43",
- "toml_edit 0.20.7",
+ "syn 2.0.90",
+ "toml_edit",
+]
+
+[[package]]
+name = "bevy_macro_utils"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "toml_edit",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ddc2b76783939c530178f88e5711a1b01044d7b02db4033e2eb8b43b6cf4ec"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "glam",
+ "bevy_reflect",
+ "glam 0.27.0",
+ "rand",
  "serde",
+ "smallvec",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec4962977a746d870170532fc92759e04d3dbcae8b7b82e7ca3bb83b1d75277"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "glam",
+ "glam 0.27.0",
 ]
 
 [[package]]
 name = "bevy_mod_raycast"
-version = "0.16.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b127622dcbfd9e6a1661219af65965625901c2549b434f0c44c4460dd055dce"
+checksum = "d9e4ff45885c4716771a9f55977d8ce69596502a5241da55bf608d7cd71a9cb3"
 dependencies = [
  "bevy_app",
  "bevy_asset",
- "bevy_derive",
+ "bevy_color",
+ "bevy_derive 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bevy_ecs",
  "bevy_gizmos",
  "bevy_math",
@@ -824,14 +856,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_pbr"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520bfd2a898c74f84ea52cfb8eb061f37373ad15e623489d5f75d27ebd6138fe"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core_pipeline",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
@@ -839,81 +871,66 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "bytemuck",
- "fixedbitset",
- "naga_oil",
+ "fixedbitset 0.5.7",
+ "nonmax",
  "radsort",
  "smallvec",
- "thread_local",
+ "static_assertions",
 ]
 
 [[package]]
 name = "bevy_ptr"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ec20c8fafcdc196508ef5ccb4f0400a8d193cb61f7b14a36ed9a25ad423cf"
-
-[[package]]
-name = "bevy_rapier3d"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f0a2641af76c9eb17da0dcb0fb20cd9d615b93b67be0b85f1867487e956b5a"
-dependencies = [
- "bevy",
- "bitflags 2.4.1",
- "log",
- "nalgebra",
- "rapier3d",
-]
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7921f15fc944c9c8ad01d7dbcea6505b8909c6655cd9382bab1407181556038"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "bevy_math",
  "bevy_ptr",
  "bevy_reflect_derive",
  "bevy_utils",
  "downcast-rs",
  "erased-serde",
- "glam",
+ "glam 0.27.0",
+ "petgraph",
  "serde",
  "smallvec",
  "smol_str",
- "thiserror",
+ "thiserror 1.0.69",
+ "uuid",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a8c5475f216e751ef4452a1306b00711f33d2d04d9f149e4c845dfeb6753a0"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdefdd3737125b0d94a6ff20bb70fa8cfe9d7d5dcd72ba4dfe6c5f1d30d9f6e4"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
+ "bevy_diagnostic",
  "bevy_ecs",
  "bevy_encase_derive",
  "bevy_hierarchy",
- "bevy_log",
  "bevy_math",
  "bevy_mikktspace",
  "bevy_reflect",
@@ -923,23 +940,24 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "bytemuck",
  "codespan-reporting",
  "downcast-rs",
  "encase",
- "futures-lite 1.13.0",
+ "futures-lite",
  "hexasphere",
- "image",
+ "image 0.25.5",
  "js-sys",
  "ktx2",
  "naga",
  "naga_oil",
+ "nonmax",
  "ruzstd",
+ "send_wrapper",
  "serde",
  "smallvec",
- "thiserror",
- "thread_local",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "web-sys",
  "wgpu",
@@ -947,86 +965,104 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d86bfc5a1e7fbeeaec0c4ceab18155530f5506624670965db3415f75826bea"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_scene"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7df078b5e406e37c8a1c6ba0d652bf105fde713ce3c3efda7263fe27467eee5"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "ron",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_sprite"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7cc0c9d946e17e3e0aaa202f182837bc796c4f862b2e5a805134f873f21cf7f"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core_pipeline",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
- "bevy_log",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "bytemuck",
- "fixedbitset",
+ "fixedbitset 0.5.7",
  "guillotiere",
  "radsort",
  "rectangle-pack",
- "thiserror",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "bevy_state"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_reflect",
+ "bevy_state_macros",
+ "bevy_utils",
+]
+
+[[package]]
+name = "bevy_state_macros"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
+dependencies = [
+ "bevy_macro_utils 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_tasks"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fefa7fe0da8923525f7500e274f1bd60dbd79918a25cf7d0dfa0a6ba15c1cf"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "async-channel 1.9.0",
+ "async-channel",
  "async-executor",
- "async-task",
  "concurrent-queue",
- "futures-lite 1.13.0",
+ "futures-lite",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9a79d49ca06170d69149949b134c14e8b99ace1444c1ca2cd4743b19d5b055"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "ab_glyph",
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
@@ -1037,52 +1073,49 @@ dependencies = [
  "bevy_window",
  "glyph_brush_layout",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_time"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6250d76eed3077128b6a3d004f9f198b01107800b9824051e32bb658054e837"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_reflect",
  "bevy_utils",
  "crossbeam-channel",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_transform"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d541e0c292edbd96afae816ee680e02247422423ccd5dc635c1e211a20ed64be"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_math",
  "bevy_reflect",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_ui"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d785e3b75dabcb2a8ad0d50933f8f3446d59e512cabc2d2a145e28c2bb8792ba"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
  "bevy_asset",
+ "bevy_color",
  "bevy_core_pipeline",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_input",
- "bevy_log",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
@@ -1092,75 +1125,71 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "bytemuck",
- "serde",
+ "nonmax",
  "smallvec",
  "taffy",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "bevy_utils"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7915222f4a08ccc782e08d10b751b42e5f9d786e697d0cb3fd09333cb7e8b6ea"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.11",
  "bevy_utils_proc_macros",
  "getrandom",
- "hashbrown 0.14.3",
- "instant",
- "nonmax",
- "petgraph",
- "thiserror",
+ "hashbrown 0.14.5",
+ "thread_local",
  "tracing",
- "uuid",
+ "web-time",
 ]
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aafecc952b6b8eb1a93c12590bd867d25df2f4ae1033a01dfdfc3c35ebccfff"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ee72bf7f974000e9b31bb971a89387f1432ba9413f35c4fef59fef49767260"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
  "bevy_ecs",
- "bevy_input",
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
  "raw-window-handle",
+ "smol_str",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eb71f287eca9006dda998784c7b931e400ae2cc4c505da315882a8b082f21ad"
+version = "0.14.2"
+source = "git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle#93094000b02d166bfe82dec2d4999bf6ca45ea1f"
 dependencies = [
  "accesskit_winit",
  "approx",
  "bevy_a11y",
  "bevy_app",
- "bevy_derive",
+ "bevy_derive 0.14.2 (git+https://github.com/glasspangolin/bevy?branch=v0.14.2-strolle)",
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_input",
+ "bevy_log",
  "bevy_math",
+ "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
  "bevy_window",
+ "cfg-if",
  "crossbeam-channel",
  "raw-window-handle",
  "wasm-bindgen",
@@ -1170,22 +1199,20 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.69.1"
+version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1211,18 +1238,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "blake3"
-version = "1.5.0"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -1237,65 +1264,52 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
-[[package]]
-name = "block-sys"
-version = "0.1.0-beta.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
-dependencies = [
- "objc-sys",
-]
-
 [[package]]
 name = "block2"
-version = "0.2.0-alpha.6"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
- "block-sys",
- "objc2-encode",
+ "objc2",
 ]
 
 [[package]]
 name = "blocking"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
 dependencies = [
- "async-channel 2.1.1",
- "async-lock 3.2.0",
+ "async-channel",
  "async-task",
- "fastrand 2.0.1",
  "futures-io",
- "futures-lite 2.1.0",
+ "futures-lite",
  "piper",
- "tracing",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.5.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1304,20 +1318,53 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+
+[[package]]
+name = "calloop"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
+dependencies = [
+ "bitflags 2.6.0",
+ "log",
+ "polling",
+ "rustix",
+ "slab",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "calloop-wayland-source"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
+dependencies = [
+ "calloop",
+ "rustix",
+ "wayland-backend",
+ "wayland-client",
+]
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -1347,22 +1394,28 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "clang-sys"
-version = "1.6.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.6",
 ]
 
 [[package]]
 name = "clipboard-win"
-version = "5.1.0"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec832972fefb8cf9313b45a0d1945e29c9c251f1d4c6eafc5fe2124c02d2e81"
+checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
 dependencies = [
  "error-code",
 ]
@@ -1384,16 +1437,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
-name = "com-rs"
-version = "0.2.1"
+name = "com"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
+dependencies = [
+ "com_macros",
+]
+
+[[package]]
+name = "com_macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
+dependencies = [
+ "com_macros_support",
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "com_macros_support"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
 
 [[package]]
 name = "combine"
-version = "4.6.6"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
  "memchr",
@@ -1401,9 +1479,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1418,11 +1496,27 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "console_log"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f"
+dependencies = [
+ "log",
+ "web-sys",
+]
+
+[[package]]
+name = "const-fnv1a-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
+
 [[package]]
 name = "const_panic"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
+checksum = "013b6c2c3a14d678f38cd23994b02da3a1a1b6a5d1eedddfe63a5a5f11b13a81"
 
 [[package]]
 name = "const_soft_float"
@@ -1432,15 +1526,15 @@ checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "constgebra"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420"
+checksum = "e1aaf9b65849a68662ac6c0810c8893a765c960b907dd7cfab9c4a50bf764fbc"
 dependencies = [
  "const_soft_float",
 ]
@@ -1462,34 +1556,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "core-graphics"
-version = "0.22.3"
+name = "core-foundation"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
 dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.3.2",
+ "core-foundation-sys",
  "libc",
 ]
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
 [[package]]
 name = "core-graphics"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics-types",
- "foreign-types 0.5.0",
+ "foreign-types",
  "libc",
 ]
 
@@ -1500,7 +1591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
@@ -1517,120 +1608,74 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028"
+checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b"
 dependencies = [
  "bindgen",
 ]
 
 [[package]]
 name = "cpal"
-version = "0.15.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c"
+checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
 dependencies = [
  "alsa",
  "core-foundation-sys",
  "coreaudio-rs",
  "dasp_sample",
- "jni 0.19.0",
+ "jni",
  "js-sys",
  "libc",
  "mach2",
- "ndk",
+ "ndk 0.8.0",
  "ndk-context",
  "oboe",
- "once_cell",
- "parking_lot",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows 0.46.0",
+ "windows 0.54.0",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam"
-version = "0.8.3"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.4"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
-dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
-name = "crossbeam-queue"
-version = "0.3.10"
+name = "crossbeam-utils"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
-name = "crossbeam-utils"
-version = "0.8.18"
+name = "cursor-icon"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
-dependencies = [
- "cfg-if",
-]
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
 
 [[package]]
 name = "d3d12"
-version = "0.7.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
+checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813"
 dependencies = [
- "bitflags 2.4.1",
- "libloading 0.8.1",
+ "bitflags 2.6.0",
+ "libloading 0.8.6",
  "winapi",
 ]
 
@@ -1642,9 +1687,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
 [[package]]
 name = "data-encoding"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "derivative"
@@ -1657,17 +1702,28 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 1.0.109",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1676,37 +1732,74 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "dlib"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+dependencies = [
+ "libloading 0.8.6",
+]
+
+[[package]]
+name = "document-features"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
+dependencies = [
+ "litrs",
+]
+
 [[package]]
 name = "downcast-rs"
-version = "1.2.0"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "dpi"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
 
 [[package]]
 name = "ecolor"
-version = "0.24.1"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7637fc2e74d17e52931bac90ff4fc061ac776ada9c7fa272f24cdca5991972"
+checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8"
 dependencies = [
  "bytemuck",
+ "emath",
 ]
 
 [[package]]
 name = "egui"
-version = "0.24.1"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55bcb864b764eb889515a38b8924757657a250738ad15126637ee2df291ee6b"
+checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.11",
+ "emath",
  "epaint",
  "nohash-hasher",
 ]
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "elsa"
@@ -1714,59 +1807,59 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap",
  "stable_deref_trait",
 ]
 
 [[package]]
 name = "emath"
-version = "0.24.1"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a045c6c0b44b35e98513fc1e9d183ab42881ac27caccb9fa345465601f56cce4"
+checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
 name = "encase"
-version = "0.6.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c"
+checksum = "5a9299a95fa5671ddf29ecc22b00e121843a65cb9ff24911e394b4ae556baf36"
 dependencies = [
  "const_panic",
  "encase_derive",
- "glam",
- "thiserror",
+ "glam 0.27.0",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "encase_derive"
-version = "0.6.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e"
+checksum = "07e09decb3beb1fe2db6940f598957b2e1f7df6206a804d438ff6cb2a9cddc10"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.6.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c"
+checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "epaint"
-version = "0.24.1"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d1b9e000d21bab9b535ce78f9f7745be28b3f777f6c7223936561c5c7fefab8"
+checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01"
 dependencies = [
  "ab_glyph",
- "ahash 0.8.6",
+ "ahash 0.8.11",
  "bytemuck",
  "ecolor",
  "emath",
@@ -1782,34 +1875,35 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erased-serde"
-version = "0.3.31"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
 dependencies = [
  "serde",
+ "typeid",
 ]
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "error-code"
-version = "3.0.0"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
+checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
 
 [[package]]
 name = "euclid"
-version = "0.22.9"
+version = "0.22.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
+checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
 dependencies = [
  "num-traits",
 ]
@@ -1822,9 +1916,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "4.0.1"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1833,34 +1927,25 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.4.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
 dependencies = [
- "event-listener 4.0.1",
+ "event-listener 5.3.1",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "fdeflate"
-version = "0.3.3"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
 dependencies = [
  "simd-adler32",
 ]
@@ -1871,11 +1956,17 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1887,15 +1978,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1903,7 +1985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared 0.3.1",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -1914,15 +1996,9 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -1940,38 +2016,23 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.1.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
 dependencies = [
- "fastrand 2.0.1",
+ "fastrand",
  "futures-core",
  "futures-io",
  "parking",
@@ -1999,9 +2060,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2012,9 +2073,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs"
-version = "0.10.4"
+version = "0.10.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b2e57a9cb946b5d04ae8638c5f554abb5a9f82c4c950fd5b1fee6d119592fb"
+checksum = "a556964c6d62458084356ce9770676f5104bd667e12e9a795691076e8a17c5cf"
 dependencies = [
  "fnv",
  "gilrs-core",
@@ -2025,40 +2086,55 @@ dependencies = [
 
 [[package]]
 name = "gilrs-core"
-version = "0.5.10"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0af1827b7dd2f36d740ae804c1b3ea0d64c12533fb61ff91883005143a0e8c5a"
+checksum = "732dadc05170599ddec9a89653f10d7a2af54da9181b3fa6e2bd49907ec8f7e4"
 dependencies = [
- "core-foundation",
+ "core-foundation 0.9.4",
  "inotify",
  "io-kit-sys",
  "js-sys",
  "libc",
  "libudev-sys",
  "log",
- "nix 0.27.1",
+ "nix",
  "uuid",
  "vec_map",
  "wasm-bindgen",
  "web-sys",
- "windows 0.52.0",
+ "windows 0.58.0",
 ]
 
 [[package]]
-name = "gimli"
-version = "0.28.1"
+name = "gl_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
+dependencies = [
+ "khronos_api",
+ "log",
+ "xml-rs",
+]
+
+[[package]]
+name = "glam"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+dependencies = [
+ "bytemuck",
+ "rand",
+ "serde",
+]
 
 [[package]]
 name = "glam"
-version = "0.24.2"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677"
 dependencies = [
  "bytemuck",
  "libm",
- "serde",
 ]
 
 [[package]]
@@ -2069,9 +2145,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glow"
-version = "0.12.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
+checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -2081,9 +2157,9 @@ dependencies = [
 
 [[package]]
 name = "gltf"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b78f069cf941075835822953c345b9e1edd67ae347b81ace3aea9de38c2ef33"
+checksum = "e3ce1918195723ce6ac74e80542c5a96a40c2b26162c1957a5cd70799b8cacf7"
 dependencies = [
  "byteorder",
  "gltf-json",
@@ -2093,21 +2169,21 @@ dependencies = [
 
 [[package]]
 name = "gltf-derive"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "438ffe1a5540d75403feaf23636b164e816e93f6f03131674722b3886ce32a57"
+checksum = "14070e711538afba5d6c807edb74bcb84e5dbb9211a3bf5dea0dfab5b24f4c51"
 dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "gltf-json"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655951ba557f2bc69ea4b0799446bae281fa78efae6319968bdd2c3e9a06d8e1"
+checksum = "e6176f9d60a7eab0a877e8e96548605dedbde9190a7ae1e80bbcc1c9af03ab14"
 dependencies = [
  "gltf-derive",
  "serde",
@@ -2115,11 +2191,20 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "glutin_wgl_sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
+dependencies = [
+ "gl_generator",
+]
+
 [[package]]
 name = "glyph_brush_layout"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38"
+checksum = "7b1e288bfd2f6c0313f78bf5aa538356ad481a3bb97e9b7f93220ab0066c5992"
 dependencies = [
  "ab_glyph",
  "approx",
@@ -2132,7 +2217,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "gpu-alloc-types",
 ]
 
@@ -2142,47 +2227,47 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "gpu-allocator"
-version = "0.22.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
 dependencies = [
- "backtrace",
  "log",
- "thiserror",
+ "presser",
+ "thiserror 1.0.69",
  "winapi",
- "windows 0.44.0",
+ "windows 0.52.0",
 ]
 
 [[package]]
 name = "gpu-descriptor"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
+checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "gpu-descriptor-types",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "gpu-descriptor-types"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
+checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "grid"
-version = "0.10.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c"
+checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82"
 
 [[package]]
 name = "guillotiere"
@@ -2200,49 +2285,55 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
- "ahash 0.7.7",
+ "ahash 0.7.8",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.6",
+ "ahash 0.8.11",
  "allocator-api2",
  "serde",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
 [[package]]
 name = "hassle-rs"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
 dependencies = [
- "bitflags 1.3.2",
- "com-rs",
+ "bitflags 2.6.0",
+ "com",
  "libc",
- "libloading 0.7.4",
- "thiserror",
+ "libloading 0.8.6",
+ "thiserror 1.0.69",
  "widestring",
  "winapi",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
 [[package]]
 name = "hexasphere"
-version = "9.1.0"
+version = "12.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10"
+checksum = "edd6b038160f086b0a7496edae34169ae22f328793cbe2b627a5a3d8373748ec"
 dependencies = [
  "constgebra",
- "glam",
+ "glam 0.27.0",
 ]
 
 [[package]]
@@ -2266,50 +2357,190 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "image"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
- "jpeg-decoder",
- "num-rational",
+ "num-traits",
+ "png",
+]
+
+[[package]]
+name = "image"
+version = "0.25.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
  "num-traits",
  "png",
  "tiff",
+ "zune-core",
+ "zune-jpeg",
 ]
 
 [[package]]
-name = "indexmap"
-version = "1.9.3"
+name = "immutable-chunkmap"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578"
 dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
+ "arrayvec",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -2338,18 +2569,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "internal-iterator"
 version = "0.2.3"
@@ -2358,9 +2577,9 @@ checksum = "969ee3fc68ec2e88eb21434ce4d9b7e1600d1ce92ff974560a6c4a304f5124b9"
 
 [[package]]
 name = "io-kit-sys"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4769cb30e5dcf1710fc6730d3e94f78c47723a014a567de385e113c737394640"
+checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b"
 dependencies = [
  "core-foundation-sys",
  "mach2",
@@ -2376,38 +2595,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
-
-[[package]]
-name = "jni"
-version = "0.19.0"
+name = "itertools"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
+ "either",
 ]
 
 [[package]]
-name = "jni"
-version = "0.20.0"
+name = "itoa"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jni"
@@ -2420,7 +2620,7 @@ dependencies = [
  "combine",
  "jni-sys",
  "log",
- "thiserror",
+ "thiserror 1.0.69",
  "walkdir",
  "windows-sys 0.45.0",
 ]
@@ -2433,39 +2633,46 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.27"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.66"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "khronos-egl"
-version = "4.1.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
+checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading 0.7.4",
+ "libloading 0.8.6",
  "pkg-config",
 ]
 
+[[package]]
+name = "khronos_api"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
+
 [[package]]
 name = "ktx2"
 version = "0.3.0"
@@ -2477,15 +2684,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lewton"
@@ -2500,9 +2701,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.167"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
 
 [[package]]
 name = "libloading"
@@ -2516,29 +2717,29 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.1"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-sys 0.48.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libredox"
-version = "0.0.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.7",
 ]
 
 [[package]]
@@ -2553,25 +2754,43 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "litemap"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
+[[package]]
+name = "litrs"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "longest-increasing-subsequence"
@@ -2607,31 +2826,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "matrixmultiply"
-version = "0.3.8"
+name = "memchr"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
-dependencies = [
- "autocfg",
- "rawpointer",
-]
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
-name = "memchr"
-version = "2.6.4"
+name = "memmap2"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "metal"
-version = "0.26.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
+checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "block",
  "core-graphics-types",
- "foreign-types 0.5.0",
+ "foreign-types",
  "log",
  "objc",
  "paste",
@@ -2645,36 +2863,26 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
+ "adler2",
  "simd-adler32",
 ]
 
-[[package]]
-name = "mio"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "naga"
-version = "0.13.0"
-source = "git+https://github.com/Patryk27/naga?branch=v0.13.0-strolle#5e407241607075930534c970866b6e0a1d3fdb8e"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231"
 dependencies = [
+ "arrayvec",
  "bit-set",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "codespan-reporting",
  "hexf-parse",
- "indexmap 1.9.3",
+ "indexmap",
  "log",
  "num-traits",
  "petgraph",
@@ -2682,70 +2890,57 @@ dependencies = [
  "rustc-hash",
  "spirv",
  "termcolor",
- "thiserror",
+ "thiserror 1.0.69",
  "unicode-xid",
 ]
 
 [[package]]
 name = "naga_oil"
-version = "0.10.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac54c77b3529887f9668d3dd81e955e58f252b31a333f836e3548c06460b958"
+checksum = "275d9720a7338eedac966141089232514c84d76a246a58ef501af88c5edf402f"
 dependencies = [
  "bit-set",
  "codespan-reporting",
  "data-encoding",
- "indexmap 1.9.3",
+ "indexmap",
  "naga",
  "once_cell",
  "regex",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.5",
  "rustc-hash",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "unicode-ident",
 ]
 
 [[package]]
-name = "nalgebra"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
-dependencies = [
- "approx",
- "glam",
- "matrixmultiply",
- "nalgebra-macros",
- "num-complex",
- "num-rational",
- "num-traits",
- "simba",
- "typenum",
-]
-
-[[package]]
-name = "nalgebra-macros"
-version = "0.2.1"
+name = "ndk"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
+checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "bitflags 2.6.0",
+ "jni-sys",
+ "log",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "num_enum",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "ndk"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "jni-sys",
- "ndk-sys",
- "num_enum 0.5.11",
+ "log",
+ "ndk-sys 0.6.0+11769913",
+ "num_enum",
  "raw-window-handle",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2756,32 +2951,31 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
 [[package]]
 name = "ndk-sys"
-version = "0.4.1+23.1.7779620"
+version = "0.5.0+25.2.9519653"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
+checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
 dependencies = [
  "jni-sys",
 ]
 
 [[package]]
-name = "nix"
-version = "0.24.3"
+name = "ndk-sys"
+version = "0.6.0+11769913"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
 dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
+ "jni-sys",
 ]
 
 [[package]]
 name = "nix"
-version = "0.27.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "cfg-if",
+ "cfg_aliases 0.2.1",
  "libc",
 ]
 
@@ -2826,181 +3020,268 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num-complex"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "num-derive"
-version = "0.3.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.90",
 ]
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
+name = "num-traits"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
- "num-traits",
+ "libm",
 ]
 
 [[package]]
-name = "num-rational"
-version = "0.4.1"
+name = "num_enum"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
 dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
+ "num_enum_derive",
 ]
 
 [[package]]
-name = "num-traits"
-version = "0.2.17"
+name = "num_enum_derive"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "autocfg",
- "libm",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
-name = "num_enum"
-version = "0.5.11"
+name = "objc"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
- "num_enum_derive 0.5.11",
+ "malloc_buf",
 ]
 
 [[package]]
-name = "num_enum"
-version = "0.6.1"
+name = "objc-sys"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
-dependencies = [
- "num_enum_derive 0.6.1",
-]
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
 
 [[package]]
-name = "num_enum_derive"
-version = "0.5.11"
+name = "objc2"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "objc-sys",
+ "objc2-encode",
 ]
 
 [[package]]
-name = "num_enum_derive"
-version = "0.6.1"
+name = "objc2-app-kit"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.43",
+ "bitflags 2.6.0",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-foundation",
+ "objc2-quartz-core",
 ]
 
 [[package]]
-name = "objc"
-version = "0.2.7"
+name = "objc2-cloud-kit"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "malloc_buf",
- "objc_exception",
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
 ]
 
 [[package]]
-name = "objc-foundation"
-version = "0.1.1"
+name = "objc2-contacts"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
- "block",
- "objc",
- "objc_id",
+ "block2",
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
-name = "objc-sys"
-version = "0.2.0-beta.2"
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
 
 [[package]]
-name = "objc2"
-version = "0.3.0-beta.3.patch-leaks.3"
+name = "objc2-core-location"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
 dependencies = [
  "block2",
- "objc-sys",
- "objc2-encode",
+ "objc2",
+ "objc2-contacts",
+ "objc2-foundation",
 ]
 
 [[package]]
 name = "objc2-encode"
-version = "2.0.0-pre.2"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
+checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
+
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "objc-sys",
+ "bitflags 2.6.0",
+ "block2",
+ "dispatch",
+ "libc",
+ "objc2",
 ]
 
 [[package]]
-name = "objc_exception"
-version = "0.1.2"
+name = "objc2-link-presentation"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
 dependencies = [
- "cc",
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
 ]
 
 [[package]]
-name = "objc_id"
-version = "0.1.1"
+name = "objc2-metal"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "objc",
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
 ]
 
 [[package]]
-name = "object"
-version = "0.32.2"
+name = "objc2-quartz-core"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "memchr",
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-symbols"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-foundation",
+ "objc2-link-presentation",
+ "objc2-quartz-core",
+ "objc2-symbols",
+ "objc2-uniform-type-identifiers",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-uniform-type-identifiers"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
 ]
 
 [[package]]
 name = "oboe"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
+checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
 dependencies = [
- "jni 0.20.0",
- "ndk",
+ "jni",
+ "ndk 0.8.0",
  "ndk-context",
  "num-derive",
  "num-traits",
@@ -3009,9 +3290,9 @@ dependencies = [
 
 [[package]]
 name = "oboe-sys"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2"
+checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
 dependencies = [
  "cc",
 ]
@@ -3027,15 +3308,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "orbclient"
-version = "0.3.47"
+version = "0.3.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
+checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43"
 dependencies = [
  "libredox",
 ]
@@ -3048,24 +3329,24 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.20.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7"
+checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4"
 dependencies = [
  "ttf-parser",
 ]
 
 [[package]]
 name = "parking"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -3073,94 +3354,89 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.7",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
-name = "parry3d"
-version = "0.13.5"
+name = "paste"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55dc0e6db79bddbc5fd583569f7356cdcc63e1e9b2b93a9ab70dd8e717160e0"
-dependencies = [
- "approx",
- "arrayvec",
- "bitflags 1.3.2",
- "downcast-rs",
- "either",
- "nalgebra",
- "num-derive",
- "num-traits",
- "rustc-hash",
- "simba",
- "slab",
- "smallvec",
- "spade",
-]
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
-name = "paste"
-version = "1.0.14"
+name = "percent-encoding"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
-name = "peeking_take_while"
-version = "0.1.2"
+name = "petgraph"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset 0.4.2",
+ "indexmap",
+ "serde",
+ "serde_derive",
+]
 
 [[package]]
-name = "percent-encoding"
-version = "2.3.1"
+name = "pin-project"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
+dependencies = [
+ "pin-project-internal",
+]
 
 [[package]]
-name = "petgraph"
-version = "0.6.4"
+name = "pin-project-internal"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
- "fixedbitset",
- "indexmap 2.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "piper"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
 dependencies = [
  "atomic-waker",
- "fastrand 2.0.1",
+ "fastrand",
  "futures-io",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "png"
-version = "0.17.10"
+version = "0.17.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
+checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -3169,6 +3445,21 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "polling"
+version = "3.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "pp-rs"
 version = "0.2.1"
@@ -3180,49 +3471,66 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "presser"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
+ "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.71"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "profiling"
-version = "1.0.13"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e"
+checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
+
+[[package]]
+name = "quick-xml"
+version = "0.36.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "radsort"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b"
+checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22"
 
 [[package]]
 name = "rand"
@@ -3260,26 +3568,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
-[[package]]
-name = "rapier3d"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62a8a0bd9d3135f7b4eb45d0796540e7bab47b6b7c974f90567ccc5a0454f42b"
-dependencies = [
- "approx",
- "arrayvec",
- "bit-vec",
- "bitflags 1.3.2",
- "crossbeam",
- "downcast-rs",
- "nalgebra",
- "num-derive",
- "num-traits",
- "parry3d",
- "rustc-hash",
- "simba",
-]
-
 [[package]]
 name = "raw-string"
 version = "0.3.5"
@@ -3288,15 +3576,9 @@ checksum = "e0501e134c6905fee1f10fed25b0a7e1261bf676cffac9543a7d0730dec01af2"
 
 [[package]]
 name = "raw-window-handle"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
-
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
 [[package]]
 name = "rectangle-pack"
@@ -3306,32 +3588,32 @@ checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb"
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -3345,13 +3627,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -3362,36 +3644,25 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "renderdoc-sys"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
-
-[[package]]
-name = "robust"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30"
+checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
 [[package]]
 name = "rodio"
-version = "0.17.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611"
+checksum = "d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3"
 dependencies = [
  "cpal",
  "lewton",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3400,28 +3671,27 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.21.5",
- "bitflags 2.4.1",
+ "base64 0.21.7",
+ "bitflags 2.6.0",
  "serde",
  "serde_derive",
 ]
 
 [[package]]
 name = "rspirv"
-version = "0.11.0+1.5.4"
+version = "0.12.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1503993b59ca9ae4127365c3293517576d7ce56be9f3d8abb1625c85ddc583ba"
+checksum = "69cf3a93856b6e5946537278df0d3075596371b1950ccff012f02b0f7eafec8d"
 dependencies = [
- "fxhash",
- "num-traits",
+ "rustc-hash",
  "spirv",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -3432,13 +3702,13 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 [[package]]
 name = "rustc_codegen_spirv"
 version = "0.9.0"
-source = "git+https://github.com/EmbarkStudios/rust-gpu#83f8c72f04a6af673b0533a0f03527b7756f883e"
+source = "git+https://github.com/Rust-GPU/rust-gpu.git?rev=1932353935338c0ac5b7b150fae0551ddeaa1dad#1932353935338c0ac5b7b150fae0551ddeaa1dad"
 dependencies = [
  "ar",
  "either",
  "hashbrown 0.11.2",
- "indexmap 1.9.3",
- "itertools",
+ "indexmap",
+ "itertools 0.10.5",
  "lazy_static",
  "libc",
  "num-traits",
@@ -3448,8 +3718,6 @@ dependencies = [
  "rustc-demangle",
  "rustc_codegen_spirv-types",
  "sanitize-filename",
- "serde",
- "serde_json",
  "smallvec",
  "spirt",
  "spirv-tools",
@@ -3459,28 +3727,29 @@ dependencies = [
 [[package]]
 name = "rustc_codegen_spirv-types"
 version = "0.9.0"
-source = "git+https://github.com/EmbarkStudios/rust-gpu#83f8c72f04a6af673b0533a0f03527b7756f883e"
+source = "git+https://github.com/Rust-GPU/rust-gpu.git?rev=1932353935338c0ac5b7b150fae0551ddeaa1dad#1932353935338c0ac5b7b150fae0551ddeaa1dad"
 dependencies = [
  "rspirv",
  "serde",
+ "serde_json",
 ]
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -3489,29 +3758,18 @@ dependencies = [
 
 [[package]]
 name = "ruzstd"
-version = "0.4.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
+checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f"
 dependencies = [
- "byteorder",
- "thiserror-core",
  "twox-hash",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
-
-[[package]]
-name = "safe_arch"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
-dependencies = [
- "bytemuck",
-]
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -3532,45 +3790,71 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "sctk-adwaita"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"
+dependencies = [
+ "ab_glyph",
+ "log",
+ "memmap2",
+ "smithay-client-toolkit",
+ "tiny-skia",
+]
+
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -3586,22 +3870,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
-
-[[package]]
-name = "simba"
-version = "0.8.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
-dependencies = [
- "approx",
- "num-complex",
- "num-traits",
- "paste",
- "wide",
-]
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "simd-adler32"
@@ -3629,57 +3900,70 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 dependencies = [
  "serde",
 ]
 
 [[package]]
-name = "smol_str"
-version = "0.2.0"
+name = "smithay-client-toolkit"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
+checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "serde",
+ "bitflags 2.6.0",
+ "calloop",
+ "calloop-wayland-source",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2",
+ "rustix",
+ "thiserror 1.0.69",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkeysym",
 ]
 
 [[package]]
-name = "smooth-bevy-cameras"
-version = "0.10.0"
+name = "smol_str"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab83c7205ed16b559adac38c50f4a1caf751889165d8955ab1be33e7a4ff747f"
+checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
 dependencies = [
- "approx",
- "bevy",
+ "serde",
 ]
 
 [[package]]
-name = "spade"
-version = "2.5.0"
+name = "smooth-bevy-cameras"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874799535a5ac50b123ec82e2e8015340fbebb6f71dc009ec0d4a6601fde16a4"
+checksum = "822db04623867d82261bd51b2d8fdd91f3ce062ba89f8c7c11255e844d6fc00f"
 dependencies = [
- "hashbrown 0.14.3",
- "num-traits",
- "robust",
- "smallvec",
+ "approx",
+ "bevy",
 ]
 
 [[package]]
 name = "spirt"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e1f7903720ff818d6da824edf2c4082c6e7a029a99317fd10c39dd7c40c7ff"
+checksum = "f2d5968bd2a36466468aac637b355776f080edfb0c6f769b2b99b9708260c42a"
 dependencies = [
  "arrayvec",
  "bytemuck",
  "derive_more",
  "elsa",
- "indexmap 1.9.3",
+ "indexmap",
  "internal-iterator",
- "itertools",
+ "itertools 0.10.5",
  "lazy_static",
  "longest-increasing-subsequence",
  "rustc-hash",
@@ -3690,18 +3974,17 @@ dependencies = [
 
 [[package]]
 name = "spirv"
-version = "0.2.0+1.5.4"
+version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 1.3.2",
- "num-traits",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "spirv-builder"
 version = "0.9.0"
-source = "git+https://github.com/EmbarkStudios/rust-gpu#83f8c72f04a6af673b0533a0f03527b7756f883e"
+source = "git+https://github.com/Rust-GPU/rust-gpu.git?rev=1932353935338c0ac5b7b150fae0551ddeaa1dad#1932353935338c0ac5b7b150fae0551ddeaa1dad"
 dependencies = [
  "memchr",
  "raw-string",
@@ -3714,10 +3997,10 @@ dependencies = [
 [[package]]
 name = "spirv-std"
 version = "0.9.0"
-source = "git+https://github.com/EmbarkStudios/rust-gpu#83f8c72f04a6af673b0533a0f03527b7756f883e"
+source = "git+https://github.com/Rust-GPU/rust-gpu.git?rev=1932353935338c0ac5b7b150fae0551ddeaa1dad#1932353935338c0ac5b7b150fae0551ddeaa1dad"
 dependencies = [
  "bitflags 1.3.2",
- "glam",
+ "glam 0.29.2",
  "num-traits",
  "spirv-std-macros",
  "spirv-std-types",
@@ -3726,7 +4009,7 @@ dependencies = [
 [[package]]
 name = "spirv-std-macros"
 version = "0.9.0"
-source = "git+https://github.com/EmbarkStudios/rust-gpu#83f8c72f04a6af673b0533a0f03527b7756f883e"
+source = "git+https://github.com/Rust-GPU/rust-gpu.git?rev=1932353935338c0ac5b7b150fae0551ddeaa1dad#1932353935338c0ac5b7b150fae0551ddeaa1dad"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3737,22 +4020,22 @@ dependencies = [
 [[package]]
 name = "spirv-std-types"
 version = "0.9.0"
-source = "git+https://github.com/EmbarkStudios/rust-gpu#83f8c72f04a6af673b0533a0f03527b7756f883e"
+source = "git+https://github.com/Rust-GPU/rust-gpu.git?rev=1932353935338c0ac5b7b150fae0551ddeaa1dad#1932353935338c0ac5b7b150fae0551ddeaa1dad"
 
 [[package]]
 name = "spirv-tools"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc7c8ca2077515286505bd3ccd396e55ac5706e80322e1d6d22a82e1cad4f7c3"
+checksum = "bcb3b0832881834994b7ec82b709ec5491043ceb4bf8101e27da6b5234b24261"
 dependencies = [
  "spirv-tools-sys",
 ]
 
 [[package]]
 name = "spirv-tools-sys"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b32d9d6469cd6b50dcd6bd841204b5946b4fb7b70a97872717cdc417659c9a"
+checksum = "48e68b55a97aa6856e010a6f2477425875a97873e147bb0232160e73c45bdae7"
 dependencies = [
  "cc",
 ]
@@ -3769,6 +4052,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "strict-num"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
+
 [[package]]
 name = "strolle"
 version = "0.1.0"
@@ -3776,10 +4065,10 @@ dependencies = [
  "bytemuck",
  "derivative",
  "fxhash",
- "glam",
+ "glam 0.27.0",
  "guillotiere",
  "humantime",
- "image",
+ "image 0.24.9",
  "log",
  "rand",
  "spirv-std",
@@ -3794,7 +4083,7 @@ version = "0.1.0"
 dependencies = [
  "approx",
  "bytemuck",
- "glam",
+ "glam 0.29.2",
  "spirv-std",
 ]
 
@@ -3815,9 +4104,9 @@ dependencies = [
 
 [[package]]
 name = "svg_fmt"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
+checksum = "ce5d813d71d82c4cbc1742135004e4a79fd870214c155443451c139c9470a0aa"
 
 [[package]]
 name = "syn"
@@ -3832,95 +4121,107 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.43"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "sysinfo"
-version = "0.29.11"
+version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
  "libc",
  "ntapi",
  "once_cell",
- "winapi",
+ "windows 0.52.0",
 ]
 
 [[package]]
 name = "taffy"
-version = "0.3.18"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c2287b6d7f721ada4cddf61ade5e760b2c6207df041cac9bfaa192897362fd3"
+checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94"
 dependencies = [
  "arrayvec",
  "grid",
  "num-traits",
+ "serde",
  "slotmap",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.52"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
-name = "thiserror-core"
-version = "1.0.50"
+name = "thiserror"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999"
+checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490"
 dependencies = [
- "thiserror-core-impl",
+ "thiserror-impl 2.0.4",
 ]
 
 [[package]]
-name = "thiserror-core-impl"
-version = "1.0.50"
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.52"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
+checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3937,11 +4238,46 @@ dependencies = [
  "weezl",
 ]
 
+[[package]]
+name = "tiny-skia"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "bytemuck",
+ "cfg-if",
+ "log",
+ "tiny-skia-path",
+]
+
+[[package]]
+name = "tiny-skia-path"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
+dependencies = [
+ "arrayref",
+ "bytemuck",
+ "strict-num",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3954,37 +4290,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.1.0",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.20.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
-dependencies = [
- "indexmap 2.1.0",
+ "indexmap",
  "toml_datetime",
  "winnow",
 ]
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -3993,36 +4318,25 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
 ]
 
-[[package]]
-name = "tracing-log"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.2.0"
@@ -4036,9 +4350,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -4049,7 +4363,7 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log 0.2.0",
+ "tracing-log",
 ]
 
 [[package]]
@@ -4065,9 +4379,9 @@ dependencies = [
 
 [[package]]
 name = "ttf-parser"
-version = "0.20.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
+checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
 
 [[package]]
 name = "twox-hash"
@@ -4080,60 +4394,63 @@ dependencies = [
 ]
 
 [[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
+name = "typeid"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.22"
+name = "unicode-segmentation"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "uuid"
-version = "1.6.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
  "serde",
@@ -4153,21 +4470,15 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "waker-fn"
-version = "1.1.1"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -4177,90 +4488,199 @@ dependencies = [
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+
+[[package]]
+name = "wayland-backend"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
+dependencies = [
+ "bitflags 2.6.0",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-csd-frame"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
+dependencies = [
+ "bitflags 2.6.0",
+ "cursor-icon",
+ "wayland-backend",
+]
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.89"
+name = "wayland-cursor"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c"
 dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
+ "rustix",
+ "wayland-client",
+ "xcursor",
 ]
 
 [[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.89"
+name = "wayland-protocols"
+version = "0.32.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e"
 dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.43",
- "wasm-bindgen-shared",
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
 ]
 
 [[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.39"
+name = "wayland-protocols-plasma"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd"
 dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
 ]
 
 [[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.89"
+name = "wayland-protocols-wlr"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022"
 dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
 ]
 
 [[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+name = "wayland-scanner"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
 dependencies = [
  "proc-macro2",
+ "quick-xml",
  "quote",
- "syn 2.0.43",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.89"
+name = "wayland-sys"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
+dependencies = [
+ "dlib",
+ "log",
+ "once_cell",
+ "pkg-config",
+]
 
 [[package]]
-name = "wayland-scanner"
-version = "0.29.5"
+name = "web-sys"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
- "proc-macro2",
- "quote",
- "xml-rs",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "web-sys"
-version = "0.3.66"
+name = "web-time"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4268,17 +4688,18 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "0.8.12"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71"
+checksum = "ea9fe1ebb156110ff855242c1101df158b822487e4957b0556d9ffce9db0f535"
 dependencies = [
- "core-foundation",
+ "block2",
+ "core-foundation 0.10.0",
  "home",
- "jni 0.21.1",
+ "jni",
  "log",
  "ndk-context",
- "objc",
- "raw-window-handle",
+ "objc2",
+ "objc2-foundation",
  "url",
  "web-sys",
 ]
@@ -4291,12 +4712,14 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu"
-version = "0.17.2"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41"
+checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c"
 dependencies = [
  "arrayvec",
  "cfg-if",
+ "cfg_aliases 0.1.1",
+ "document-features",
  "js-sys",
  "log",
  "naga",
@@ -4315,22 +4738,27 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.17.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
+checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
+ "bytemuck",
+ "cfg_aliases 0.1.1",
  "codespan-reporting",
+ "document-features",
+ "indexmap",
  "log",
  "naga",
+ "once_cell",
  "parking_lot",
  "profiling",
  "raw-window-handle",
  "rustc-hash",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
  "web-sys",
  "wgpu-hal",
  "wgpu-types",
@@ -4338,19 +4766,21 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.17.2"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
+checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "block",
+ "cfg_aliases 0.1.1",
  "core-graphics-types",
  "d3d12",
  "glow",
+ "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
@@ -4358,11 +4788,13 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.1",
+ "libloading 0.8.6",
  "log",
  "metal",
  "naga",
+ "ndk-sys 0.5.0+25.2.9519653",
  "objc",
+ "once_cell",
  "parking_lot",
  "profiling",
  "range-alloc",
@@ -4370,7 +4802,7 @@ dependencies = [
  "renderdoc-sys",
  "rustc-hash",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "web-sys",
  "wgpu-types",
@@ -4379,30 +4811,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.17.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
+checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "js-sys",
  "web-sys",
 ]
 
-[[package]]
-name = "wide"
-version = "0.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242"
-dependencies = [
- "bytemuck",
- "safe_arch",
-]
-
 [[package]]
 name = "widestring"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "winapi"
@@ -4422,11 +4844,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4437,72 +4859,138 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.44.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-core 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows"
-version = "0.46.0"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
+checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-core 0.54.0",
+ "windows-implement 0.53.0",
+ "windows-interface 0.53.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows"
-version = "0.48.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
 dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-targets 0.48.5",
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
-name = "windows"
+name = "windows-core"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-core",
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+dependencies = [
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
+ "windows-result 0.2.0",
+ "windows-strings",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
+checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "windows-interface"
-version = "0.48.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
+checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4529,7 +5017,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4564,17 +5061,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -4591,9 +5089,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -4609,9 +5107,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4627,9 +5125,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4645,9 +5149,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4663,9 +5167,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4681,9 +5185,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4699,49 +5203,83 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winit"
-version = "0.28.7"
+version = "0.30.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
+checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67"
 dependencies = [
+ "ahash 0.8.11",
  "android-activity",
- "bitflags 1.3.2",
- "cfg_aliases",
- "core-foundation",
- "core-graphics 0.22.3",
- "dispatch",
- "instant",
+ "atomic-waker",
+ "bitflags 2.6.0",
+ "block2",
+ "bytemuck",
+ "calloop",
+ "cfg_aliases 0.2.1",
+ "concurrent-queue",
+ "core-foundation 0.9.4",
+ "core-graphics",
+ "cursor-icon",
+ "dpi",
+ "js-sys",
  "libc",
- "log",
- "mio",
- "ndk",
+ "memmap2",
+ "ndk 0.9.0",
  "objc2",
- "once_cell",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-ui-kit",
  "orbclient",
  "percent-encoding",
+ "pin-project",
  "raw-window-handle",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
+ "rustix",
+ "sctk-adwaita",
+ "smithay-client-toolkit",
+ "smol_str",
+ "tracing",
+ "unicode-segmentation",
  "wasm-bindgen",
- "wayland-scanner",
+ "wasm-bindgen-futures",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-plasma",
  "web-sys",
- "windows-sys 0.45.0",
+ "web-time",
+ "windows-sys 0.52.0",
  "x11-dl",
+ "x11rb",
+ "xkbcommon-dl",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.5.31"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -4755,20 +5293,30 @@ dependencies = [
 
 [[package]]
 name = "x11rb"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
+checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
 dependencies = [
+ "as-raw-xcb-connection",
  "gethostname",
+ "libc",
+ "libloading 0.8.6",
+ "once_cell",
  "rustix",
  "x11rb-protocol",
 ]
 
 [[package]]
 name = "x11rb-protocol"
-version = "0.13.0"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
+
+[[package]]
+name = "xcursor"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
+checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
 
 [[package]]
 name = "xi-unicode"
@@ -4776,40 +5324,161 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
+[[package]]
+name = "xkbcommon-dl"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
+dependencies = [
+ "bitflags 2.6.0",
+ "dlib",
+ "log",
+ "once_cell",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+
 [[package]]
 name = "xml-rs"
-version = "0.8.19"
+version = "0.8.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432"
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "synstructure",
+]
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "zip"
-version = "0.6.6"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352"
 dependencies = [
- "byteorder",
+ "arbitrary",
  "crc32fast",
  "crossbeam-utils",
+ "displaydoc",
  "flate2",
+ "indexmap",
+ "memchr",
+ "thiserror 2.0.4",
+ "zopfli",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
+]
+
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
+[[package]]
+name = "zune-jpeg"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
+dependencies = [
+ "zune-core",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index bc2d7549..05ac7740 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,5 +10,36 @@ members = [
 ]
 
 [patch."crates-io"]
-# TODO https://github.com/gfx-rs/naga/issues/2373
-naga = { git = "https://github.com/Patryk27/naga", branch = "v0.13.0-strolle" }
+bevy = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_render = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_ptr = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_utils = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_tasks = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_reflect = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_mikktspace = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_ecs = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_math = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_app = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_color = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_core = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_asset = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_a11y = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_time = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_hierarchy = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_window = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_diagnostic = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_gilrs = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_transform = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_state = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_winit = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_audio = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_core_pipeline = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_animation = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_scene = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_sprite = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_pbr = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_gizmos = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_text = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_gltf = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_ui = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
+bevy_internal = { git = "https://github.com/glasspangolin/bevy", branch = "v0.14.2-strolle" }
\ No newline at end of file
diff --git a/bevy-strolle/Cargo.toml b/bevy-strolle/Cargo.toml
index 683388d2..fded8ec9 100644
--- a/bevy-strolle/Cargo.toml
+++ b/bevy-strolle/Cargo.toml
@@ -4,16 +4,16 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bevy = "0.12.1" # TODO use default-features = false
-bevy_egui = "0.24"
+bevy = { version = "0.14.2", default-features = false, features = ["default"] }
+bevy_egui = "0.29.0"
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "1932353935338c0ac5b7b150fae0551ddeaa1dad" }
 log = "0.4.18"
 strolle = { path = "../strolle", features = ["metrics"] }
-wgpu = "0.17.2"
+wgpu = "0.20.1"
 
 [dev-dependencies]
-bevy = { version = "0.12.1", features = ["jpeg"] }
-bevy_mod_raycast = "0.16.0"
-bevy_rapier3d = "0.23.0"
-lazy_static = "1.4.0"
-smooth-bevy-cameras = "0.10.0"
-zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
+bevy = { version = "0.14.2", default-features = false, features = ["default", "jpeg"] }
+bevy_mod_raycast = "0.18.0"
+smooth-bevy-cameras = { version = "0.12.0"}
+lazy_static = "1.5.0"
+zip = { version = "2.2.0", default-features = false, features = ["deflate"] }
diff --git a/bevy-strolle/examples/_common.rs b/bevy-strolle/examples/_common.rs
index 6e0a9f82..f49b4d17 100644
--- a/bevy-strolle/examples/_common.rs
+++ b/bevy-strolle/examples/_common.rs
@@ -7,13 +7,14 @@ use std::env;
 use std::fs::File;
 use std::io::BufReader;
 use std::path::Path;
-
+use bevy::core_pipeline::core_3d::graph::Core3d;
 use bevy::prelude::*;
 use bevy::render::camera::CameraRenderGraph;
 use bevy::window::{CursorGrabMode, PrimaryWindow};
 use bevy_strolle::prelude::*;
 use smooth_bevy_cameras::controllers::fps::FpsCameraController;
 use zip::ZipArchive;
+use bevy_strolle::graph::StrolleGraph;
 
 pub fn extract_assets() {
     extract_asset("cornell");
@@ -48,7 +49,7 @@ fn extract_asset(name: &str) {
 // -----------------------------------------------------------------------------
 
 pub fn handle_camera(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<ButtonInput<KeyCode>>,
     mut window: Query<&mut Window, With<PrimaryWindow>>,
     mut camera: Query<(
         &Transform,
@@ -64,8 +65,8 @@ pub fn handle_camera(
         mut fps_camera_controller,
     ) = camera.single_mut();
 
-    if keys.just_pressed(KeyCode::Key1) {
-        camera_render_graph.set(bevy_strolle::graph::NAME);
+    if keys.just_pressed(KeyCode::Digit1) {
+        camera_render_graph.set(StrolleGraph);
 
         camera.mode = match camera.mode {
             st::CameraMode::Image { denoise } => {
@@ -75,8 +76,8 @@ pub fn handle_camera(
         };
     }
 
-    if keys.just_pressed(KeyCode::Key2) {
-        camera_render_graph.set(bevy_strolle::graph::NAME);
+    if keys.just_pressed(KeyCode::Digit2) {
+        camera_render_graph.set(StrolleGraph);
 
         camera.mode = match camera.mode {
             st::CameraMode::DiDiffuse { denoise } => {
@@ -86,8 +87,8 @@ pub fn handle_camera(
         };
     }
 
-    if keys.just_pressed(KeyCode::Key3) {
-        camera_render_graph.set(bevy_strolle::graph::NAME);
+    if keys.just_pressed(KeyCode::Digit3) {
+        camera_render_graph.set(StrolleGraph);
 
         camera.mode = match camera.mode {
             st::CameraMode::DiSpecular { denoise } => {
@@ -97,8 +98,8 @@ pub fn handle_camera(
         };
     }
 
-    if keys.just_pressed(KeyCode::Key4) {
-        camera_render_graph.set(bevy_strolle::graph::NAME);
+    if keys.just_pressed(KeyCode::Digit4) {
+        camera_render_graph.set(StrolleGraph);
 
         camera.mode = match camera.mode {
             st::CameraMode::GiDiffuse { denoise } => {
@@ -108,8 +109,8 @@ pub fn handle_camera(
         };
     }
 
-    if keys.just_pressed(KeyCode::Key5) {
-        camera_render_graph.set(bevy_strolle::graph::NAME);
+    if keys.just_pressed(KeyCode::Digit5) {
+        camera_render_graph.set(StrolleGraph);
 
         camera.mode = match camera.mode {
             st::CameraMode::GiSpecular { denoise } => {
@@ -119,20 +120,20 @@ pub fn handle_camera(
         };
     }
 
-    if keys.just_pressed(KeyCode::Key8) {
-        camera_render_graph.set(bevy_strolle::graph::NAME);
+    if keys.just_pressed(KeyCode::Digit8) {
+        camera_render_graph.set(StrolleGraph);
 
         camera.mode = st::CameraMode::BvhHeatmap;
     }
 
-    if keys.just_pressed(KeyCode::Key9) {
-        camera_render_graph.set(bevy_strolle::graph::NAME);
+    if keys.just_pressed(KeyCode::Digit9) {
+        camera_render_graph.set(StrolleGraph);
 
         camera.mode = st::CameraMode::Reference { depth: 1 };
     }
 
-    if keys.just_pressed(KeyCode::Key0) {
-        camera_render_graph.set("core_3d");
+    if keys.just_pressed(KeyCode::Digit0) {
+        camera_render_graph.set(Core3d);
     }
 
     if keys.just_pressed(KeyCode::Semicolon) {
@@ -149,7 +150,7 @@ pub fn handle_camera(
         };
     }
 
-    if keys.just_pressed(KeyCode::X) {
+    if keys.just_pressed(KeyCode::KeyX) {
         println!("{:?}", camera_xform.translation);
     }
 }
@@ -173,20 +174,20 @@ impl Default for Sun {
     }
 }
 
-pub fn handle_sun(keys: Res<Input<KeyCode>>, mut sun: ResMut<Sun>) {
-    if keys.just_pressed(KeyCode::H) {
+pub fn handle_sun(keys: Res<ButtonInput<KeyCode>>, mut sun: ResMut<Sun>) {
+    if keys.just_pressed(KeyCode::KeyH) {
         sun.azimuth -= 0.05;
     }
 
-    if keys.just_pressed(KeyCode::J) {
+    if keys.just_pressed(KeyCode::KeyJ) {
         sun.altitude -= 0.05;
     }
 
-    if keys.just_pressed(KeyCode::K) {
+    if keys.just_pressed(KeyCode::KeyK) {
         sun.altitude += 0.05;
     }
 
-    if keys.just_pressed(KeyCode::L) {
+    if keys.just_pressed(KeyCode::KeyL) {
         sun.azimuth += 0.05;
     }
 }
diff --git a/bevy-strolle/examples/cornell.rs b/bevy-strolle/examples/cornell.rs
index 637665d4..3193ba84 100644
--- a/bevy-strolle/examples/cornell.rs
+++ b/bevy-strolle/examples/cornell.rs
@@ -6,6 +6,7 @@ use bevy::math::vec3;
 use bevy::prelude::*;
 use bevy::render::camera::CameraRenderGraph;
 use bevy::window::WindowResolution;
+use bevy_strolle::graph::StrolleGraph;
 use bevy_strolle::prelude::*;
 use smooth_bevy_cameras::controllers::orbit::{
     OrbitCameraBundle, OrbitCameraController, OrbitCameraPlugin,
@@ -55,15 +56,14 @@ fn setup(mut commands: Commands, assets: Res<AssetServer>) {
 
     commands
         .spawn(Camera3dBundle {
-            camera_render_graph: CameraRenderGraph::new(
-                bevy_strolle::graph::NAME,
-            ),
+            camera_render_graph: CameraRenderGraph::new(StrolleGraph),
             camera: Camera {
                 hdr: true,
                 ..default()
             },
             ..default()
         })
+        .insert(StrolleCamera::default())
         .insert(OrbitCameraBundle::new(
             {
                 OrbitCameraController {
diff --git a/bevy-strolle/examples/demo.rs b/bevy-strolle/examples/demo.rs
index 5e71fa01..eb30b25f 100644
--- a/bevy-strolle/examples/demo.rs
+++ b/bevy-strolle/examples/demo.rs
@@ -2,21 +2,25 @@
 mod common;
 
 use std::f32::consts::PI;
-
-use bevy::core_pipeline::clear_color::ClearColorConfig;
+use bevy::asset::AssetContainer;
 use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin};
 use bevy::math::{uvec2, vec3};
 use bevy::prelude::*;
 use bevy::render::camera::{CameraRenderGraph, RenderTarget};
+use bevy::render::renderer::RenderDevice;
+use bevy::render::RenderPlugin;
+use bevy::render::settings::{RenderCreation, WgpuSettings};
 use bevy::render::texture::ImageSampler;
 use bevy::window::{CursorGrabMode, PrimaryWindow, WindowResolution};
+use bevy_strolle::graph::StrolleGraph;
 use bevy_strolle::prelude::*;
 use smooth_bevy_cameras::controllers::fps::{
     FpsCameraBundle, FpsCameraController, FpsCameraPlugin,
 };
 use smooth_bevy_cameras::LookTransformPlugin;
 use wgpu::{
-    Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
+    Extent3d, Limits, TextureDescriptor, TextureDimension, TextureFormat,
+    TextureUsages,
 };
 
 use self::common::Sun;
@@ -48,6 +52,7 @@ fn main() {
         .add_systems(Startup, setup_window)
         .add_systems(Startup, setup_camera)
         .add_systems(Startup, setup_scene)
+        .add_systems(Startup, check_gpu_limits)
         .add_systems(Update, adjust_materials)
         .add_systems(Update, handle_materials)
         .add_systems(Update, common::handle_camera)
@@ -60,6 +65,28 @@ fn main() {
         .run();
 }
 
+fn check_gpu_limits(render_device: Res<RenderDevice>) {
+    let limits = render_device.limits();
+    info!("GPU Limits:");
+    info!(
+        "  max_color_attachment_bytes_per_sample: {}",
+        limits.max_color_attachment_bytes_per_sample
+    );
+    info!(
+        "  max_texture_dimension_2d: {}",
+        limits.max_texture_dimension_2d
+    );
+    info!(
+        "  max_storage_buffer_binding_size: {}",
+        limits.max_storage_buffer_binding_size
+    );
+    info!("  max_bind_groups: {}", limits.max_bind_groups);
+    info!(
+        "  max_bindings_per_bind_group: {}",
+        limits.max_bindings_per_bind_group
+    );
+}
+
 fn setup_window(mut window: Query<&mut Window, With<PrimaryWindow>>) {
     let mut window = window.single_mut();
 
@@ -118,17 +145,13 @@ fn setup_camera(
             order: 1,
             ..default()
         },
-        camera_2d: Camera2d {
-            clear_color: ClearColorConfig::None,
-        },
+        camera_2d: Camera2d {},
         ..default()
     });
 
     commands
         .spawn(Camera3dBundle {
-            camera_render_graph: CameraRenderGraph::new(
-                bevy_strolle::graph::NAME,
-            ),
+            camera_render_graph: CameraRenderGraph::new(StrolleGraph),
             camera: Camera {
                 order: 0,
                 target: RenderTarget::Image(viewport),
@@ -181,7 +204,7 @@ fn setup_scene(
                 color: Color::WHITE,
                 range: 35.0,
                 radius: 0.15,
-                intensity: 5000.0,
+                intensity: 1000.0,
                 shadows_enabled: true,
                 ..default()
             },
@@ -203,10 +226,10 @@ fn setup_scene(
 
         commands
             .spawn(MaterialMeshBundle {
-                mesh: meshes.add(Mesh::from(shape::Torus::default())),
+                mesh: meshes.add(Mesh::from(Torus::default())),
                 material: materials.add(StandardMaterial {
                     base_color: color,
-                    emissive: color * 10.0,
+                    emissive: color.to_linear(),
                     ..default()
                 }),
                 transform: Transform::from_translation(torus)
@@ -214,7 +237,7 @@ fn setup_scene(
                     .with_scale(Vec3::splat(0.5)),
                 ..default()
             })
-            .insert(Torus);
+            .insert(StrTorus);
     }
 
     // ---
@@ -261,16 +284,16 @@ fn adjust_materials(
 }
 
 fn handle_materials(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<ButtonInput<KeyCode>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    if keys.just_pressed(KeyCode::T) {
+    if keys.just_pressed(KeyCode::KeyT) {
         for (_, material) in materials.iter_mut() {
             material.base_color_texture = None;
         }
     }
 
-    if keys.just_pressed(KeyCode::M) {
+    if keys.just_pressed(KeyCode::KeyM) {
         for (_, material) in materials.iter_mut() {
             if material.metallic == 0.0 {
                 material.metallic = 1.0;
@@ -291,13 +314,13 @@ struct Flashlight {
 }
 
 fn handle_flashlight(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<ButtonInput<KeyCode>>,
     mut flashlight: Query<(&mut Flashlight, &mut SpotLight)>,
     mut lights: Query<&mut PointLight>,
 ) {
     let (mut flashlight, mut flashlight_spot) = flashlight.single_mut();
 
-    if keys.just_pressed(KeyCode::F) {
+    if keys.just_pressed(KeyCode::KeyF) {
         flashlight.enabled = !flashlight.enabled;
 
         if flashlight.enabled {
@@ -330,11 +353,11 @@ fn animate_flashlight(
 // -----------------------------------------------------------------------------
 
 #[derive(Component)]
-struct Torus;
+struct StrTorus;
 
 fn animate_toruses(
     time: Res<Time>,
-    mut toruses: Query<&mut Transform, (With<Torus>, Without<Flashlight>)>,
+    mut toruses: Query<&mut Transform, (With<StrTorus>, Without<Flashlight>)>,
 ) {
     for mut xform in toruses.iter_mut() {
         xform.rotation = Quat::from_rotation_z(time.elapsed_seconds())
diff --git a/bevy-strolle/src/debug.rs b/bevy-strolle/src/debug.rs
index 77af56bf..36e881e6 100644
--- a/bevy-strolle/src/debug.rs
+++ b/bevy-strolle/src/debug.rs
@@ -2,6 +2,7 @@ use bevy::core_pipeline::fxaa;
 use bevy::core_pipeline::tonemapping::Tonemapping;
 use bevy::prelude::*;
 use bevy_egui::{egui, EguiContexts, EguiPlugin};
+use crate::utils::color_to_vec4;
 
 pub struct StrolleDebugPlugin;
 
@@ -89,7 +90,7 @@ fn draw_materials(
                     return;
                 };
 
-                let rgba = material.base_color.as_rgba_f32();
+                let rgba = color_to_vec4(material.base_color);
                 let mut rgb = [rgba[0], rgba[1], rgba[2]];
 
                 ui.color_edit_button_rgb(&mut rgb);
diff --git a/bevy-strolle/src/graph.rs b/bevy-strolle/src/graph.rs
index e2bd1d39..2efe0b71 100644
--- a/bevy-strolle/src/graph.rs
+++ b/bevy-strolle/src/graph.rs
@@ -1,43 +1,51 @@
-pub const NAME: &str = "strolle";
-
-pub mod node {
-    pub const RENDERING: &str = "strolle_rendering";
-    pub const TONEMAPPING: &str = "strolle_tonemapping";
-    pub const FXAA: &str = "strolle_fxaa";
-    pub const UPSCALING: &str = "strolle_upscaling";
-}
-
 use bevy::core_pipeline::fxaa::FxaaNode;
 use bevy::core_pipeline::tonemapping::TonemappingNode;
 use bevy::core_pipeline::upscaling::UpscalingNode;
 use bevy::prelude::*;
-use bevy::render::render_graph::{RenderGraphApp, ViewNodeRunner};
+use bevy::render::render_graph::{
+    RenderGraphApp, RenderSubGraph, ViewNodeRunner,
+};
 
+use crate::prelude::RenderLabel;
 use crate::RenderingNode;
 
-pub(crate) fn setup(render_app: &mut App) {
+#[derive(Debug, Hash, PartialEq, Eq, Clone, RenderSubGraph)]
+pub struct StrolleGraph;
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone, RenderLabel)]
+pub enum StrolleNode {
+    RENDERING,
+    TONEMAPPING,
+    FXAA,
+    UPSCALING,
+}
+
+pub(crate) fn setup(render_app: &mut SubApp) {
     render_app
-        .add_render_sub_graph(NAME)
+        .add_render_sub_graph(StrolleGraph)
         .add_render_graph_node::<ViewNodeRunner<RenderingNode>>(
-            NAME,
-            node::RENDERING,
+            StrolleGraph,
+            StrolleNode::RENDERING,
         )
         .add_render_graph_node::<ViewNodeRunner<TonemappingNode>>(
-            NAME,
-            node::TONEMAPPING,
+            StrolleGraph,
+            StrolleNode::TONEMAPPING,
         )
         .add_render_graph_node::<ViewNodeRunner<UpscalingNode>>(
-            NAME,
-            node::UPSCALING,
+            StrolleGraph,
+            StrolleNode::UPSCALING,
+        )
+        .add_render_graph_node::<ViewNodeRunner<FxaaNode>>(
+            StrolleGraph,
+            StrolleNode::FXAA,
         )
-        .add_render_graph_node::<ViewNodeRunner<FxaaNode>>(NAME, node::FXAA)
         .add_render_graph_edges(
-            NAME,
-            &[
-                node::RENDERING,
-                node::FXAA,
-                node::TONEMAPPING,
-                node::UPSCALING,
-            ],
+            StrolleGraph,
+            (
+                StrolleNode::RENDERING,
+                StrolleNode::FXAA,
+                StrolleNode::TONEMAPPING,
+                StrolleNode::UPSCALING,
+            ),
         );
 }
diff --git a/bevy-strolle/src/lib.rs b/bevy-strolle/src/lib.rs
index 0c61bb8f..8686e899 100644
--- a/bevy-strolle/src/lib.rs
+++ b/bevy-strolle/src/lib.rs
@@ -15,6 +15,7 @@ pub mod prelude {
 use std::ops;
 
 use bevy::prelude::*;
+use bevy::render::render_graph::RenderLabel;
 use bevy::render::render_resource::Texture;
 use bevy::render::renderer::RenderDevice;
 use bevy::render::RenderApp;
@@ -34,7 +35,7 @@ impl Plugin for StrollePlugin {
         app.add_event::<StrolleEvent>();
         app.insert_resource(StrolleSun::default());
 
-        if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
+        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
             render_app.insert_resource(SyncedState::default());
 
             stages::setup(render_app);
@@ -43,11 +44,11 @@ impl Plugin for StrollePlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Ok(render_app) = app.get_sub_app_mut(RenderApp) else {
+        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
             return;
         };
 
-        let render_device = render_app.world.resource::<RenderDevice>();
+        let render_device = render_app.world().resource::<RenderDevice>();
         let engine = st::Engine::new(render_device.wgpu_device());
 
         render_app.insert_resource(EngineResource(engine));
diff --git a/bevy-strolle/src/stages.rs b/bevy-strolle/src/stages.rs
index 73354035..660e565a 100644
--- a/bevy-strolle/src/stages.rs
+++ b/bevy-strolle/src/stages.rs
@@ -4,7 +4,7 @@ mod prepare;
 use bevy::prelude::*;
 use bevy::render::{Render, RenderSet};
 
-pub(crate) fn setup(render_app: &mut App) {
+pub fn setup(render_app: &mut SubApp) {
     render_app.add_systems(
         ExtractSchedule,
         extract::meshes.in_set(RenderSet::ExtractCommands),
@@ -58,6 +58,8 @@ pub(crate) fn setup(render_app: &mut App) {
     render_app.add_systems(Render, prepare::sun.in_set(RenderSet::Prepare));
     render_app.add_systems(Render, prepare::cameras.in_set(RenderSet::Prepare));
 
-    render_app
-        .add_systems(Render, prepare::flush.in_set(RenderSet::PrepareFlush));
+    render_app.add_systems(
+        Render,
+        prepare::flush.in_set(RenderSet::PrepareResourcesFlush),
+    );
 }
diff --git a/bevy-strolle/src/stages/extract.rs b/bevy-strolle/src/stages/extract.rs
index 47f8e946..70671933 100644
--- a/bevy-strolle/src/stages/extract.rs
+++ b/bevy-strolle/src/stages/extract.rs
@@ -33,9 +33,8 @@ pub(crate) fn meshes(
             AssetEvent::Removed { id } => {
                 removed.push(*id);
             }
-            AssetEvent::LoadedWithDependencies { .. } => {
-                //
-            }
+            AssetEvent::Unused { .. } => {}
+            AssetEvent::LoadedWithDependencies { .. } => {}
         }
     }
 
@@ -76,6 +75,7 @@ pub(crate) fn materials(
             AssetEvent::LoadedWithDependencies { .. } => {
                 //
             }
+            AssetEvent::Unused { .. } => {}
         }
     }
 
@@ -130,6 +130,7 @@ pub(crate) fn images(
             AssetEvent::LoadedWithDependencies { .. } => {
                 //
             }
+            AssetEvent::Unused { .. } => {}
         }
     }
 
@@ -235,7 +236,7 @@ pub(crate) fn instances(
                 //      should probably propagate the layers up to the BVH
                 //      leaves and adjust the raytracer to read those
                 if let Some(layers) = layers {
-                    if *layers != RenderLayers::all() {
+                    if *layers != RenderLayers::layer(0) {
                         // TODO inefficient; we should push only if the object
                         //      was visible before
                         removed.push(handle);
@@ -338,36 +339,28 @@ pub(crate) fn lights(
 pub(crate) fn cameras(
     mut commands: Commands,
     cameras: Extract<
-        Query<(
-            Entity,
-            &Camera,
-            &CameraRenderGraph,
-            &Projection,
-            &GlobalTransform,
-            Option<&StrolleCamera>,
-        )>,
+        Query<(Entity, &Camera, &Projection, &GlobalTransform, &StrolleCamera)>,
     >,
 ) {
-    for (
-        entity,
-        camera,
-        camera_render_graph,
-        projection,
-        transform,
-        strolle_camera,
-    ) in cameras.iter()
-    {
-        if !camera.is_active || **camera_render_graph != crate::graph::NAME {
-            continue;
-        }
-
+    for (entity, camera, projection, transform, strolle_camera) in cameras.iter() {
         assert!(camera.hdr, "Strolle requires an HDR camera");
-
-        commands.get_or_spawn(entity).insert(ExtractedCamera {
-            transform: transform.compute_matrix(),
-            projection: projection.get_projection_matrix(),
-            mode: strolle_camera.map(|camera| camera.mode),
-        });
+        if let Projection::Perspective(p_projection) = projection {
+            let fov_y = p_projection.fov;
+            let aspect_ratio = p_projection.aspect_ratio;
+            let near_plane = p_projection.near;
+            let far_plane = p_projection.far;
+
+            let p_mat =
+                Mat4::perspective_rh(fov_y, aspect_ratio, far_plane, near_plane);
+
+            commands.get_or_spawn(entity).insert(ExtractedCamera {
+                transform: transform.compute_matrix(),
+                projection: p_mat,
+                mode: Some(strolle_camera.mode),
+            });
+        } else {
+            println!("Strolle requires a perspective camera");
+        }
     }
 }
 
diff --git a/bevy-strolle/src/stages/prepare.rs b/bevy-strolle/src/stages/prepare.rs
index e0373372..971e0b13 100644
--- a/bevy-strolle/src/stages/prepare.rs
+++ b/bevy-strolle/src/stages/prepare.rs
@@ -3,13 +3,15 @@ use std::mem;
 use bevy::prelude::*;
 use bevy::render::camera::ExtractedCamera as BevyExtractedCamera;
 use bevy::render::mesh::VertexAttributeValues;
-use bevy::render::render_asset::RenderAssets;
+use bevy::render::render_asset::{RenderAssetUsages, RenderAssets};
 use bevy::render::render_resource::PrimitiveTopology;
 use bevy::render::renderer::{RenderDevice, RenderQueue};
+use bevy::render::texture::GpuImage;
 use bevy::render::view::ViewTarget;
 use bevy::utils::hashbrown::hash_map::Entry;
 use bevy::utils::HashSet;
 use strolle as st;
+use strolle::{ImageData, ToGpu};
 
 use crate::state::{
     ExtractedCamera, ExtractedImageData, ExtractedImages, ExtractedInstances,
@@ -17,9 +19,9 @@ use crate::state::{
     SyncedCamera, SyncedState,
 };
 use crate::utils::color_to_vec4;
-use crate::EngineResource;
+use crate::{EngineParams, EngineResource};
 
-pub(crate) fn meshes(
+pub fn meshes(
     mut engine: ResMut<EngineResource>,
     mut meshes: ResMut<ExtractedMeshes>,
 ) {
@@ -110,10 +112,26 @@ pub(crate) fn meshes(
                 let tan2 = mesh_tans.get(vs[2]).copied().unwrap_or_default();
 
                 st::MeshTriangle::default()
-                    .with_positions([position0, position1, position2])
-                    .with_normals([normal0, normal1, normal2])
-                    .with_uvs([uv0, uv1, uv2])
-                    .with_tangents([tan0, tan1, tan2])
+                    .with_positions([
+                        Vec3::from(position0),
+                        Vec3::from(position1),
+                        Vec3::from(position2),
+                    ])
+                    .with_normals([
+                        Vec3::from(normal0),
+                        Vec3::from(normal1),
+                        Vec3::from(normal2),
+                    ])
+                    .with_uvs([
+                        Vec2::from(uv0),
+                        Vec2::from(uv1),
+                        Vec2::from(uv2),
+                    ])
+                    .with_tangents([
+                        Vec4::from(tan0),
+                        Vec4::from(tan1),
+                        Vec4::from(tan2),
+                    ])
             })
             .collect();
 
@@ -121,7 +139,7 @@ pub(crate) fn meshes(
     }
 }
 
-pub(crate) fn materials(
+pub fn materials(
     mut engine: ResMut<EngineResource>,
     mut materials: ResMut<ExtractedMaterials>,
 ) {
@@ -154,11 +172,11 @@ pub(crate) fn materials(
         };
 
         st::Material {
-            base_color,
+            base_color: base_color.to_gpu(),
             base_color_texture: mat
                 .base_color_texture
                 .map(|handle| handle.id()),
-            emissive: color_to_vec4(mat.emissive),
+            emissive: color_to_vec4(Color::LinearRgba(mat.emissive)).to_gpu(),
             emissive_texture: mat.emissive_texture.map(|handle| handle.id()),
             perceptual_roughness: mat.perceptual_roughness,
             metallic: mat.metallic,
@@ -179,9 +197,9 @@ pub(crate) fn materials(
     }
 }
 
-pub(crate) fn images(
+pub fn images(
     mut engine: ResMut<EngineResource>,
-    textures: Res<RenderAssets<Image>>,
+    textures: Res<RenderAssets<GpuImage>>,
     mut images: ResMut<ExtractedImages>,
 ) {
     for handle in &images.removed {
@@ -197,12 +215,13 @@ pub(crate) fn images(
             ExtractedImageData::Raw { data } => st::ImageData::Raw { data },
 
             ExtractedImageData::Texture { is_dynamic } => {
+                let Some(gpu_image) = textures.get(entry.handle) else {
+                    warn!("Missing GPU image for handle {:?}", entry.handle);
+                    continue;
+                };
+
                 st::ImageData::Texture {
-                    texture: textures
-                        .get(entry.handle)
-                        .unwrap()
-                        .texture
-                        .clone(),
+                    texture: gpu_image.texture.clone(),
                     is_dynamic,
                 }
             }
@@ -230,7 +249,7 @@ pub(crate) fn images(
     }
 }
 
-pub(crate) fn instances(
+pub fn instances(
     mut engine: ResMut<EngineResource>,
     mut instances: ResMut<ExtractedInstances>,
 ) {
@@ -250,7 +269,7 @@ pub(crate) fn instances(
     }
 }
 
-pub(crate) fn lights(
+pub fn lights(
     mut engine: ResMut<EngineResource>,
     mut lights: ResMut<ExtractedLights>,
 ) {
@@ -263,16 +282,13 @@ pub(crate) fn lights(
     }
 }
 
-pub(crate) fn sun(
-    mut engine: ResMut<EngineResource>,
-    mut sun: ResMut<ExtractedSun>,
-) {
+pub fn sun(mut engine: ResMut<EngineResource>, mut sun: ResMut<ExtractedSun>) {
     if let Some(sun) = sun.sun.take() {
         engine.update_sun(sun);
     }
 }
 
-pub(crate) fn cameras(
+pub fn cameras(
     device: Res<RenderDevice>,
     mut state: ResMut<SyncedState>,
     mut engine: ResMut<EngineResource>,
@@ -290,29 +306,27 @@ pub(crate) fn cameras(
 
     for (entity, view_target, bevy_ext_camera, ext_camera) in cameras.iter_mut()
     {
-        let camera = st::Camera {
-            mode: ext_camera.mode.unwrap_or_default(),
-
-            viewport: {
-                let format = view_target.main_texture_format();
+        let format = view_target.main_texture_format();
 
-                let Some(size) = bevy_ext_camera.physical_viewport_size else {
-                    continue;
-                };
+        let Some(size) = bevy_ext_camera.physical_viewport_size else {
+            continue;
+        };
 
-                let position = bevy_ext_camera
-                    .viewport
-                    .as_ref()
-                    .map(|v| v.physical_position)
-                    .unwrap_or_default();
+        let position = bevy_ext_camera
+            .viewport
+            .as_ref()
+            .map(|v| v.physical_position)
+            .unwrap_or_default();
 
+        let camera = st::Camera {
+            mode: ext_camera.mode.unwrap_or_default(),
+            viewport: {
                 st::CameraViewport {
                     format,
                     size,
                     position,
                 }
             },
-
             transform: ext_camera.transform,
             projection: ext_camera.projection,
         };
diff --git a/bevy-strolle/src/utils.rs b/bevy-strolle/src/utils.rs
index 77e75299..ac729bbd 100644
--- a/bevy-strolle/src/utils.rs
+++ b/bevy-strolle/src/utils.rs
@@ -1,14 +1,13 @@
-use bevy::math::{vec3, vec4};
 use bevy::prelude::*;
 
 pub fn color_to_vec3(color: Color) -> Vec3 {
-    let [r, g, b, _] = color.as_linear_rgba_f32();
+    let [r, g, b, _] = color.to_linear().to_f32_array();
 
-    vec3(r, g, b)
+    Vec3::new(r, g, b)
 }
 
 pub fn color_to_vec4(color: Color) -> Vec4 {
-    let [r, g, b, a] = color.as_linear_rgba_f32();
+    let [r, g, b, a] = color.to_linear().to_f32_array();
 
-    vec4(r, g, b, a)
+    Vec4::new(r, g, b, a)
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 0146b98d..0425aad8 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-09-30"
-components = ["cargo", "rust-src", "rustc-dev", "llvm-tools-preview"]
+channel = "nightly-2024-04-24"
+components = ["rust-src", "rustc-dev", "llvm-tools"]
\ No newline at end of file
diff --git a/strolle-gpu/Cargo.toml b/strolle-gpu/Cargo.toml
index c11bd669..24ef143d 100644
--- a/strolle-gpu/Cargo.toml
+++ b/strolle-gpu/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bytemuck = { version = "1.13.1", features = ["derive", "min_const_generics"] }
-glam = { version = "0.24", default-features = false, features = ["bytemuck"] }
-spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu" }
+bytemuck = { version = "1.19.0", features = ["derive", "min_const_generics"] }
+glam = { version = "0.29.1", default-features = false, features = ["bytemuck"] }
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "1932353935338c0ac5b7b150fae0551ddeaa1dad" }
 
 [dev-dependencies]
 approx = "0.5.1"
diff --git a/strolle-gpu/src/brdf.rs b/strolle-gpu/src/brdf.rs
index fe6e29c2..da737e4c 100644
--- a/strolle-gpu/src/brdf.rs
+++ b/strolle-gpu/src/brdf.rs
@@ -4,7 +4,9 @@ use glam::{Vec3, Vec4Swizzles};
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::Float;
 
-use crate::{F32Ext, GBufferEntry, WhiteNoise};
+use crate::{
+    Vec3StrolleExt, F32Ext, GBufferEntry, WhiteNoise,
+};
 
 #[derive(Clone, Copy)]
 pub struct DiffuseBrdf {
@@ -88,10 +90,16 @@ impl SpecularBrdf {
         let a = gbuffer.clamped_roughness();
         let n = gbuffer.normal;
         let a2 = a.sqr();
-        let (b, t) = n.any_orthonormal_pair();
-
-        let cos_theta = 0.0f32.max((1.0 - r0) / ((a2 - 1.0) * r0 + 1.0)).sqrt();
-        let sin_theta = 0.0f32.max(1.0 - cos_theta * cos_theta).sqrt();
+        let (b, t) = n.safe_any_orthonormal_pair();
+
+        let cos_theta = 0.0f32
+            .max((1.0 - r0) / ((a2 - 1.0) * r0 + 1.0))
+            .max(crate::STROLLE_EPSILON)
+            .sqrt();
+        let sin_theta = 0.0f32
+            .max(1.0 - cos_theta * cos_theta)
+            .max(crate::STROLLE_EPSILON)
+            .sqrt();
 
         let phi = r1 * PI * 2.0;
 
diff --git a/strolle-gpu/src/camera.rs b/strolle-gpu/src/camera.rs
index 3023cc9d..4ce05829 100644
--- a/strolle-gpu/src/camera.rs
+++ b/strolle-gpu/src/camera.rs
@@ -84,8 +84,9 @@ impl Camera {
         let ndc = screen_pos * 2.0 / screen_size - Vec2::ONE;
         let ndc = vec2(ndc.x, -ndc.y);
 
-        let far_plane =
-            self.ndc_to_world.project_point3(ndc.extend(f32::EPSILON));
+        let far_plane = self
+            .ndc_to_world
+            .project_point3(ndc.extend(crate::STROLLE_EPSILON));
 
         let near_plane = self.ndc_to_world.project_point3(ndc.extend(1.0));
 
diff --git a/strolle-gpu/src/gbuffer.rs b/strolle-gpu/src/gbuffer.rs
index 4760c0ec..f7d25714 100644
--- a/strolle-gpu/src/gbuffer.rs
+++ b/strolle-gpu/src/gbuffer.rs
@@ -20,30 +20,27 @@ impl GBufferEntry {
         let depth = d0.x;
         let normal = Normal::decode(d0.yz());
 
-        let (metallic, roughness, reflectance) = {
-            let [metallic, roughness, reflectance, ..] =
-                d0.w.to_bits().to_bytes();
+        let packed = d0.w.to_bits();
+        let metallic_u = (packed >> 24) & 0xFF;
+        let roughness_u = (packed >> 16) & 0xFF;
+        let reflectance_u = (packed >> 8) & 0xFF;
+        let emissive_r_u = packed & 0xFF;
 
-            let metallic = metallic as f32 / 255.0;
-            let roughness = (roughness as f32 / 255.0).sqr();
-            let reflectance = reflectance as f32 / 255.0;
+        let metallic = metallic_u as f32 / 255.0;
+        let roughness = roughness_u as f32 / 255.0;
+        let reflectance = reflectance_u as f32 / 255.0;
+        let emissive_r = emissive_r_u as f32 / 255.0;
 
-            (metallic, roughness, reflectance)
-        };
+        let w_scaled = d1.w as u32;
+        let emissive_g_u = (w_scaled >> 8) & 0xFF;
+        let emissive_b_u = w_scaled & 0xFF;
 
-        let emissive = d1.xyz();
+        let emissive_g = emissive_g_u as f32 / 255.0;
+        let emissive_b = emissive_b_u as f32 / 255.0;
 
-        let base_color = {
-            let [x, y, z, w] = d1.w.to_bits().to_bytes();
+        let emissive = Vec3::new(emissive_r, emissive_g, emissive_b);
 
-            vec4(
-                x as f32 / 255.0,
-                y as f32 / 255.0,
-                z as f32 / 255.0,
-                w as f32 / 63.0,
-            )
-            .powf(2.2)
-        };
+        let base_color = vec4(d1.x, d1.y, d1.z, 1.0); // Assuming alpha is 1.0
 
         Self {
             base_color,
@@ -57,55 +54,49 @@ impl GBufferEntry {
     }
 
     pub fn pack(self) -> [Vec4; 2] {
+        // d0: Rgba32Float
         let d0 = {
-            let x = self.depth;
-            let Vec2 { x: y, y: z } = Normal::encode(self.normal);
-
-            let w = {
-                let metallic = self.metallic.clamp(0.0, 1.0) * 255.0;
-                let roughness = self.roughness.sqrt().clamp(0.0, 1.0) * 255.0;
-                let reflectance = self.reflectance.clamp(0.0, 1.0) * 255.0;
-
-                f32::from_bits(u32::from_bytes([
-                    metallic as u32,
-                    roughness as u32,
-                    reflectance as u32,
-                    1,
-                ]))
-            };
+            let x = self.depth; // f32
+            let Vec2 { x: y, y: z } = Normal::encode(self.normal); // Encoded normal components
+
+            // Pack metallic, roughness, reflectance, and emissive_r into a u32
+            let metallic_u =
+                (self.metallic.clamp(0.0, 1.0) * 255.0).round() as u32;
+            let roughness_u =
+                (self.roughness.clamp(0.0, 1.0) * 255.0).round() as u32;
+            let reflectance_u =
+                (self.reflectance.clamp(0.0, 1.0) * 255.0).round() as u32;
+            let emissive_r_u =
+                (self.emissive.x.clamp(0.0, 1.0) * 255.0).round() as u32;
+
+            let packed = (metallic_u << 24)
+                | (roughness_u << 16)
+                | (reflectance_u << 8)
+                | emissive_r_u;
+
+            let w = f32::from_bits(packed);
 
             vec4(x, y, z, w)
         };
 
+        // d1: Rgba16Float
         let d1 = {
-            // TODO doesn't need to use as much space
-            let x = self.emissive.x;
-            let y = self.emissive.y;
-            let z = self.emissive.z;
-
-            let w = {
-                let base_color = self
-                    .base_color
-                    .powf(1.0 / 2.2)
-                    .clamp(Vec4::ZERO, Vec4::ONE);
-
-                let base_color = (vec4(
-                    base_color.x * 255.0,
-                    base_color.y * 255.0,
-                    base_color.z * 255.0,
-                    base_color.w * 63.0,
-                ))
-                .as_uvec4();
-
-                f32::from_bits(u32::from_bytes([
-                    base_color.x,
-                    base_color.y,
-                    base_color.z,
-                    base_color.w,
-                ]))
-            };
+            let base_color = self.base_color.clamp(Vec4::ZERO, Vec4::ONE);
 
-            vec4(x, y, z, w)
+            let emissive_g_u =
+                (self.emissive.y.clamp(0.0, 1.0) * 255.0).round() as u32;
+            let emissive_b_u =
+                (self.emissive.z.clamp(0.0, 1.0) * 255.0).round() as u32;
+
+            let emissive_packed = (emissive_g_u << 8) | emissive_b_u;
+            let w = emissive_packed as f32;
+
+            vec4(
+                base_color.x,
+                base_color.y,
+                base_color.z,
+                w, // Store packed emissive_g and emissive_b
+            )
         };
 
         [d0, d1]
diff --git a/strolle-gpu/src/hit.rs b/strolle-gpu/src/hit.rs
index b961da51..211d3a99 100644
--- a/strolle-gpu/src/hit.rs
+++ b/strolle-gpu/src/hit.rs
@@ -84,7 +84,7 @@ pub struct TriangleHit {
 impl TriangleHit {
     pub fn none() -> Self {
         Self {
-            distance: f32::MAX,
+            distance: 1000_000f32,
             point: Default::default(),
             normal: Default::default(),
             uv: Default::default(),
@@ -120,7 +120,7 @@ impl TriangleHit {
     }
 
     pub fn is_some(self) -> bool {
-        self.distance < f32::MAX
+        self.distance < 1000_000f32
     }
 
     pub fn is_none(self) -> bool {
diff --git a/strolle-gpu/src/light.rs b/strolle-gpu/src/light.rs
index 38e195aa..27705c66 100644
--- a/strolle-gpu/src/light.rs
+++ b/strolle-gpu/src/light.rs
@@ -7,11 +7,12 @@ use glam::{vec2, vec4, Vec2, Vec3, Vec4, Vec4Swizzles};
 use spirv_std::num_traits::Float;
 
 use crate::{
-    DiffuseBrdf, F32Ext, Hit, Normal, Ray, SpecularBrdf, Vec3Ext, WhiteNoise,
+    Vec3StrolleExt, DiffuseBrdf, F32Ext, Hit,
+    Normal, Ray, SpecularBrdf, Vec3Ext, WhiteNoise,
 };
 
 #[repr(C)]
-#[derive(Clone, Copy, Default, Pod, Zeroable)]
+#[derive(Clone, Copy, Pod, Zeroable)]
 #[cfg_attr(not(target_arch = "spirv"), derive(Debug))]
 pub struct Light {
     /// x - position x
@@ -41,6 +42,20 @@ pub struct Light {
     pub prev_d2: Vec4,
 }
 
+impl Default for Light {
+    fn default() -> Self {
+        Self {
+            d0: Vec4::new(0.0, 0.0, 0.0, 1.0), // Non-zero radius
+            d1: Vec4::new(0.0, 0.0, 0.0, 1.0), // Non-zero range
+            d2: Vec4::ZERO,
+            d3: Vec4::ZERO,
+            prev_d0: Vec4::ZERO,
+            prev_d1: Vec4::ZERO,
+            prev_d2: Vec4::ZERO,
+        }
+    }
+}
+
 impl Light {
     pub const TYPE_NONE: u32 = 0;
     pub const TYPE_POINT: u32 = 1;
@@ -50,7 +65,7 @@ impl Light {
         Self {
             // TODO incorrect
             d0: position.extend(25.0),
-            d1: color.extend(f32::INFINITY),
+            d1: color.extend(1000_000f32),
             d2: vec4(
                 f32::from_bits(Self::TYPE_POINT),
                 Default::default(),
@@ -152,7 +167,7 @@ impl Light {
             (1.0 - (angle / self.spot_angle()).powf(3.0)).saturate()
         };
 
-        let f_dist = if self.range() == f32::INFINITY {
+        let f_dist = if self.range() == 1000_000f32 {
             1.0
         } else {
             let l2 = l.length_squared();
@@ -216,23 +231,28 @@ impl Light {
 
     pub fn ray_bnoise(self, sample: Vec2, hit_point: Vec3) -> Ray {
         let to_light = self.center() - hit_point;
-        let light_dir = to_light.normalize();
         let light_distance = to_light.length();
-        let light_radius = self.radius() / light_distance;
-        let (light_tangent, light_bitangent) = light_dir.any_orthonormal_pair();
+
+        let safe_distance = light_distance.max(0.001);
+        let light_dir = to_light / safe_distance;
+
+        let safe_radius = self.radius().max(crate::STROLLE_EPSILON);
+        let light_radius = safe_radius / safe_distance;
+
+        let (light_tangent, light_bitangent) =
+            light_dir.safe_any_orthonormal_pair();
 
         let disk_point = {
             let angle = 2.0 * PI * sample.x;
-            let radius = sample.y.sqrt();
-
+            let radius = sample.y.max(crate::STROLLE_EPSILON).sqrt();
             vec2(angle.sin(), angle.cos()) * radius * light_radius
         };
 
-        let ray_dir = light_dir
-            + disk_point.x * light_tangent
-            + disk_point.y * light_bitangent;
-
-        let ray_dir = ray_dir.normalize();
+        let ray_dir = (
+            light_dir
+                + disk_point.x * light_tangent
+                + disk_point.y * light_bitangent
+        ).normalize();
 
         Ray::new(hit_point + ray_dir * light_distance, -ray_dir)
             .with_len(light_distance)
diff --git a/strolle-gpu/src/noise/white.rs b/strolle-gpu/src/noise/white.rs
index 9ddc9ec2..7824372c 100644
--- a/strolle-gpu/src/noise/white.rs
+++ b/strolle-gpu/src/noise/white.rs
@@ -4,7 +4,7 @@ use glam::{vec2, vec3, UVec2, Vec2, Vec3};
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::Float;
 
-use crate::F32Ext;
+use crate::{Vec3StrolleExt, F32Ext};
 
 #[derive(Clone, Copy)]
 pub struct WhiteNoise {
@@ -74,9 +74,9 @@ impl WhiteNoise {
     /// Generates a uniform sample on a hemisphere around given normal.
     pub fn sample_hemisphere(&mut self, normal: Vec3) -> Vec3 {
         let cos_theta = self.sample();
-        let sin_theta = (1.0f32 - cos_theta.sqr()).sqrt();
+        let sin_theta = (1.0f32 - cos_theta.sqr()).max(0.0).sqrt();
         let phi = 2.0 * PI * self.sample();
-        let (t, b) = normal.any_orthonormal_pair();
+        let (t, b) = normal.safe_any_orthonormal_pair();
 
         (t * phi.cos() + b * phi.sin()) * sin_theta + normal * cos_theta
     }
diff --git a/strolle-gpu/src/ray.rs b/strolle-gpu/src/ray.rs
index da2a9ccf..3b07c508 100644
--- a/strolle-gpu/src/ray.rs
+++ b/strolle-gpu/src/ray.rs
@@ -21,11 +21,20 @@ pub struct Ray {
 
 impl Ray {
     pub fn new(origin: Vec3, dir: Vec3) -> Self {
-        Self {
-            origin,
-            dir,
-            inv_dir: 1.0 / dir,
-            len: f32::MAX,
+        if dir.length() > 0.01 {
+            Self {
+                origin,
+                dir,
+                inv_dir: 1.0 / dir,
+                len: 1000_000f32,
+            }
+        } else {
+            Self {
+                origin,
+                dir,
+                inv_dir: Vec3::ZERO,
+                len: 1000_000f32,
+            }
         }
     }
 
@@ -280,7 +289,7 @@ impl Ray {
         }
 
         let mut tmin = 0.0;
-        let mut tmax = f32::MAX;
+        let mut tmax = 1000_000f32;
 
         let t1 = (aabb_min - self.origin) * self.inv_dir;
         let t2 = (aabb_max - self.origin) * self.inv_dir;
@@ -297,7 +306,7 @@ impl Ray {
         if tmin <= tmax {
             tmin
         } else {
-            f32::MAX
+            1000_000f32
         }
     }
 
diff --git a/strolle-gpu/src/reservoir/di.rs b/strolle-gpu/src/reservoir/di.rs
index 111fabe3..4f338330 100644
--- a/strolle-gpu/src/reservoir/di.rs
+++ b/strolle-gpu/src/reservoir/di.rs
@@ -13,52 +13,59 @@ pub struct DiReservoir {
     pub reservoir: Reservoir<DiSample>,
 }
 
-impl DiReservoir {
-    pub fn read(buffer: &[Vec4], id: usize) -> Self {
-        let d0 = unsafe { *buffer.index_unchecked(2 * id) };
-        let d1 = unsafe { *buffer.index_unchecked(2 * id + 1) };
-        let [is_occluded, confidence, ..] = d0.w.to_bits().to_bytes();
+#[repr(C)]
+#[derive(Clone, Copy, Default)]
+pub struct DiReservoirData {
+    pub m: f32,
+    pub w: f32,
+    pub pdf: f32,
+    pub confidence: f32,
+    pub is_occluded: u32,
+    pub light_id: u32,
+    // Add padding to align `light_point` to 16 bytes
+    _padding0: [u32; 2],
+    pub light_point: Vec3,
+}
 
+impl DiReservoir {
+    pub fn read(buffer: &[DiReservoirData], id: usize) -> Self {
+        let data = unsafe { *buffer.index_unchecked(id) };
         Self {
             reservoir: Reservoir {
                 sample: DiSample {
-                    pdf: d0.z,
-                    confidence: confidence as f32,
-                    light_id: LightId::new(d1.w.to_bits()),
-                    light_point: d1.xyz(),
-                    is_occluded: is_occluded > 0,
+                    pdf: data.pdf,
+                    confidence: data.confidence,
+                    light_id: LightId::new(data.light_id),
+                    light_point: data.light_point,
+                    is_occluded: data.is_occluded != 0,
                 },
-                m: d0.x,
-                w: d0.y,
+                m: data.m,
+                w: data.w,
             },
         }
     }
 
-    pub fn write(self, buffer: &mut [Vec4], id: usize) {
-        let d0 = vec4(
-            self.reservoir.m,
-            self.reservoir.w,
-            self.sample.pdf,
-            f32::from_bits(u32::from_bytes([
-                self.sample.is_occluded as u32,
-                self.sample.confidence as u32,
-                0,
-                0,
-            ])),
-        );
-
-        let d1 = self
-            .sample
-            .light_point
-            .extend(f32::from_bits(self.sample.light_id.get()));
-
+    pub fn write(self, buffer: &mut [DiReservoirData], id: usize) {
+        let data = DiReservoirData {
+            m: self.reservoir.m,
+            w: self.reservoir.w,
+            pdf: self.sample.pdf,
+            confidence: self.sample.confidence,
+            is_occluded: self.sample.is_occluded as u32,
+            light_id: self.sample.light_id.get(),
+            _padding0: [0u32; 2],
+            light_point: self.sample.light_point,
+        };
         unsafe {
-            *buffer.index_unchecked_mut(2 * id) = d0;
-            *buffer.index_unchecked_mut(2 * id + 1) = d1;
+            *buffer.index_unchecked_mut(id) = data;
         }
     }
 
-    pub fn copy(input: &[Vec4], output: &mut [Vec4], id: usize) {
+    pub fn copy(
+        input: &[DiReservoirData],
+        output: &mut [DiReservoirData],
+        id: usize,
+    ) {
         // TODO optimize
         Self::read(input, id).write(output, id);
     }
@@ -119,7 +126,8 @@ impl DiSample {
     pub fn ray(self, hit_point: Vec3) -> Ray {
         let dir = hit_point - self.light_point;
 
-        Ray::new(self.light_point, dir.normalize()).with_len(dir.length())
+        Ray::new(self.light_point, dir.normalize())
+            .with_len(dir.length())
     }
 }
 
@@ -147,7 +155,8 @@ mod tests {
             }
         }
 
-        let mut buffer = [Vec4::ZERO; 2 * 10];
+        let mut buffer =
+            [DiReservoirData::default(), DiReservoirData::default()];
 
         for idx in 0..10 {
             target(idx).write(&mut buffer, idx);
diff --git a/strolle-gpu/src/surface.rs b/strolle-gpu/src/surface.rs
index 0df86b20..52bdd449 100644
--- a/strolle-gpu/src/surface.rs
+++ b/strolle-gpu/src/surface.rs
@@ -1,4 +1,4 @@
-use glam::{UVec2, Vec3, Vec4Swizzles};
+use glam::{UVec2, Vec2, Vec3, Vec4Swizzles};
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::Float;
 
@@ -60,10 +60,17 @@ impl<'a> SurfaceMap<'a> {
     pub fn get(self, screen_pos: UVec2) -> Surface {
         let d0 = self.tex.read(screen_pos);
 
+        let depth = d0.x;
+        let normal = Normal::decode(Vec2::new(d0.y, d0.z));
+
+        let packed = d0.w.to_bits();
+        let roughness_u = (packed >> 16) & 0xFF;
+        let roughness = roughness_u as f32 / 255.0;
+
         Surface {
-            normal: Normal::decode(d0.xy()),
-            depth: d0.z,
-            roughness: d0.w,
+            normal: normal,
+            depth: depth,
+            roughness: roughness,
         }
     }
 }
diff --git a/strolle-gpu/src/triangle.rs b/strolle-gpu/src/triangle.rs
index bf52d5a5..f694c2ca 100644
--- a/strolle-gpu/src/triangle.rs
+++ b/strolle-gpu/src/triangle.rs
@@ -70,7 +70,7 @@ impl Triangle {
         let pvec = ray.dir().cross(v0v2);
         let det = v0v1.dot(pvec);
 
-        if det.abs() < f32::EPSILON {
+        if det.abs() < crate::STROLLE_EPSILON {
             return false;
         }
 
diff --git a/strolle-gpu/src/utils.rs b/strolle-gpu/src/utils.rs
index 36b6bdd8..aee54cba 100644
--- a/strolle-gpu/src/utils.rs
+++ b/strolle-gpu/src/utils.rs
@@ -6,7 +6,7 @@ mod vec3_ext;
 
 use core::ops;
 
-use glam::{uvec2, UVec2};
+use glam::{uvec2, UVec2, Vec3};
 use spirv_std::Image;
 
 pub use self::bilinear_filter::*;
@@ -41,3 +41,28 @@ pub fn resolve_checkerboard_alt(global_id: UVec2, frame: u32) -> UVec2 {
 pub fn got_checkerboard_at(screen_pos: UVec2, frame: u32) -> bool {
     screen_pos == resolve_checkerboard(screen_pos / uvec2(2, 1), frame)
 }
+
+use spirv_std::num_traits::Float;
+
+pub trait Vec3StrolleExt {
+    fn safe_any_orthonormal_pair(&self) -> (Vec3, Vec3);
+}
+
+impl Vec3StrolleExt for Vec3 {
+    fn safe_any_orthonormal_pair(&self) -> (Vec3, Vec3) {
+        let sign = 1.0f32.copysign(self.z);
+        let a = -1.0 / (sign + self.z);
+        let b = self.x * self.y * a;
+
+        (
+            Vec3::new(
+                1.0 + sign * self.x * self.x * a,
+                sign * b,
+                -sign * self.x,
+            ),
+            Vec3::new(b, sign + self.y * self.y * a, -self.y),
+        )
+    }
+}
+
+pub const STROLLE_EPSILON: f32 = 0.000_0001;
diff --git a/strolle-gpu/src/utils/f32_ext.rs b/strolle-gpu/src/utils/f32_ext.rs
index 9d989195..6ab0f6dc 100644
--- a/strolle-gpu/src/utils/f32_ext.rs
+++ b/strolle-gpu/src/utils/f32_ext.rs
@@ -21,7 +21,7 @@ impl F32Ext for f32 {
     }
 
     fn inverse_sqrt(self) -> Self {
-        1.0 / self.sqrt()
+        1.0 / self.max(crate::STROLLE_EPSILON).sqrt()
     }
 
     fn acos_approx(self) -> Self {
diff --git a/strolle-shader-builder/Cargo.toml b/strolle-shader-builder/Cargo.toml
index 46e34ed0..9ab8547f 100644
--- a/strolle-shader-builder/Cargo.toml
+++ b/strolle-shader-builder/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu" }
+spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "1932353935338c0ac5b7b150fae0551ddeaa1dad" }
diff --git a/strolle-shaders/Cargo.toml b/strolle-shaders/Cargo.toml
index b78e2dfb..e4d0bff2 100644
--- a/strolle-shaders/Cargo.toml
+++ b/strolle-shaders/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["dylib"]
 strolle-gpu = { path = "../strolle-gpu" }
 
 # Crates.io
-spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu" }
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "1932353935338c0ac5b7b150fae0551ddeaa1dad" }
\ No newline at end of file
diff --git a/strolle-shaders/src/di_resolving.rs b/strolle-shaders/src/di_resolving.rs
index 6ae809cc..2aeee684 100644
--- a/strolle-shaders/src/di_resolving.rs
+++ b/strolle-shaders/src/di_resolving.rs
@@ -24,11 +24,11 @@ pub fn main(
     #[spirv(descriptor_set = 1, binding = 4)]
     atmosphere_sky_lut_sampler: &Sampler,
     #[spirv(descriptor_set = 1, binding = 5)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 1, binding = 6)] prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 1, binding = 6)] prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 1, binding = 7, storage_buffer)]
-    next_reservoirs: &[Vec4],
+    next_reservoirs: &[DiReservoirData],
     #[spirv(descriptor_set = 1, binding = 8, storage_buffer)]
-    prev_reservoirs: &mut [Vec4],
+    prev_reservoirs: &mut [DiReservoirData],
     #[spirv(descriptor_set = 1, binding = 9)] diff_output: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 10)] spec_output: TexRgba32,
 ) {
@@ -64,6 +64,7 @@ pub fn main(
 
     let confidence;
     let radiance;
+    let metallic;
 
     if hit.is_some() {
         let is_occluded = res.sample.ray(hit.point).intersect(
@@ -79,7 +80,7 @@ pub fn main(
         confidence = if res.sample.is_occluded == is_occluded {
             res.sample.confidence
         } else {
-            0.0
+            0.01
         };
 
         res.sample.confidence = 1.0;
@@ -90,18 +91,24 @@ pub fn main(
         } else {
             lights.get(res.sample.light_id).radiance(hit) * res.w
         };
+
+        metallic = hit.gbuffer.metallic;
     } else {
         confidence = 1.0;
 
+        let dir = hit.dir;
+
         radiance = LightRadiance {
-            radiance: atmosphere.sample(world.sun_dir(), hit.dir),
+            radiance: atmosphere.sample(world.sun_dir(), dir),
             diff_brdf: Vec3::ONE,
             spec_brdf: Vec3::ZERO,
         };
+
+        metallic = 0.0;
     };
 
     unsafe {
-        let diff_brdf = (1.0 - hit.gbuffer.metallic) / PI;
+        let diff_brdf = (1.0 - metallic) * (1.0 / PI);
         let spec_brdf = radiance.spec_brdf;
 
         diff_output.write(
diff --git a/strolle-shaders/src/di_sampling.rs b/strolle-shaders/src/di_sampling.rs
index 5351dd0a..1c5a2c94 100644
--- a/strolle-shaders/src/di_sampling.rs
+++ b/strolle-shaders/src/di_sampling.rs
@@ -19,9 +19,9 @@ pub fn main(
     #[spirv(descriptor_set = 0, binding = 7, uniform)] world: &World,
     #[spirv(descriptor_set = 1, binding = 0, uniform)] camera: &Camera,
     #[spirv(descriptor_set = 1, binding = 1)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 1, binding = 2)] prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 1, binding = 2)] prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 1, binding = 3, storage_buffer)]
-    out_reservoirs: &mut [Vec4],
+    out_reservoirs: &mut [DiReservoirData],
 ) {
     let screen_pos = global_id.xy();
     let screen_idx = camera.screen_to_idx(screen_pos);
diff --git a/strolle-shaders/src/di_spatial_resampling.rs b/strolle-shaders/src/di_spatial_resampling.rs
index b8696d1f..f5f16982 100644
--- a/strolle-shaders/src/di_spatial_resampling.rs
+++ b/strolle-shaders/src/di_spatial_resampling.rs
@@ -8,9 +8,9 @@ pub fn pick(
     lights: &[Light],
     #[spirv(descriptor_set = 1, binding = 0, uniform)] camera: &Camera,
     #[spirv(descriptor_set = 1, binding = 1)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 1, binding = 2)] prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 1, binding = 2)] prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 1, binding = 3, storage_buffer)]
-    reservoirs: &[Vec4],
+    reservoirs: &[DiReservoirData],
     #[spirv(descriptor_set = 1, binding = 4)] buf_d0: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 5)] buf_d1: TexRgba32,
 ) {
@@ -214,9 +214,9 @@ pub fn sample(
     #[spirv(push_constant)] params: &PassParams,
     #[spirv(descriptor_set = 0, binding = 0, uniform)] camera: &Camera,
     #[spirv(descriptor_set = 0, binding = 1, storage_buffer)]
-    in_reservoirs: &[Vec4],
+    in_reservoirs: &[DiReservoirData],
     #[spirv(descriptor_set = 0, binding = 2, storage_buffer)]
-    out_reservoirs: &mut [Vec4],
+    out_reservoirs: &mut [DiReservoirData],
     #[spirv(descriptor_set = 0, binding = 3)] buf_d2: TexRgba32,
 ) {
     let global_id = global_id.xy();
diff --git a/strolle-shaders/src/di_temporal_resampling.rs b/strolle-shaders/src/di_temporal_resampling.rs
index 92fdbc02..fc7bce6a 100644
--- a/strolle-shaders/src/di_temporal_resampling.rs
+++ b/strolle-shaders/src/di_temporal_resampling.rs
@@ -10,13 +10,13 @@ pub fn main(
     #[spirv(descriptor_set = 1, binding = 1, uniform)] prev_camera: &Camera,
     #[spirv(descriptor_set = 1, binding = 2)] reprojection_map: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 3)] curr_prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 1, binding = 4)] curr_prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 1, binding = 4)] curr_prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 1, binding = 5)] prev_prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 1, binding = 6)] prev_prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 1, binding = 6)] prev_prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 1, binding = 7, storage_buffer)]
-    prev_reservoirs: &[Vec4],
+    prev_reservoirs: &[DiReservoirData],
     #[spirv(descriptor_set = 1, binding = 8, storage_buffer)]
-    curr_reservoirs: &mut [Vec4],
+    curr_reservoirs: &mut [DiReservoirData],
 ) {
     let lhs_pos = global_id.xy();
     let lhs_idx = curr_camera.screen_to_idx(lhs_pos);
diff --git a/strolle-shaders/src/frame_composition.rs b/strolle-shaders/src/frame_composition.rs
index 84507fe6..e746f00c 100644
--- a/strolle-shaders/src/frame_composition.rs
+++ b/strolle-shaders/src/frame_composition.rs
@@ -20,7 +20,7 @@ pub fn fs(
     #[spirv(frag_coord)] pos: Vec4,
     #[spirv(push_constant)] params: &FrameCompositionPassParams,
     #[spirv(descriptor_set = 0, binding = 0)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 1)] prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 1)] prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 0, binding = 2)] di_diff_colors: TexRgba32,
     #[spirv(descriptor_set = 0, binding = 3)] di_spec_colors: TexRgba32,
     #[spirv(descriptor_set = 0, binding = 4)] gi_diff_colors: TexRgba32,
diff --git a/strolle-shaders/src/frame_denoising.rs b/strolle-shaders/src/frame_denoising.rs
index be37711e..b6f16c40 100644
--- a/strolle-shaders/src/frame_denoising.rs
+++ b/strolle-shaders/src/frame_denoising.rs
@@ -4,7 +4,7 @@ use strolle_gpu::prelude::*;
 pub fn reproject(
     #[spirv(global_invocation_id)] global_id: UVec3,
     #[spirv(descriptor_set = 0, binding = 0, uniform)] camera: &Camera,
-    #[spirv(descriptor_set = 0, binding = 1)] prim_surface_map: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 1)] prim_gbuffer_d0: TexRgba32,
     #[spirv(descriptor_set = 0, binding = 2)] reprojection_map: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 0)] prev_colors: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 1)] prev_moments: TexRgba32,
@@ -13,7 +13,7 @@ pub fn reproject(
     #[spirv(descriptor_set = 1, binding = 4)] moments: TexRgba32,
 ) {
     let screen_pos = global_id.xy();
-    let prim_surface_map = SurfaceMap::new(prim_surface_map);
+    let prim_surface_map = SurfaceMap::new(prim_gbuffer_d0);
     let reprojection_map = ReprojectionMap::new(reprojection_map);
 
     if !camera.contains(screen_pos) {
@@ -81,7 +81,7 @@ pub fn reproject(
 pub fn estimate_variance(
     #[spirv(global_invocation_id)] global_id: UVec3,
     #[spirv(descriptor_set = 0, binding = 0, uniform)] camera: &Camera,
-    #[spirv(descriptor_set = 0, binding = 1)] prim_surface_map: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 1)] prim_gbuffer_d0: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 0)] di_colors: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 1)] di_moments: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 2)] di_output: TexRgba32,
@@ -90,7 +90,7 @@ pub fn estimate_variance(
     #[spirv(descriptor_set = 2, binding = 2)] gi_output: TexRgba32,
 ) {
     let screen_pos = global_id.xy();
-    let prim_surface_map = SurfaceMap::new(prim_surface_map);
+    let prim_surface_map = SurfaceMap::new(prim_gbuffer_d0);
 
     if !camera.contains(screen_pos) {
         return;
@@ -222,7 +222,7 @@ pub fn wavelet(
     #[spirv(push_constant)] params: &FrameDenoisingWaveletPassParams,
     #[spirv(descriptor_set = 0, binding = 0)] blue_noise_tex: TexRgba8,
     #[spirv(descriptor_set = 0, binding = 1, uniform)] camera: &Camera,
-    #[spirv(descriptor_set = 0, binding = 2)] prim_surface_map: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d0: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 0)] di_input: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 1)] di_output: TexRgba32,
     #[spirv(descriptor_set = 2, binding = 0)] gi_input: TexRgba32,
@@ -230,7 +230,7 @@ pub fn wavelet(
 ) {
     let screen_pos = global_id.xy();
     let bnoise = BlueNoise::new(blue_noise_tex, screen_pos, params.frame);
-    let prim_surface_map = SurfaceMap::new(prim_surface_map);
+    let prim_surface_map = SurfaceMap::new(prim_gbuffer_d0);
 
     if !camera.contains(screen_pos) {
         return;
diff --git a/strolle-shaders/src/frame_reprojection.rs b/strolle-shaders/src/frame_reprojection.rs
index 4eecaf44..84e1b286 100644
--- a/strolle-shaders/src/frame_reprojection.rs
+++ b/strolle-shaders/src/frame_reprojection.rs
@@ -8,14 +8,14 @@ pub fn main(
     #[spirv(global_invocation_id)] global_id: UVec3,
     #[spirv(descriptor_set = 0, binding = 0, uniform)] camera: &Camera,
     #[spirv(descriptor_set = 0, binding = 1, uniform)] prev_camera: &Camera,
-    #[spirv(descriptor_set = 0, binding = 2)] prim_surface_map: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 3)] prev_prim_surface_map: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 4)] velocity_map: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d0: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 3)] prev_prim_gbuffer_d0: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 4)] velocity_map: TexRgba16,
     #[spirv(descriptor_set = 0, binding = 5)] reprojection_map: TexRgba32,
 ) {
     let screen_pos = global_id.xy();
-    let prim_surface_map = SurfaceMap::new(prim_surface_map);
-    let prev_prim_surface_map = SurfaceMap::new(prev_prim_surface_map);
+    let prim_surface_map = SurfaceMap::new(prim_gbuffer_d0);
+    let prev_prim_surface_map = SurfaceMap::new(prev_prim_gbuffer_d0);
     let reprojection_map = ReprojectionMap::new(reprojection_map);
 
     if !camera.contains(screen_pos) {
diff --git a/strolle-shaders/src/gi_preview_resampling.rs b/strolle-shaders/src/gi_preview_resampling.rs
index a5125d5d..74e3005c 100644
--- a/strolle-shaders/src/gi_preview_resampling.rs
+++ b/strolle-shaders/src/gi_preview_resampling.rs
@@ -6,19 +6,18 @@ pub fn main(
     #[spirv(push_constant)] params: &GiPreviewResamplingPass,
     #[spirv(descriptor_set = 0, binding = 0, uniform)] camera: &Camera,
     #[spirv(descriptor_set = 0, binding = 1)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d1: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 3)] prim_surface_map: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 4, storage_buffer)]
+    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d1: TexRgba16,
+    #[spirv(descriptor_set = 0, binding = 3, storage_buffer)]
     in_reservoirs_a: &[Vec4],
-    #[spirv(descriptor_set = 0, binding = 5, storage_buffer)]
+    #[spirv(descriptor_set = 0, binding = 4, storage_buffer)]
     in_reservoirs_b: &[Vec4],
-    #[spirv(descriptor_set = 0, binding = 6, storage_buffer)]
+    #[spirv(descriptor_set = 0, binding = 5, storage_buffer)]
     out_reservoirs: &mut [Vec4],
 ) {
     let center_pos = global_id.xy();
     let center_idx = camera.screen_to_idx(center_pos);
     let mut wnoise = WhiteNoise::new(params.seed, center_pos);
-    let prim_surface_map = SurfaceMap::new(prim_surface_map);
+    let prim_surface_map = SurfaceMap::new(prim_gbuffer_d0);
 
     if !camera.contains(center_pos) {
         return;
diff --git a/strolle-shaders/src/gi_reprojection.rs b/strolle-shaders/src/gi_reprojection.rs
index 999aa5f1..711b4a1a 100644
--- a/strolle-shaders/src/gi_reprojection.rs
+++ b/strolle-shaders/src/gi_reprojection.rs
@@ -5,7 +5,7 @@ pub fn main(
     #[spirv(global_invocation_id)] global_id: UVec3,
     #[spirv(descriptor_set = 0, binding = 0, uniform)] camera: &Camera,
     #[spirv(descriptor_set = 0, binding = 1)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 0, binding = 3)] reprojection_map: TexRgba32,
     #[spirv(descriptor_set = 0, binding = 4, storage_buffer)]
     in_reservoirs: &[Vec4],
diff --git a/strolle-shaders/src/gi_resolving.rs b/strolle-shaders/src/gi_resolving.rs
index 63d678a8..62e14a37 100644
--- a/strolle-shaders/src/gi_resolving.rs
+++ b/strolle-shaders/src/gi_resolving.rs
@@ -6,7 +6,7 @@ pub fn main(
     #[spirv(push_constant)] params: &GiResolvingPassParams,
     #[spirv(descriptor_set = 0, binding = 0, uniform)] camera: &Camera,
     #[spirv(descriptor_set = 0, binding = 1)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 0, binding = 3, storage_buffer)]
     in_reservoirs_a: &[Vec4],
     #[spirv(descriptor_set = 0, binding = 4, storage_buffer)]
diff --git a/strolle-shaders/src/gi_sampling_a.rs b/strolle-shaders/src/gi_sampling_a.rs
index 766b05f6..b0bc7d6c 100644
--- a/strolle-shaders/src/gi_sampling_a.rs
+++ b/strolle-shaders/src/gi_sampling_a.rs
@@ -15,7 +15,7 @@ pub fn main(
     #[spirv(descriptor_set = 0, binding = 4)] atlas_sampler: &Sampler,
     #[spirv(descriptor_set = 1, binding = 0, uniform)] camera: &Camera,
     #[spirv(descriptor_set = 1, binding = 1)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 1, binding = 2)] prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 1, binding = 2)] prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 1, binding = 3)] gi_d0: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 4)] gi_d1: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 5)] gi_d2: TexRgba32,
diff --git a/strolle-shaders/src/gi_sampling_b.rs b/strolle-shaders/src/gi_sampling_b.rs
index 6a5a1043..cf03ad82 100644
--- a/strolle-shaders/src/gi_sampling_b.rs
+++ b/strolle-shaders/src/gi_sampling_b.rs
@@ -25,7 +25,7 @@ pub fn main(
     #[spirv(descriptor_set = 1, binding = 4)]
     atmosphere_sky_lut_sampler: &Sampler,
     #[spirv(descriptor_set = 1, binding = 5)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 1, binding = 6)] prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 1, binding = 6)] prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 1, binding = 7)] gi_d0: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 8)] gi_d1: TexRgba32,
     #[spirv(descriptor_set = 1, binding = 9)] gi_d2: TexRgba32,
@@ -197,7 +197,7 @@ pub fn main(
 
     if gi_hit.is_some() {
         radiance *= gi_hit.gbuffer.base_color.xyz() / PI;
-        radiance += gi_hit.gbuffer.emissive;
+        radiance += gi_hit.gbuffer.emissive * 60.0; //Emissive strength should be parameterised somehow.
     }
 
     // -------------------------------------------------------------------------
diff --git a/strolle-shaders/src/gi_spatial_resampling.rs b/strolle-shaders/src/gi_spatial_resampling.rs
index 1258f634..8758e438 100644
--- a/strolle-shaders/src/gi_spatial_resampling.rs
+++ b/strolle-shaders/src/gi_spatial_resampling.rs
@@ -6,7 +6,7 @@ pub fn pick(
     #[spirv(push_constant)] params: &PassParams,
     #[spirv(descriptor_set = 0, binding = 0, uniform)] camera: &Camera,
     #[spirv(descriptor_set = 0, binding = 1)] prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 2)] prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 0, binding = 3, storage_buffer)]
     reservoirs: &[Vec4],
     #[spirv(descriptor_set = 0, binding = 4)] buf_d0: TexRgba32,
diff --git a/strolle-shaders/src/gi_temporal_resampling.rs b/strolle-shaders/src/gi_temporal_resampling.rs
index bfdbed74..9e60b24b 100644
--- a/strolle-shaders/src/gi_temporal_resampling.rs
+++ b/strolle-shaders/src/gi_temporal_resampling.rs
@@ -7,9 +7,9 @@ pub fn main(
     #[spirv(descriptor_set = 0, binding = 0, uniform)] curr_camera: &Camera,
     #[spirv(descriptor_set = 0, binding = 1, uniform)] prev_camera: &Camera,
     #[spirv(descriptor_set = 0, binding = 2)] curr_prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 3)] curr_prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 3)] curr_prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 0, binding = 4)] prev_prim_gbuffer_d0: TexRgba32,
-    #[spirv(descriptor_set = 0, binding = 5)] prev_prim_gbuffer_d1: TexRgba32,
+    #[spirv(descriptor_set = 0, binding = 5)] prev_prim_gbuffer_d1: TexRgba16,
     #[spirv(descriptor_set = 0, binding = 6)] reprojection_map: TexRgba32,
     #[spirv(descriptor_set = 0, binding = 7, storage_buffer)]
     prev_reservoirs: &[Vec4],
diff --git a/strolle-shaders/src/prim_raster.rs b/strolle-shaders/src/prim_raster.rs
index af94e2e0..ae2adb83 100644
--- a/strolle-shaders/src/prim_raster.rs
+++ b/strolle-shaders/src/prim_raster.rs
@@ -59,7 +59,6 @@ pub fn fs(
     // Outputs
     out_prim_gbuffer_d0: &mut Vec4,
     out_prim_gbuffer_d1: &mut Vec4,
-    out_surface: &mut Vec4,
     out_velocity: &mut Vec4,
 ) {
     let material = MaterialsView::new(materials)
@@ -105,12 +104,6 @@ pub fn fs(
 
     // -------------------------------------------------------------------------
 
-    *out_surface = Normal::encode(normal)
-        .extend(depth)
-        .extend(material.roughness);
-
-    // -------------------------------------------------------------------------
-
     *out_velocity = {
         let velocity = camera.clip_to_screen(curr_vertex)
             - prev_camera.clip_to_screen(prev_vertex);
diff --git a/strolle-shaders/src/ref_shading.rs b/strolle-shaders/src/ref_shading.rs
index e71214a2..a6c1acaf 100644
--- a/strolle-shaders/src/ref_shading.rs
+++ b/strolle-shaders/src/ref_shading.rs
@@ -50,7 +50,7 @@ pub fn main(
 
     // -------------------------------------------------------------------------
 
-    if params.depth == u8::MAX as u32 {
+    if params.depth == 255u32 {
         let prev_color = if camera.is_eq(*prev_camera) {
             colors.read(screen_pos)
         } else {
diff --git a/strolle/Cargo.toml b/strolle/Cargo.toml
index a13406ee..3aa85442 100644
--- a/strolle/Cargo.toml
+++ b/strolle/Cargo.toml
@@ -12,14 +12,14 @@ strolle-shaders = { path = "../strolle-shaders" }
 bytemuck = "1.13.1"
 derivative = "2.2.0"
 fxhash = "0.2.1"
-glam = "0.24"
+glam = "0.27.0"
 guillotiere = "0.6.2"
 humantime = { version = "2.1.0", optional = true }
 image = { version = "0.24.6", default-features = false, features = ["png"] }
 log = "0.4.18"
 rand = "0.8.5"
-spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu" }
-wgpu = { version = "0.17.2", features = ["spirv"] }
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "1932353935338c0ac5b7b150fae0551ddeaa1dad" }
+wgpu = { version = "0.20.1", features = ["spirv"] }
 
 [features]
 metrics = ["humantime"]
diff --git a/strolle/src/bvh/builder.rs b/strolle/src/bvh/builder.rs
index 94108866..a67353c3 100644
--- a/strolle/src/bvh/builder.rs
+++ b/strolle/src/bvh/builder.rs
@@ -4,7 +4,6 @@ use std::hash::{Hash, Hasher};
 use std::thread;
 
 use fxhash::FxHasher;
-use glam::UVec3;
 
 use super::{
     BvhNode, BvhNodeHash, BvhNodeId, BvhNodes, BvhPrimitiveId, BvhPrimitives,
@@ -86,7 +85,7 @@ fn find_splitting_plane(
 
     let centroid_bb: BoundingBox = primitives
         .iter()
-        .map(|primitive| primitive.center)
+        .map(|primitive| { primitive.center })
         .collect();
 
     let mut bins = [[Bin::default(); BINS]; 3];
@@ -94,7 +93,8 @@ fn find_splitting_plane(
 
     for primitive in primitives {
         let bin_id = scale * (primitive.center - centroid_bb.min());
-        let bin_id = bin_id.as_uvec3().min(UVec3::splat((BINS as u32) - 1));
+        let bin_id =
+            bin_id.as_uvec3().min(glam::UVec3::splat((BINS as u32) - 1));
         let bin_idx = bin_id.x as usize;
         let bin_idy = bin_id.y as usize;
         let bin_idz = bin_id.z as usize;
@@ -165,8 +165,8 @@ fn find_splitting_plane(
             if is_current_bin_better {
                 let split_by = Axis::from(axis);
 
-                let split_at = centroid_bb.min()[split_by]
-                    + scale[split_by] * ((i + 1) as f32);
+                let split_at = centroid_bb.min()[split_by as usize]
+                    + scale[split_by as usize] * ((i + 1) as f32);
 
                 best = Some(SplittingPlane {
                     split_by,
@@ -211,7 +211,7 @@ fn split(
     while left_prim_idx <= right_prim_idx {
         let primitive = primitives_data[left_prim_idx as usize];
 
-        if primitive.center[plane.split_by] < plane.split_at {
+        if primitive.center[plane.split_by as usize] < plane.split_at {
             left_prim_idx += 1;
             left_bounds += primitive.bounds;
 
diff --git a/strolle/src/bvh/serializer.rs b/strolle/src/bvh/serializer.rs
index 0203525d..0592157c 100644
--- a/strolle/src/bvh/serializer.rs
+++ b/strolle/src/bvh/serializer.rs
@@ -8,7 +8,7 @@ pub fn run<P>(
     materials: &Materials<P>,
     nodes: &BvhNodes,
     primitives: &BvhPrimitives,
-    buffer: &mut Vec<Vec4>,
+    buffer: &mut Vec<spirv_std::glam::Vec4>,
 ) where
     P: Params,
 {
@@ -21,7 +21,7 @@ fn serialize<P>(
     materials: &Materials<P>,
     nodes: &BvhNodes,
     primitives: &BvhPrimitives,
-    buffer: &mut Vec<Vec4>,
+    buffer: &mut Vec<spirv_std::glam::Vec4>,
     id: BvhNodeId,
 ) -> u32
 where
diff --git a/strolle/src/camera.rs b/strolle/src/camera.rs
index ea63e852..50050371 100644
--- a/strolle/src/camera.rs
+++ b/strolle/src/camera.rs
@@ -1,9 +1,10 @@
 use std::fmt;
 
 use log::info;
-use spirv_std::glam::{uvec2, Mat4, UVec2, Vec3};
+use glam::{uvec2, Mat4, UVec2, Vec3};
 
 use crate::gpu;
+use crate::utils::ToGpu;
 
 #[derive(Clone, Debug, Default)]
 pub struct Camera {
@@ -49,19 +50,22 @@ impl Camera {
 
     pub(crate) fn serialize(&self) -> gpu::Camera {
         gpu::Camera {
-            projection_view: self.projection * self.transform.inverse(),
-            ndc_to_world: self.transform * self.projection.inverse(),
-            origin: self
+            projection_view: (self.projection * self.transform.inverse())
+                .to_gpu(),
+            ndc_to_world: (self.transform * self.projection.inverse()).to_gpu(),
+            origin: (self
                 .transform
                 .to_scale_rotation_translation()
                 .2
-                .extend(Default::default()),
-            screen: self
+                .extend(Default::default()))
+            .to_gpu(),
+            screen: (self
                 .viewport
                 .size
                 .as_vec2()
                 .extend(Default::default())
-                .extend(Default::default()),
+                .extend(Default::default()))
+            .to_gpu(),
         }
     }
 }
diff --git a/strolle/src/camera_controller/buffers.rs b/strolle/src/camera_controller/buffers.rs
index 334278e0..a2fd4dcb 100644
--- a/strolle/src/camera_controller/buffers.rs
+++ b/strolle/src/camera_controller/buffers.rs
@@ -1,8 +1,9 @@
 use log::debug;
-
+use strolle_gpu::DiReservoirData;
 use crate::{
     gpu, Camera, DoubleBuffered, MappedUniformBuffer, StorageBuffer, Texture,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct CameraBuffers {
@@ -16,7 +17,6 @@ pub struct CameraBuffers {
     pub prim_depth: Texture,
     pub prim_gbuffer_d0: DoubleBuffered<Texture>,
     pub prim_gbuffer_d1: DoubleBuffered<Texture>,
-    pub prim_surface_map: DoubleBuffered<Texture>,
 
     pub reprojection_map: Texture,
     pub velocity_map: Texture,
@@ -99,7 +99,7 @@ impl CameraBuffers {
         // ---------------------------------------------------------------------
 
         let prim_depth = Texture::builder("prim_depth")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Depth32Float)
             .with_usage(wgpu::TextureUsages::RENDER_ATTACHMENT)
             .build(device);
@@ -107,7 +107,7 @@ impl CameraBuffers {
         let prim_gbuffer_d0 = DoubleBuffered::<Texture>::new(
             device,
             Texture::builder("prim_gbuffer_d0")
-                .with_size(camera.viewport.size)
+                .with_size(camera.viewport.size.to_gpu())
                 .with_format(wgpu::TextureFormat::Rgba32Float)
                 .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
                 .with_usage(wgpu::TextureUsages::RENDER_ATTACHMENT),
@@ -116,17 +116,8 @@ impl CameraBuffers {
         let prim_gbuffer_d1 = DoubleBuffered::<Texture>::new(
             device,
             Texture::builder("prim_gbuffer_d1")
-                .with_size(camera.viewport.size)
-                .with_format(wgpu::TextureFormat::Rgba32Float)
-                .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
-                .with_usage(wgpu::TextureUsages::RENDER_ATTACHMENT),
-        );
-
-        let prim_surface_map = DoubleBuffered::<Texture>::new(
-            device,
-            Texture::builder("prim_surface_map")
-                .with_size(camera.viewport.size)
-                .with_format(wgpu::TextureFormat::Rgba32Float)
+                .with_size(camera.viewport.size.to_gpu())
+                .with_format(wgpu::TextureFormat::Rgba16Float)
                 .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
                 .with_usage(wgpu::TextureUsages::RENDER_ATTACHMENT),
         );
@@ -134,44 +125,47 @@ impl CameraBuffers {
         // ---------------------------------------------------------------------
 
         let reprojection_map = Texture::builder("reprojection_map")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
 
         let velocity_map = Texture::builder("velocity_map")
-            .with_size(camera.viewport.size)
-            .with_format(wgpu::TextureFormat::Rgba32Float)
+            .with_size(camera.viewport.size.to_gpu())
+            .with_format(wgpu::TextureFormat::Rgba16Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .with_usage(wgpu::TextureUsages::RENDER_ATTACHMENT)
             .build(device);
 
         // ---------------------------------------------------------------------
 
+        let element_size = std::mem::size_of::<DiReservoirData>();
+        let element_size_round =
+            (element_size as f32 / 32.0).ceil() as usize * 32;
         let di_reservoirs = [0, 1, 2].map(|idx| {
             StorageBuffer::new(
                 device,
                 format!("di_reservoir_{}", idx),
-                viewport_buffer_size(2 * 4 * 4),
+                viewport_buffer_size(element_size_round),
             )
         });
 
         // ---
 
         let di_diff_samples = Texture::builder("di_diff_samples")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
 
         let di_diff_prev_colors = Texture::builder("di_diff_prev_colors")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
 
         let di_diff_curr_colors = Texture::builder("di_diff_curr_colors")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
@@ -179,13 +173,13 @@ impl CameraBuffers {
         let di_diff_moments = DoubleBuffered::<Texture>::new(
             device,
             Texture::builder("di_diff_moments")
-                .with_size(camera.viewport.size)
+                .with_size(camera.viewport.size.to_gpu())
                 .with_format(wgpu::TextureFormat::Rgba32Float)
                 .with_usage(wgpu::TextureUsages::STORAGE_BINDING),
         );
 
         let di_diff_stash = Texture::builder("di_diff_stash")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
@@ -193,7 +187,7 @@ impl CameraBuffers {
         // ---
 
         let di_spec_samples = Texture::builder("di_spec_samples")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
@@ -201,19 +195,19 @@ impl CameraBuffers {
         // ---------------------------------------------------------------------
 
         let gi_d0 = Texture::builder("gi_d0")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
 
         let gi_d1 = Texture::builder("gi_d1")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
 
         let gi_d2 = Texture::builder("gi_d2")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
@@ -229,19 +223,19 @@ impl CameraBuffers {
         // ---
 
         let gi_diff_samples = Texture::builder("gi_diff_samples")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
 
         let gi_diff_prev_colors = Texture::builder("gi_diff_prev_colors")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
 
         let gi_diff_curr_colors = Texture::builder("gi_diff_curr_colors")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
@@ -249,13 +243,13 @@ impl CameraBuffers {
         let gi_diff_moments = DoubleBuffered::<Texture>::new(
             device,
             Texture::builder("gi_diff_moments")
-                .with_size(camera.viewport.size)
+                .with_size(camera.viewport.size.to_gpu())
                 .with_format(wgpu::TextureFormat::Rgba32Float)
                 .with_usage(wgpu::TextureUsages::STORAGE_BINDING),
         );
 
         let gi_diff_stash = Texture::builder("gi_diff_stash")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
@@ -263,7 +257,7 @@ impl CameraBuffers {
         // ---
 
         let gi_spec_samples = Texture::builder("gi_spec_samples")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
@@ -286,7 +280,7 @@ impl CameraBuffers {
 
         // TODO initialize lazily
         let ref_colors = Texture::builder("ref_colors")
-            .with_size(camera.viewport.size)
+            .with_size(camera.viewport.size.to_gpu())
             .with_format(wgpu::TextureFormat::Rgba32Float)
             .with_usage(wgpu::TextureUsages::STORAGE_BINDING)
             .build(device);
@@ -304,7 +298,6 @@ impl CameraBuffers {
             prim_depth,
             prim_gbuffer_d0,
             prim_gbuffer_d1,
-            prim_surface_map,
 
             reprojection_map,
             velocity_map,
diff --git a/strolle/src/camera_controller/pass.rs b/strolle/src/camera_controller/pass.rs
index 6cd288b2..9b50c2e4 100644
--- a/strolle/src/camera_controller/pass.rs
+++ b/strolle/src/camera_controller/pass.rs
@@ -42,6 +42,7 @@ where
         let mut pass =
             encoder.begin_compute_pass(&wgpu::ComputePassDescriptor {
                 label: Some(&label),
+                timestamp_writes: None,
             });
 
         pass.set_pipeline(&self.pipeline);
@@ -136,7 +137,8 @@ where
                 label: Some(&pipeline_label),
                 layout: Some(&pipeline_layout),
                 module,
-                entry_point,
+                entry_point: entry_point,
+                compilation_options: Default::default(),
             });
 
         CameraComputePass {
diff --git a/strolle/src/camera_controller/passes/bvh_heatmap.rs b/strolle/src/camera_controller/passes/bvh_heatmap.rs
index bfe0885d..efd24d0c 100644
--- a/strolle/src/camera_controller/passes/bvh_heatmap.rs
+++ b/strolle/src/camera_controller/passes/bvh_heatmap.rs
@@ -1,6 +1,7 @@
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct BvhHeatmapPass {
@@ -41,6 +42,6 @@ impl BvhHeatmapPass {
         // This pass uses 8x8 warps:
         let size = (camera.camera.viewport.size + 7) / 8;
 
-        self.pass.run(camera, encoder, size, ());
+        self.pass.run(camera, encoder, size.to_gpu(), ());
     }
 }
diff --git a/strolle/src/camera_controller/passes/di_resolving.rs b/strolle/src/camera_controller/passes/di_resolving.rs
index a76699b0..d4c60883 100644
--- a/strolle/src/camera_controller/passes/di_resolving.rs
+++ b/strolle/src/camera_controller/passes/di_resolving.rs
@@ -1,6 +1,7 @@
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct DiResolvingPass {
@@ -50,6 +51,6 @@ impl DiResolvingPass {
         // This pass uses 8x8 warps:
         let size = (camera.camera.viewport.size + 7) / 8;
 
-        self.pass.run(camera, encoder, size, camera.pass_params());
+        self.pass.run(camera, encoder, size.to_gpu(), camera.pass_params());
     }
 }
diff --git a/strolle/src/camera_controller/passes/di_sampling.rs b/strolle/src/camera_controller/passes/di_sampling.rs
index 60644025..51e9e82a 100644
--- a/strolle/src/camera_controller/passes/di_sampling.rs
+++ b/strolle/src/camera_controller/passes/di_sampling.rs
@@ -1,6 +1,7 @@
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct DiSamplingPass {
@@ -46,6 +47,6 @@ impl DiSamplingPass {
         // This pass uses 8x8 warps:
         let size = (camera.camera.viewport.size + 7) / 8;
 
-        self.pass.run(camera, encoder, size, camera.pass_params());
+        self.pass.run(camera, encoder, size.to_gpu(), camera.pass_params());
     }
 }
diff --git a/strolle/src/camera_controller/passes/di_spatial_resampling.rs b/strolle/src/camera_controller/passes/di_spatial_resampling.rs
index 0eff3d27..beed2959 100644
--- a/strolle/src/camera_controller/passes/di_spatial_resampling.rs
+++ b/strolle/src/camera_controller/passes/di_spatial_resampling.rs
@@ -3,6 +3,7 @@ use glam::uvec2;
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct DiSpatialResamplingPass {
@@ -81,21 +82,21 @@ impl DiSpatialResamplingPass {
         self.pick_pass.run(
             camera,
             encoder,
-            (camera.camera.viewport.size + 7) / 8 / uvec2(2, 1),
+            ((camera.camera.viewport.size + 7) / 8 / uvec2(2, 1)).to_gpu(),
             camera.pass_params(),
         );
 
         self.trace_pass.run(
             camera,
             encoder,
-            (camera.camera.viewport.size + 7) / 8,
+            ((camera.camera.viewport.size + 7) / 8).to_gpu(),
             camera.pass_params(),
         );
 
         self.sample_pass.run(
             camera,
             encoder,
-            (camera.camera.viewport.size + 7) / 8 / uvec2(2, 1),
+            ((camera.camera.viewport.size + 7) / 8 / uvec2(2, 1)).to_gpu(),
             camera.pass_params(),
         );
     }
diff --git a/strolle/src/camera_controller/passes/di_temporal_resampling.rs b/strolle/src/camera_controller/passes/di_temporal_resampling.rs
index 940e744a..108d121a 100644
--- a/strolle/src/camera_controller/passes/di_temporal_resampling.rs
+++ b/strolle/src/camera_controller/passes/di_temporal_resampling.rs
@@ -1,6 +1,7 @@
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct DiTemporalResamplingPass {
@@ -43,6 +44,6 @@ impl DiTemporalResamplingPass {
         // This pass uses 8x8 warps:
         let size = (camera.camera.viewport.size + 7) / 8;
 
-        self.pass.run(camera, encoder, size, camera.pass_params());
+        self.pass.run(camera, encoder, size.to_gpu(), camera.pass_params());
     }
 }
diff --git a/strolle/src/camera_controller/passes/frame_composition.rs b/strolle/src/camera_controller/passes/frame_composition.rs
index 3c36b88a..b8e07bb3 100644
--- a/strolle/src/camera_controller/passes/frame_composition.rs
+++ b/strolle/src/camera_controller/passes/frame_composition.rs
@@ -77,6 +77,7 @@ impl FrameCompositionPass {
                 vertex: wgpu::VertexState {
                     module: &engine.shaders.frame_composition_vs.0,
                     entry_point: engine.shaders.frame_composition_vs.1,
+                    compilation_options: Default::default(),
                     buffers: &[],
                 },
                 primitive: wgpu::PrimitiveState::default(),
@@ -85,6 +86,7 @@ impl FrameCompositionPass {
                 fragment: Some(wgpu::FragmentState {
                     module: &engine.shaders.frame_composition_fs.0,
                     entry_point: engine.shaders.frame_composition_fs.1,
+                    compilation_options: Default::default(),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: camera.viewport.format,
                         blend: Some(wgpu::BlendState::REPLACE),
@@ -112,10 +114,12 @@ impl FrameCompositionPass {
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Load,
-                    store: true,
+                    store: wgpu::StoreOp::Store,
                 },
             })],
             depth_stencil_attachment: None,
+            timestamp_writes: None,
+            occlusion_query_set: None,
         });
 
         let params = gpu::FrameCompositionPassParams {
diff --git a/strolle/src/camera_controller/passes/frame_denoising.rs b/strolle/src/camera_controller/passes/frame_denoising.rs
index 557c4262..2c1410bf 100644
--- a/strolle/src/camera_controller/passes/frame_denoising.rs
+++ b/strolle/src/camera_controller/passes/frame_denoising.rs
@@ -3,6 +3,7 @@ use crate::{
     gpu, Camera, CameraBuffers, CameraComputePass, CameraController, Engine,
     Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct FrameDenoisingPass {
@@ -26,7 +27,7 @@ impl FrameDenoisingPass {
             CameraComputePass::builder("frame_denoising_reproject_di")
                 .bind([
                     &buffers.curr_camera.bind_readable(),
-                    &buffers.prim_surface_map.curr().bind_readable(),
+                    &buffers.prim_gbuffer_d0.curr().bind_readable(),
                     &buffers.reprojection_map.bind_readable(),
                 ])
                 .bind([
@@ -42,7 +43,7 @@ impl FrameDenoisingPass {
             CameraComputePass::builder("frame_denoising_reproject_gi")
                 .bind([
                     &buffers.curr_camera.bind_readable(),
-                    &buffers.prim_surface_map.curr().bind_readable(),
+                    &buffers.prim_gbuffer_d0.curr().bind_readable(),
                     &buffers.reprojection_map.bind_readable(),
                 ])
                 .bind([
@@ -58,7 +59,7 @@ impl FrameDenoisingPass {
             CameraComputePass::builder("frame_denoising_estimate_variance")
                 .bind([
                     &buffers.curr_camera.bind_readable(),
-                    &buffers.prim_surface_map.curr().bind_readable(),
+                    &buffers.prim_gbuffer_d0.curr().bind_readable(),
                 ])
                 .bind([
                     &buffers.di_diff_curr_colors.bind_readable(),
@@ -119,7 +120,7 @@ impl FrameDenoisingPass {
                     .bind([
                         &engine.noise.bind_blue_noise(),
                         &buffers.curr_camera.bind_readable(),
-                        &buffers.prim_surface_map.curr().bind_readable(),
+                        &buffers.prim_gbuffer_d0.curr().bind_readable(),
                     ])
                     .bind([
                         &wavelet.di.0.bind_readable(),
@@ -155,21 +156,21 @@ impl FrameDenoisingPass {
         self.reproject_passes[0].run(
             camera,
             encoder,
-            size,
+            size.to_gpu(),
             camera.pass_params(),
         );
 
         self.reproject_passes[1].run(
             camera,
             encoder,
-            size,
+            size.to_gpu(),
             camera.pass_params(),
         );
 
         self.estimate_variance_pass.run(
             camera,
             encoder,
-            size,
+            size.to_gpu(),
             camera.pass_params(),
         );
 
@@ -179,7 +180,7 @@ impl FrameDenoisingPass {
             pass.run(
                 camera,
                 encoder,
-                size,
+                size.to_gpu(),
                 gpu::FrameDenoisingWaveletPassParams {
                     frame: camera.frame,
                     stride: 2u32.pow(nth),
diff --git a/strolle/src/camera_controller/passes/frame_reprojection.rs b/strolle/src/camera_controller/passes/frame_reprojection.rs
index 50f0c369..5f0c44bd 100644
--- a/strolle/src/camera_controller/passes/frame_reprojection.rs
+++ b/strolle/src/camera_controller/passes/frame_reprojection.rs
@@ -1,6 +1,7 @@
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct FrameReprojectionPass {
@@ -21,8 +22,8 @@ impl FrameReprojectionPass {
             .bind([
                 &buffers.curr_camera.bind_readable(),
                 &buffers.prev_camera.bind_readable(),
-                &buffers.prim_surface_map.curr().bind_readable(),
-                &buffers.prim_surface_map.prev().bind_readable(),
+                &buffers.prim_gbuffer_d0.curr().bind_readable(),
+                &buffers.prim_gbuffer_d0.prev().bind_readable(),
                 &buffers.velocity_map.bind_readable(),
                 &buffers.reprojection_map.bind_writable(),
             ])
@@ -39,6 +40,6 @@ impl FrameReprojectionPass {
         // This pass uses 8x8 warps:
         let size = (camera.camera.viewport.size + 7) / 8;
 
-        self.pass.run(camera, encoder, size, ());
+        self.pass.run(camera, encoder, size.to_gpu(), ());
     }
 }
diff --git a/strolle/src/camera_controller/passes/gi_preview_resampling.rs b/strolle/src/camera_controller/passes/gi_preview_resampling.rs
index 928523fd..1525a4e4 100644
--- a/strolle/src/camera_controller/passes/gi_preview_resampling.rs
+++ b/strolle/src/camera_controller/passes/gi_preview_resampling.rs
@@ -2,6 +2,7 @@ use crate::{
     gpu, Camera, CameraBuffers, CameraComputePass, CameraController, Engine,
     Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct GiPreviewResamplingPass {
@@ -23,7 +24,6 @@ impl GiPreviewResamplingPass {
                 &buffers.curr_camera.bind_readable(),
                 &buffers.prim_gbuffer_d0.curr().bind_readable(),
                 &buffers.prim_gbuffer_d1.curr().bind_readable(),
-                &buffers.prim_surface_map.curr().bind_readable(),
                 &buffers.gi_reservoirs[1].bind_readable(),
                 &buffers.gi_reservoirs[2].bind_readable(),
                 &buffers.gi_reservoirs[3].bind_writable(),
@@ -35,7 +35,6 @@ impl GiPreviewResamplingPass {
                 &buffers.curr_camera.bind_readable(),
                 &buffers.prim_gbuffer_d0.curr().bind_readable(),
                 &buffers.prim_gbuffer_d1.curr().bind_readable(),
-                &buffers.prim_surface_map.curr().bind_readable(),
                 &buffers.gi_reservoirs[1].bind_readable(),
                 &buffers.gi_reservoirs[3].bind_readable(),
                 &buffers.gi_reservoirs[0].bind_writable(),
@@ -63,7 +62,7 @@ impl GiPreviewResamplingPass {
             pass.run(
                 camera,
                 encoder,
-                size,
+                size.to_gpu(),
                 gpu::GiPreviewResamplingPass {
                     seed: params.seed,
                     frame: params.frame,
diff --git a/strolle/src/camera_controller/passes/gi_reprojection.rs b/strolle/src/camera_controller/passes/gi_reprojection.rs
index bb14458c..f02c1f9f 100644
--- a/strolle/src/camera_controller/passes/gi_reprojection.rs
+++ b/strolle/src/camera_controller/passes/gi_reprojection.rs
@@ -1,6 +1,7 @@
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct GiReprojectionPass {
@@ -39,6 +40,6 @@ impl GiReprojectionPass {
         // This pass uses 8x8 warps:
         let size = (camera.camera.viewport.size + 7) / 8;
 
-        self.pass.run(camera, encoder, size, camera.pass_params());
+        self.pass.run(camera, encoder, size.to_gpu(), camera.pass_params());
     }
 }
diff --git a/strolle/src/camera_controller/passes/gi_resolving.rs b/strolle/src/camera_controller/passes/gi_resolving.rs
index 156176a4..2dceb26b 100644
--- a/strolle/src/camera_controller/passes/gi_resolving.rs
+++ b/strolle/src/camera_controller/passes/gi_resolving.rs
@@ -2,6 +2,7 @@ use crate::{
     gpu, Camera, CameraBuffers, CameraComputePass, CameraController, Engine,
     Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct GiResolvingPass {
@@ -46,7 +47,7 @@ impl GiResolvingPass {
         self.pass.run(
             camera,
             encoder,
-            size,
+            size.to_gpu(),
             gpu::GiResolvingPassParams {
                 frame: camera.frame,
                 source,
diff --git a/strolle/src/camera_controller/passes/gi_sampling.rs b/strolle/src/camera_controller/passes/gi_sampling.rs
index a805d39a..3179d735 100644
--- a/strolle/src/camera_controller/passes/gi_sampling.rs
+++ b/strolle/src/camera_controller/passes/gi_sampling.rs
@@ -3,6 +3,7 @@ use glam::uvec2;
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct GiSamplingPass {
@@ -72,7 +73,7 @@ impl GiSamplingPass {
         // These passes use 8x8 warps and 2x1 checkerboard:
         let size = (camera.camera.viewport.size + 7) / 8 / uvec2(2, 1);
 
-        self.pass_a.run(camera, encoder, size, camera.pass_params());
-        self.pass_b.run(camera, encoder, size, camera.pass_params());
+        self.pass_a.run(camera, encoder, size.to_gpu(), camera.pass_params());
+        self.pass_b.run(camera, encoder, size.to_gpu(), camera.pass_params());
     }
 }
diff --git a/strolle/src/camera_controller/passes/gi_spatial_resampling.rs b/strolle/src/camera_controller/passes/gi_spatial_resampling.rs
index a6c3d235..5486889d 100644
--- a/strolle/src/camera_controller/passes/gi_spatial_resampling.rs
+++ b/strolle/src/camera_controller/passes/gi_spatial_resampling.rs
@@ -3,6 +3,7 @@ use glam::uvec2;
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct GiSpatialResamplingPass {
@@ -74,21 +75,21 @@ impl GiSpatialResamplingPass {
         self.pick_pass.run(
             camera,
             encoder,
-            (camera.camera.viewport.size + 7) / 8 / uvec2(2, 1),
+            ((camera.camera.viewport.size + 7) / 8 / uvec2(2, 1)).to_gpu(),
             camera.pass_params(),
         );
 
         self.trace_pass.run(
             camera,
             encoder,
-            (camera.camera.viewport.size + 7) / 8,
+            ((camera.camera.viewport.size + 7) / 8).to_gpu(),
             camera.pass_params(),
         );
 
         self.sample_pass.run(
             camera,
             encoder,
-            (camera.camera.viewport.size + 7) / 8 / uvec2(2, 1),
+            ((camera.camera.viewport.size + 7) / 8 / uvec2(2, 1)).to_gpu(),
             camera.pass_params(),
         );
     }
diff --git a/strolle/src/camera_controller/passes/gi_temporal_resampling.rs b/strolle/src/camera_controller/passes/gi_temporal_resampling.rs
index f8957799..4d1553ef 100644
--- a/strolle/src/camera_controller/passes/gi_temporal_resampling.rs
+++ b/strolle/src/camera_controller/passes/gi_temporal_resampling.rs
@@ -1,6 +1,7 @@
 use crate::{
     Camera, CameraBuffers, CameraComputePass, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct GiTemporalResamplingPass {
@@ -42,6 +43,6 @@ impl GiTemporalResamplingPass {
         // This pass uses 8x8 warps:
         let size = (camera.camera.viewport.size + 7) / 8;
 
-        self.pass.run(camera, encoder, size, camera.pass_params());
+        self.pass.run(camera, encoder, size.to_gpu(), camera.pass_params());
     }
 }
diff --git a/strolle/src/camera_controller/passes/prim_raster.rs b/strolle/src/camera_controller/passes/prim_raster.rs
index 15a5f4c3..325dc637 100644
--- a/strolle/src/camera_controller/passes/prim_raster.rs
+++ b/strolle/src/camera_controller/passes/prim_raster.rs
@@ -7,6 +7,7 @@ use log::debug;
 use crate::{
     gpu, BindGroup, Camera, CameraBuffers, CameraController, Engine, Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct PrimRasterPass {
@@ -57,6 +58,7 @@ impl PrimRasterPass {
                 vertex: wgpu::VertexState {
                     module: &engine.shaders.prim_raster_vs.0,
                     entry_point: engine.shaders.prim_raster_vs.1,
+                    compilation_options: Default::default(),
                     buffers: &[wgpu::VertexBufferLayout {
                         array_stride: (3 * 4 * mem::size_of::<f32>()) as _,
                         step_mode: wgpu::VertexStepMode::Vertex,
@@ -102,6 +104,7 @@ impl PrimRasterPass {
                 fragment: Some(wgpu::FragmentState {
                     module: &engine.shaders.prim_raster_fs.0,
                     entry_point: engine.shaders.prim_raster_fs.1,
+                    compilation_options: Default::default(),
                     targets: &[
                         Some(wgpu::ColorTargetState {
                             format: wgpu::TextureFormat::Rgba32Float,
@@ -109,17 +112,12 @@ impl PrimRasterPass {
                             write_mask: wgpu::ColorWrites::ALL,
                         }),
                         Some(wgpu::ColorTargetState {
-                            format: wgpu::TextureFormat::Rgba32Float,
+                            format: wgpu::TextureFormat::Rgba16Float,
                             blend: Some(wgpu::BlendState::REPLACE),
                             write_mask: wgpu::ColorWrites::ALL,
                         }),
                         Some(wgpu::ColorTargetState {
-                            format: wgpu::TextureFormat::Rgba32Float,
-                            blend: Some(wgpu::BlendState::REPLACE),
-                            write_mask: wgpu::ColorWrites::ALL,
-                        }),
-                        Some(wgpu::ColorTargetState {
-                            format: wgpu::TextureFormat::Rgba32Float,
+                            format: wgpu::TextureFormat::Rgba16Float,
                             blend: Some(wgpu::BlendState::REPLACE),
                             write_mask: wgpu::ColorWrites::ALL,
                         }),
@@ -149,7 +147,7 @@ impl PrimRasterPass {
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     },
                 }),
                 Some(wgpu::RenderPassColorAttachment {
@@ -157,15 +155,7 @@ impl PrimRasterPass {
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                        store: true,
-                    },
-                }),
-                Some(wgpu::RenderPassColorAttachment {
-                    view: camera.buffers.prim_surface_map.get(alternate).view(),
-                    resolve_target: None,
-                    ops: wgpu::Operations {
-                        load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     },
                 }),
                 Some(wgpu::RenderPassColorAttachment {
@@ -173,7 +163,7 @@ impl PrimRasterPass {
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     },
                 }),
             ],
@@ -182,11 +172,13 @@ impl PrimRasterPass {
                     view: camera.buffers.prim_depth.view(),
                     depth_ops: Some(wgpu::Operations {
                         load: wgpu::LoadOp::Clear(0.0),
-                        store: true,
+                        store: wgpu::StoreOp::Store,
                     }),
                     stencil_ops: None,
                 },
             ),
+            timestamp_writes: None,
+            occlusion_query_set: None,
         });
 
         pass.set_pipeline(&self.pipeline);
@@ -204,11 +196,11 @@ impl PrimRasterPass {
 
             let params = {
                 let curr_xform_inv = gpu::PrimRasterPassParams::encode_affine(
-                    instance.transform_inverse,
+                    instance.transform_inverse.to_gpu(),
                 );
 
                 let prev_xform = gpu::PrimRasterPassParams::encode_affine(
-                    instance_entry.prev_transform,
+                    instance_entry.prev_transform.to_gpu(),
                 );
 
                 gpu::PrimRasterPassParams {
@@ -217,7 +209,7 @@ impl PrimRasterPass {
                         f32::from_bits(material_id.get()),
                         Default::default(),
                         Default::default(),
-                    ),
+                    ).to_gpu(),
                     curr_xform_inv_d0: curr_xform_inv[0],
                     curr_xform_inv_d1: curr_xform_inv[1],
                     curr_xform_inv_d2: curr_xform_inv[2],
diff --git a/strolle/src/camera_controller/passes/ref_shading.rs b/strolle/src/camera_controller/passes/ref_shading.rs
index 604e67f1..31402c02 100644
--- a/strolle/src/camera_controller/passes/ref_shading.rs
+++ b/strolle/src/camera_controller/passes/ref_shading.rs
@@ -4,6 +4,7 @@ use crate::{
     gpu, Camera, CameraBuffers, CameraComputePass, CameraController, Engine,
     Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct RefShadingPass {
@@ -58,6 +59,6 @@ impl RefShadingPass {
             depth: depth as u32,
         };
 
-        self.pass.run(camera, encoder, size, params);
+        self.pass.run(camera, encoder, size.to_gpu(), params);
     }
 }
diff --git a/strolle/src/camera_controller/passes/ref_tracing.rs b/strolle/src/camera_controller/passes/ref_tracing.rs
index 643a1aab..f083e821 100644
--- a/strolle/src/camera_controller/passes/ref_tracing.rs
+++ b/strolle/src/camera_controller/passes/ref_tracing.rs
@@ -4,6 +4,7 @@ use crate::{
     gpu, Camera, CameraBuffers, CameraComputePass, CameraController, Engine,
     Params,
 };
+use crate::utils::ToGpu;
 
 #[derive(Debug)]
 pub struct RefTracingPass {
@@ -52,6 +53,6 @@ impl RefTracingPass {
             depth: depth as u32,
         };
 
-        self.pass.run(camera, encoder, size, params);
+        self.pass.run(camera, encoder, size.to_gpu(), params);
     }
 }
diff --git a/strolle/src/images.rs b/strolle/src/images.rs
index 3a685fa4..0459d3ff 100644
--- a/strolle/src/images.rs
+++ b/strolle/src/images.rs
@@ -5,7 +5,9 @@ use derivative::Derivative;
 use glam::{uvec2, vec4, Vec4};
 use guillotiere::{size2, Allocation, AtlasAllocator};
 use log::warn;
+use wgpu::TextureFormat;
 
+use crate::utils::ToGpu;
 use crate::{Bindable, Image, ImageData, Params, Texture};
 
 #[derive(Derivative)]
@@ -22,6 +24,39 @@ where
     dynamic_textures: Vec<(P::ImageTexture, Allocation)>,
 }
 
+fn convert_to_rgba8unorm_srgb(
+    data: &[u8],
+    src_format: wgpu::TextureFormat,
+    width: u32,
+    height: u32,
+) -> Vec<u8> {
+    let pixel_count = (width * height) as usize;
+    let mut converted_data = Vec::with_capacity(pixel_count * 4);
+
+    match src_format {
+        wgpu::TextureFormat::R8Unorm => {
+            for &r in data {
+                converted_data.extend_from_slice(&[r, 0, 0, 255]);
+            }
+        }
+        wgpu::TextureFormat::Rg8Unorm => {
+            for chunk in data.chunks_exact(2) {
+                let r = chunk[0];
+                let g = chunk[1];
+                converted_data.extend_from_slice(&[r, g, 0, 255]);
+            }
+        }
+        wgpu::TextureFormat::Rgba8UnormSrgb => {
+            converted_data.extend_from_slice(data);
+        }
+        _ => {
+            println!("Unhandled texture format: {:?}", src_format);
+        }
+    }
+
+    converted_data
+}
+
 impl<P> Images<P>
 where
     P: Params,
@@ -36,7 +71,7 @@ where
         ));
 
         let atlas_texture = Texture::builder("atlas")
-            .with_size(uvec2(Self::ATLAS_WIDTH, Self::ATLAS_HEIGHT))
+            .with_size(uvec2(Self::ATLAS_WIDTH, Self::ATLAS_HEIGHT).to_gpu())
             .with_format(wgpu::TextureFormat::Rgba8UnormSrgb)
             .with_usage(wgpu::TextureUsages::TEXTURE_BINDING)
             .with_usage(wgpu::TextureUsages::COPY_DST)
@@ -85,13 +120,61 @@ where
             | ImageData::Texture {
                 is_dynamic: false, ..
             }) => {
-                self.atlas_changes.push(AtlasChange::Set {
-                    x: alloc.rectangle.min.x as u32,
-                    y: alloc.rectangle.min.y as u32,
-                    w: alloc.rectangle.width() as u32,
-                    h: alloc.rectangle.height() as u32,
-                    data,
-                });
+                match &data {
+                    ImageData::Raw { data } => {
+                        // Convert data to atlas format (Rgba8UnormSrgb)
+                        let converted_data = convert_to_rgba8unorm_srgb(
+                            data,
+                            item.texture_descriptor.format,
+                            item.texture_descriptor.size.width,
+                            item.texture_descriptor.size.height,
+                        );
+
+                        // Use atlas texture's format for calculations
+                        let block_size = 4; // Rgba8UnormSrgb has 4 bytes per pixel
+                        let unpadded_bytes_per_row =
+                            item.texture_descriptor.size.width * block_size;
+                        let padding =
+                            (256 - (unpadded_bytes_per_row % 256)) % 256;
+                        let padded_bytes_per_row =
+                            unpadded_bytes_per_row + padding;
+
+                        // Pad the converted data if necessary
+                        let mut padded_data = Vec::with_capacity(
+                            (padded_bytes_per_row
+                                * item.texture_descriptor.size.height)
+                                as usize,
+                        );
+                        if padding == 0 {
+                            padded_data = converted_data;
+                        } else {
+                            let row_length = (unpadded_bytes_per_row) as usize;
+                            for row in converted_data.chunks_exact(row_length) {
+                                padded_data.extend_from_slice(row);
+                                padded_data.extend(
+                                    std::iter::repeat(0).take(padding as usize),
+                                );
+                            }
+                        }
+
+                        self.atlas_changes.push(AtlasChange::Set {
+                            x: alloc.rectangle.min.x as u32,
+                            y: alloc.rectangle.min.y as u32,
+                            w: alloc.rectangle.width() as u32,
+                            h: alloc.rectangle.height() as u32,
+                            data: ImageData::Raw { data: padded_data },
+                        });
+                    }
+                    ImageData::Texture { texture, .. } => {
+                        self.atlas_changes.push(AtlasChange::Set {
+                            x: alloc.rectangle.min.x as u32,
+                            y: alloc.rectangle.min.y as u32,
+                            w: alloc.rectangle.width() as u32,
+                            h: alloc.rectangle.height() as u32,
+                            data: data,
+                        });
+                    }
+                };
             }
 
             ImageData::Texture {
@@ -140,6 +223,25 @@ where
 
                     match data {
                         ImageData::Raw { data } => {
+                            // Use atlas texture's format for calculations
+                            let block_size = 4; // Rgba8UnormSrgb has 4 bytes per pixel
+                            let unpadded_bytes_per_row = w * block_size;
+                            let padding =
+                                (256 - (unpadded_bytes_per_row % 256)) % 256;
+                            let padded_bytes_per_row =
+                                unpadded_bytes_per_row + padding;
+
+                            println!(
+                                "Writing texture: pos={}x{}, size={}x{}, data_len={}, bytes_per_row={}, padded_bytes_per_row={}",
+                                x,
+                                y,
+                                w,
+                                h,
+                                data.len(),
+                                unpadded_bytes_per_row,
+                                padded_bytes_per_row
+                            );
+
                             queue.write_texture(
                                 wgpu::ImageCopyTexture {
                                     texture: self.atlas_texture.tex(),
@@ -150,14 +252,10 @@ where
                                 &data,
                                 wgpu::ImageDataLayout {
                                     offset: 0,
-                                    bytes_per_row: Some(w * 4),
+                                    bytes_per_row: Some(padded_bytes_per_row),
                                     rows_per_image: None,
                                 },
-                                wgpu::Extent3d {
-                                    width: w,
-                                    height: h,
-                                    depth_or_array_layers: 1,
-                                },
+                                size,
                             );
                         }
 
diff --git a/strolle/src/lib.rs b/strolle/src/lib.rs
index 0f1bd294..ef6e7621 100644
--- a/strolle/src/lib.rs
+++ b/strolle/src/lib.rs
@@ -75,9 +75,8 @@ use std::ops::Deref;
 use std::time::Instant;
 use std::{env, mem};
 
-pub use glam;
 use log::{info, trace};
-use strolle_gpu as gpu;
+use {glam, strolle_gpu as gpu};
 
 pub(crate) use self::buffers::*;
 pub(crate) use self::bvh::*;
@@ -101,6 +100,7 @@ pub use self::sun::*;
 pub(crate) use self::triangle::*;
 pub(crate) use self::triangles::*;
 pub(crate) use self::utils::*;
+pub use crate::utils::interface::ToGpu;
 
 #[derive(Debug)]
 pub struct Engine<P>
diff --git a/strolle/src/light.rs b/strolle/src/light.rs
index 6440270e..c8b470f5 100644
--- a/strolle/src/light.rs
+++ b/strolle/src/light.rs
@@ -1,6 +1,7 @@
 use glam::{vec4, Vec3};
 
 use crate::gpu;
+use crate::utils::ToGpu;
 
 #[derive(Clone, Debug)]
 pub enum Light {
@@ -53,7 +54,7 @@ impl Light {
                 direction,
                 angle,
             } => {
-                let direction = gpu::Normal::encode(*direction);
+                let direction = gpu::Normal::encode((*direction).to_gpu());
 
                 d0 = position.extend(*radius);
                 d1 = color.extend(*range);
@@ -68,9 +69,9 @@ impl Light {
         }
 
         gpu::Light {
-            d0,
-            d1,
-            d2,
+            d0: d0.to_gpu(),
+            d1: d1.to_gpu(),
+            d2: d2.to_gpu(),
             d3: Default::default(),
             prev_d0: Default::default(),
             prev_d1: Default::default(),
diff --git a/strolle/src/material.rs b/strolle/src/material.rs
index 1d79abda..7b07379f 100644
--- a/strolle/src/material.rs
+++ b/strolle/src/material.rs
@@ -2,6 +2,7 @@ use std::fmt::Debug;
 
 use spirv_std::glam::{vec4, Vec4};
 
+use crate::utils::ToGpu;
 use crate::{gpu, Images, Params};
 
 #[derive(Clone, Debug)]
@@ -31,21 +32,25 @@ where
             base_color: self.base_color,
             base_color_texture: images
                 .lookup_opt(self.base_color_texture)
-                .unwrap_or_default(),
+                .unwrap_or_default()
+                .to_gpu(),
             emissive: self.emissive,
             emissive_texture: images
                 .lookup_opt(self.emissive_texture)
-                .unwrap_or_default(),
+                .unwrap_or_default()
+                .to_gpu(),
             roughness: self.perceptual_roughness.powf(2.0),
             metallic: self.metallic,
             metallic_roughness_texture: images
                 .lookup_opt(self.metallic_roughness_texture)
-                .unwrap_or_default(),
+                .unwrap_or_default()
+                .to_gpu(),
             reflectance: self.reflectance,
             ior: self.ior,
             normal_map_texture: images
                 .lookup_opt(self.normal_map_texture)
-                .unwrap_or_default(),
+                .unwrap_or_default()
+                .to_gpu(),
         }
     }
 }
diff --git a/strolle/src/mesh_triangle.rs b/strolle/src/mesh_triangle.rs
index 3a5d38e7..0f7612e9 100644
--- a/strolle/src/mesh_triangle.rs
+++ b/strolle/src/mesh_triangle.rs
@@ -1,5 +1,4 @@
-use glam::Affine3A;
-use spirv_std::glam::{Mat4, Vec2, Vec3, Vec4, Vec4Swizzles};
+use glam::{Affine3A, Mat4, Vec2, Vec3, Vec4, Vec4Swizzles};
 
 use crate::Triangle;
 
@@ -17,17 +16,17 @@ impl MeshTriangle {
         self
     }
 
-    pub fn with_normals(mut self, normals: [impl Into<Vec3>; 3]) -> Self {
-        self.normals = normals.map(Into::into);
+    pub fn with_normals(mut self, normals: [Vec3; 3]) -> Self {
+        self.normals = normals;
         self
     }
 
-    pub fn with_uvs(mut self, uvs: [impl Into<Vec2>; 3]) -> Self {
-        self.uvs = uvs.map(Into::into);
+    pub fn with_uvs(mut self, uvs: [Vec2; 3]) -> Self {
+        self.uvs = uvs;
         self
     }
 
-    pub fn with_tangents(mut self, tangents: [impl Into<Vec4>; 3]) -> Self {
+    pub fn with_tangents(mut self, tangents: [Vec4; 3]) -> Self {
         self.tangents = tangents.map(Into::into);
         self
     }
@@ -49,8 +48,9 @@ impl MeshTriangle {
         xform: Affine3A,
         xform_inv: Affine3A,
     ) -> Triangle {
-        let positions =
-            self.positions.map(|vertex| xform.transform_point3(vertex));
+        let positions: [Vec3; 3] = self
+            .positions
+            .map(|vertex: Vec3| -> Vec3 { xform.transform_point3(vertex) });
 
         let normals = {
             // Transforming normals requires inversing and transposing the
@@ -77,10 +77,12 @@ impl MeshTriangle {
             })
         };
 
+        let uvs = self.uvs.map(|uv| uv);
+
         Triangle {
             positions,
             normals,
-            uvs: self.uvs,
+            uvs,
             tangents,
         }
     }
diff --git a/strolle/src/triangle.rs b/strolle/src/triangle.rs
index 50d80dba..96be2633 100644
--- a/strolle/src/triangle.rs
+++ b/strolle/src/triangle.rs
@@ -1,8 +1,7 @@
-use glam::Vec3Swizzles;
-use spirv_std::glam::{Vec2, Vec3, Vec4};
+use glam::{Vec2, Vec3, Vec3Swizzles, Vec4};
 
 use crate::gpu;
-use crate::utils::BoundingBox;
+use crate::utils::{BoundingBox, ToGpu};
 
 #[derive(Clone, Debug)]
 pub struct Triangle {
@@ -23,17 +22,17 @@ impl Triangle {
 
     pub fn serialize(&self) -> gpu::Triangle {
         gpu::Triangle {
-            d0: self.positions[0].xyz().extend(self.uvs[0].x),
-            d1: self.normals[0].xyz().extend(self.uvs[0].y),
-            d2: self.tangents[0],
+            d0: self.positions[0].xyz().extend(self.uvs[0].x).to_gpu(),
+            d1: self.normals[0].xyz().extend(self.uvs[0].y).to_gpu(),
+            d2: self.tangents[0].to_gpu(),
 
-            d3: self.positions[1].xyz().extend(self.uvs[1].x),
-            d4: self.normals[1].xyz().extend(self.uvs[1].y),
-            d5: self.tangents[1],
+            d3: self.positions[1].xyz().extend(self.uvs[1].x).to_gpu(),
+            d4: self.normals[1].xyz().extend(self.uvs[1].y).to_gpu(),
+            d5: self.tangents[1].to_gpu(),
 
-            d6: self.positions[2].xyz().extend(self.uvs[2].x),
-            d7: self.normals[2].xyz().extend(self.uvs[2].y),
-            d8: self.tangents[2],
+            d6: self.positions[2].xyz().extend(self.uvs[2].x).to_gpu(),
+            d7: self.normals[2].xyz().extend(self.uvs[2].y).to_gpu(),
+            d8: self.tangents[2].to_gpu(),
         }
     }
 }
diff --git a/strolle/src/utils.rs b/strolle/src/utils.rs
index e3c81beb..8ea53dbe 100644
--- a/strolle/src/utils.rs
+++ b/strolle/src/utils.rs
@@ -1,9 +1,11 @@
 mod allocator;
 mod axis;
 mod bounding_box;
+pub mod interface;
 mod metrics;
 
 pub use self::allocator::*;
 pub use self::axis::*;
 pub use self::bounding_box::*;
+pub use self::interface::*;
 pub use self::metrics::*;
diff --git a/strolle/src/utils/bounding_box.rs b/strolle/src/utils/bounding_box.rs
index 6ff28a9f..681f95b5 100644
--- a/strolle/src/utils/bounding_box.rs
+++ b/strolle/src/utils/bounding_box.rs
@@ -1,6 +1,6 @@
 use std::ops::{Add, AddAssign};
 
-use spirv_std::glam::Vec3;
+use glam::Vec3;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct BoundingBox {
diff --git a/strolle/src/utils/interface.rs b/strolle/src/utils/interface.rs
new file mode 100644
index 00000000..7e9968a6
--- /dev/null
+++ b/strolle/src/utils/interface.rs
@@ -0,0 +1,56 @@
+// First, let's define helper traits for converting between CPU and GPU types
+use glam as cpu;
+use spirv_std::glam as gpu;
+
+// Helper trait for converting CPU types to GPU types
+pub trait ToGpu<T> {
+    fn to_gpu(&self) -> T;
+}
+
+impl ToGpu<gpu::Affine3A> for cpu::Affine3A {
+    fn to_gpu(&self) -> gpu::Affine3A {
+        gpu::Affine3A::from_cols_array(&self.to_cols_array())
+    }
+}
+
+impl ToGpu<gpu::Mat4> for cpu::Mat4 {
+    fn to_gpu(&self) -> gpu::Mat4 {
+        gpu::Mat4::from_cols_array(&self.to_cols_array())
+    }
+}
+
+impl ToGpu<gpu::Vec4> for cpu::Vec4 {
+    fn to_gpu(&self) -> gpu::Vec4 {
+        gpu::Vec4::new(self.x, self.y, self.z, self.w)
+    }
+}
+
+impl ToGpu<gpu::Vec3> for cpu::Vec3 {
+    fn to_gpu(&self) -> gpu::Vec3 {
+        gpu::Vec3::new(self.x, self.y, self.z)
+    }
+}
+
+impl ToGpu<gpu::Vec2> for cpu::Vec2 {
+    fn to_gpu(&self) -> gpu::Vec2 {
+        gpu::Vec2::new(self.x, self.y)
+    }
+}
+
+impl ToGpu<gpu::UVec2> for cpu::UVec2 {
+    fn to_gpu(&self) -> gpu::UVec2 {
+        gpu::UVec2::new(self.x, self.y)
+    }
+}
+
+impl ToGpu<gpu::UVec3> for cpu::UVec3 {
+    fn to_gpu(&self) -> gpu::UVec3 {
+        gpu::UVec3::new(self.x, self.y, self.z)
+    }
+}
+
+impl ToGpu<gpu::UVec4> for cpu::UVec4 {
+    fn to_gpu(&self) -> gpu::UVec4 {
+        gpu::UVec4::new(self.x, self.y, self.z, self.w)
+    }
+}