From fe3832b60f03429c46147551bc3370f1915f2884 Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Tue, 9 Jul 2024 23:14:31 +0300
Subject: [PATCH 01/17] Library updates

---
 Cargo.lock                           | 2924 +++++++++++++++++---------
 Cargo.toml                           |   16 +-
 crates/editor_core/Cargo.toml        |    2 +-
 external/editor_as_plugin/Cargo.toml |    2 +-
 modules/bevy_xpbd_plugin/Cargo.toml  |    2 +-
 workspace-hakari/Cargo.toml          |    5 +-
 6 files changed, 1952 insertions(+), 999 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a31a412b..d0f5dd6d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.26"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd"
+checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -28,13 +28,29 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "accesskit"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448"
+
 [[package]]
 name = "accesskit_consumer"
 version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6"
 dependencies = [
- "accesskit",
+ "accesskit 0.12.3",
+]
+
+[[package]]
+name = "accesskit_consumer"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bdfa1638ddd6eb9c752def95568df8b3ad832df252e9156d2eb783b201ca8a9"
+dependencies = [
+ "accesskit 0.14.0",
+ "immutable-chunkmap",
 ]
 
 [[package]]
@@ -43,39 +59,79 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
 dependencies = [
- "accesskit",
- "accesskit_consumer",
+ "accesskit 0.12.3",
+ "accesskit_consumer 0.16.1",
  "objc2 0.3.0-beta.3.patch-leaks.3",
  "once_cell",
 ]
 
+[[package]]
+name = "accesskit_macos"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c236a84ff1111defc280cee755eaa953d0b24398786851b9d28322c6d3bb1ebd"
+dependencies = [
+ "accesskit 0.14.0",
+ "accesskit_consumer 0.22.0",
+ "objc2 0.5.2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "once_cell",
+]
+
 [[package]]
 name = "accesskit_windows"
 version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b"
 dependencies = [
- "accesskit",
- "accesskit_consumer",
+ "accesskit 0.12.3",
+ "accesskit_consumer 0.16.1",
  "once_cell",
  "paste",
  "static_assertions",
  "windows 0.48.0",
 ]
 
+[[package]]
+name = "accesskit_windows"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d7f43d24b16b3e76bef248124fbfd2493c3a9860edb5aae1010c890e826de5e"
+dependencies = [
+ "accesskit 0.14.0",
+ "accesskit_consumer 0.22.0",
+ "paste",
+ "static_assertions",
+ "windows 0.54.0",
+]
+
 [[package]]
 name = "accesskit_winit"
 version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45f8f7c9f66d454d5fd8e344c8c8c7324b57194e1041b955519fc58a01e77a25"
 dependencies = [
- "accesskit",
- "accesskit_macos",
- "accesskit_windows",
- "raw-window-handle 0.6.2",
+ "accesskit 0.12.3",
+ "accesskit_macos 0.10.1",
+ "accesskit_windows 0.15.1",
+ "raw-window-handle",
  "winit 0.29.15",
 ]
 
+[[package]]
+name = "accesskit_winit"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "755535e6bf711a42dac28b888b884b10fc00ff4010d9d3bd871c5f5beae5aa78"
+dependencies = [
+ "accesskit 0.14.0",
+ "accesskit_macos 0.15.0",
+ "accesskit_windows 0.20.0",
+ "raw-window-handle",
+ "winit 0.30.3",
+]
+
 [[package]]
 name = "addr2line"
 version = "0.22.0"
@@ -127,7 +183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce"
 dependencies = [
  "alsa-sys",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
 ]
 
@@ -148,7 +204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
 dependencies = [
  "android-properties",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cc",
  "cesu8",
  "jni",
@@ -169,7 +225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
  "android-properties",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cc",
  "cesu8",
  "jni",
@@ -339,6 +395,35 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
+[[package]]
+name = "avian3d"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a8da53296a1bc166b84f99aa7c6b9d8c10c71f0c022bc4fc72dd1fc49323b29"
+dependencies = [
+ "avian_derive",
+ "bevy 0.14.0",
+ "bevy_math 0.14.0",
+ "bitflags 2.6.0",
+ "derive_more",
+ "fxhash",
+ "indexmap",
+ "itertools 0.13.0",
+ "nalgebra",
+ "parry3d",
+]
+
+[[package]]
+name = "avian_derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4adeeecb6d4628d3ca11836ce9af8309f9552d4bd3e3f6e4368440d8163260c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.73"
@@ -383,32 +468,45 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65b9eadaacf8fe971331bc3f250f35c18bc9dace3f96b483062f38ac07e3a1b4"
 dependencies = [
- "bevy_internal",
+ "bevy_internal 0.13.2",
+]
+
+[[package]]
+name = "bevy"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e938630e9f472b1899c78ef84aa907081b23bad8333140e2295c620485b6ee7"
+dependencies = [
+ "bevy_internal 0.14.0",
 ]
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.23.4"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb36c3adb02afa4496085250d437217b2a5280d8dd464937c6c5b21bc88830c0"
+checksum = "094e2d697a9dcbbd62fc6ff133d1d95990f66b6c4d25cdfb528f4b102c6a3ed1"
 dependencies = [
  "bevy-inspector-egui-derive",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_ecs",
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_core 0.14.0",
+ "bevy_core_pipeline 0.14.0",
+ "bevy_ecs 0.14.0",
  "bevy_egui",
- "bevy_hierarchy",
- "bevy_log",
- "bevy_math",
+ "bevy_hierarchy 0.14.0",
+ "bevy_log 0.14.0",
+ "bevy_math 0.14.0",
  "bevy_pbr",
- "bevy_reflect",
- "bevy_render",
- "bevy_time",
- "bevy_utils",
- "bevy_window",
- "egui 0.26.2",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_state",
+ "bevy_time 0.14.0",
+ "bevy_utils 0.14.0",
+ "bevy_window 0.14.0",
+ "bytemuck",
+ "egui 0.28.1",
+ "fuzzy-matcher",
  "image 0.24.9",
  "once_cell",
  "pretty-type-name",
@@ -417,22 +515,21 @@ dependencies = [
 
 [[package]]
 name = "bevy-inspector-egui-derive"
-version = "0.23.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c488161a04a123e10273e16d4533945943fcfcf345f066242790e8977aee2d"
+checksum = "161d93f4b3a9246a87485e30ccf4cc927f204a14f26df42da977e383f0a0ec5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
 name = "bevy-scene-hook"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "089da39d9031fb7d3988d44f2e7e27c8075e66167d228127ab01670eb2c400d6"
+version = "11.0.0"
+source = "git+https://github.com/stargazing-dino/bevy-scene-hook.git?branch=update-14.0#c29f2d579e0ba1cd195065e59f1f763e0f933468"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
 ]
 
 [[package]]
@@ -441,29 +538,52 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd8ef2795f7f5c816a4eda04834083eb5a92e8fef603bc21d2091c6e3b63621a"
 dependencies = [
- "accesskit",
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
+ "accesskit 0.12.3",
+ "bevy_app 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
 ]
 
 [[package]]
-name = "bevy_animation"
-version = "0.13.2"
+name = "bevy_a11y"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e553d68bc937586010ed2194ac66b751bc6238cf622b3ed5a86f4e1581e94509"
+checksum = "3e613f0e7d5a92637e59744f7185e374c9a59654ecc6d7575adcec9581db1363"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_time",
- "bevy_transform",
- "bevy_utils",
+ "accesskit 0.14.0",
+ "bevy_app 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+]
+
+[[package]]
+name = "bevy_animation"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23aa4141df149b743e69c90244261c6372bafb70d9f115885de48a75fc28fd9b"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_core 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_hierarchy 0.14.0",
+ "bevy_log 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_time 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
+ "blake3",
+ "fixedbitset 0.5.7",
+ "petgraph",
+ "ron",
+ "serde",
+ "thiserror",
+ "thread_local",
+ "uuid",
 ]
 
 [[package]]
@@ -472,16 +592,34 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab348a32e46d21c5d61794294a92d415a770d26c7ba8951830b127b40b53ccc4"
 dependencies = [
- "bevy_derive",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_tasks 0.13.2",
+ "bevy_utils 0.13.2",
  "downcast-rs",
  "wasm-bindgen",
  "web-sys",
 ]
 
+[[package]]
+name = "bevy_app"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f548e9dab7d10c5f99e3b504c758c4bf87aa67df9bcb9cc8b317a0271770e72"
+dependencies = [
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_tasks 0.14.0",
+ "bevy_utils 0.14.0",
+ "console_error_panic_hook",
+ "downcast-rs",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "bevy_asset"
 version = "0.13.2"
@@ -491,14 +629,14 @@ dependencies = [
  "async-broadcast",
  "async-fs",
  "async-lock",
- "bevy_app",
- "bevy_asset_macros",
- "bevy_ecs",
- "bevy_log",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
- "bevy_winit",
+ "bevy_app 0.13.2",
+ "bevy_asset_macros 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_log 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_tasks 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_winit 0.13.2",
  "blake3",
  "crossbeam-channel",
  "downcast-rs",
@@ -514,27 +652,59 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "bevy_asset"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d198e4c3419215de2ad981d4e734bbfab46469b7575e3b7150c912b9ec5175"
+dependencies = [
+ "async-broadcast",
+ "async-fs",
+ "async-lock",
+ "bevy_app 0.14.0",
+ "bevy_asset_macros 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_tasks 0.14.0",
+ "bevy_utils 0.14.0",
+ "bevy_winit 0.14.0",
+ "blake3",
+ "crossbeam-channel",
+ "downcast-rs",
+ "futures-io",
+ "futures-lite",
+ "js-sys",
+ "parking_lot",
+ "ron",
+ "serde",
+ "thiserror",
+ "uuid",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "bevy_asset_loader"
-version = "0.20.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5e87388367317b6799ccc408ebc553a2ed45bc4c6c06263d23306b397b55d3"
+checksum = "47863215e4454e0142cc7e0f7801ad256d44e690f43186743e3e2bc9da2de870"
 dependencies = [
  "anyhow",
- "bevy",
+ "bevy 0.14.0",
  "bevy_asset_loader_derive",
  "path-slash",
 ]
 
 [[package]]
 name = "bevy_asset_loader_derive"
-version = "0.20.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2660d1c142f8122ccbdbfbc2cc93ac4030c24815dcb16823615cb65941fb1fa3"
+checksum = "2b12bd14ec1f3e57760d01b239bd27ab5dd13547379e5a83c167c7162525f646"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -543,74 +713,141 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6617475908368418d815360148fdbb82f879dc255a70d2d7baa3766f0cd4bfd7"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.13.2",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
-name = "bevy_audio"
-version = "0.13.2"
+name = "bevy_asset_macros"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0f12495e230cd5cf59c6051cdd820c97d7fe4f0597d4d9c3240c62e9c65b485"
+checksum = "11b2cbeba287a4b44e116c33dbaf37dce80a9d84477b2bb35ff459999d6c9e1b"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_derive",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_transform",
- "bevy_utils",
+ "bevy_macro_utils 0.14.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "bevy_audio"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e41ecf15d0aae31bdb6d2b5cc590f966451e9736ddfee634c8f1ca5af1ac4342"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_hierarchy 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
  "cpal",
  "rodio",
 ]
 
+[[package]]
+name = "bevy_color"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a933306f5c7dc9568209180f482b28b5f40d2f8d5b361bc1b270c0a588752c0"
+dependencies = [
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bytemuck",
+ "encase 0.8.0",
+ "serde",
+ "thiserror",
+ "wgpu-types 0.20.0",
+]
+
 [[package]]
 name = "bevy_core"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12b0042f241ba7cd61487aadd8addfb56f7eeb662d713ac1577026704508fc6c"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_tasks 0.13.2",
+ "bevy_utils 0.13.2",
  "bytemuck",
 ]
 
+[[package]]
+name = "bevy_core"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ddeed5ebf2fa75a4d4f32e2da9c60f11037e36252695059a151c6685cd3d72b"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_tasks 0.14.0",
+ "bevy_utils 0.14.0",
+ "uuid",
+]
+
 [[package]]
 name = "bevy_core_pipeline"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48b7a471cb8ba665f12f7a167faa5566c11386f5bfc77d2e10bfde22b179f7b3"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_derive",
- "bevy_ecs",
- "bevy_log",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bitflags 2.5.0",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_core 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_log 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_utils 0.13.2",
+ "bitflags 2.6.0",
+ "radsort",
+ "serde",
+]
+
+[[package]]
+name = "bevy_core_pipeline"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b978220b5edc98f2c5cbbd14c118c74b3ec7216e5416d3c187c1097279b009b"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_core 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
+ "bitflags 2.6.0",
+ "nonmax",
  "radsort",
  "serde",
+ "smallvec",
+ "thiserror",
 ]
 
 [[package]]
 name = "bevy_debug_grid"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ea4fecb53228c1f458cede1a76ca953f809b262cf0658356f3694ef72e5cd"
+checksum = "cec97f2d56a2c00ac8cc3fd3915555f322d28558671adbb9efc5dd08ee41d34e"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
 ]
 
 [[package]]
@@ -619,9 +856,20 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0e01f8343f391e2d6a63b368b82fb5b252ed43c8713fc87f9a8f2d59407dd00"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.13.2",
+ "quote",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "bevy_derive"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8a8173bad3ed53fa158806b1beda147263337d6ef71a093780dd141b74386b1"
+dependencies = [
+ "bevy_macro_utils 0.14.0",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -630,12 +878,28 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1401cdccec7e49378d013dfb0ff62c251f85b3be19dcdf04cfd827f793d1ee9"
 dependencies = [
- "bevy_app",
- "bevy_core",
- "bevy_ecs",
- "bevy_log",
- "bevy_time",
- "bevy_utils",
+ "bevy_app 0.13.2",
+ "bevy_core 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_log 0.13.2",
+ "bevy_time 0.13.2",
+ "bevy_utils 0.13.2",
+ "const-fnv1a-hash",
+ "sysinfo",
+]
+
+[[package]]
+name = "bevy_diagnostic"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7f82011fd70048be282526a99756d54bf00e874edafa9664ba0dc247678f03"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_core 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_tasks 0.14.0",
+ "bevy_time 0.14.0",
+ "bevy_utils 0.14.0",
  "const-fnv1a-hash",
  "sysinfo",
 ]
@@ -647,43 +911,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98e612a8e7962ead849e370f3a7e972b88df879ced05cd9dad6a0286d14650cf"
 dependencies = [
  "async-channel",
- "bevy_ecs_macros",
- "bevy_ptr",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
+ "bevy_ecs_macros 0.13.2",
+ "bevy_ptr 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_tasks 0.13.2",
+ "bevy_utils 0.13.2",
  "downcast-rs",
- "fixedbitset",
+ "fixedbitset 0.4.2",
  "rustc-hash",
  "serde",
  "thiserror",
  "thread_local",
 ]
 
+[[package]]
+name = "bevy_ecs"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c77fdc3a7230eff2fcebe4bd17c155bd238c660a0089d0f98c39ba0d461b923"
+dependencies = [
+ "arrayvec",
+ "bevy_ecs_macros 0.14.0",
+ "bevy_ptr 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_tasks 0.14.0",
+ "bevy_utils 0.14.0",
+ "bitflags 2.6.0",
+ "concurrent-queue",
+ "fixedbitset 0.5.7",
+ "nonmax",
+ "petgraph",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "bevy_ecs_macros"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "807b5106c3410e58f4f523b55ea3c071e2a09e31e9510f3c22021c6a04732b5b"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.13.2",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "bevy_ecs_macros"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9272b511958525306cd141726d3ca59740f79fc0707c439b55a007bcc3497308"
+dependencies = [
+ "bevy_macro_utils 0.14.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
 ]
 
 [[package]]
 name = "bevy_egui"
-version = "0.25.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84bfb8d4104a1467910cf2090bc6a6d394ebde39c0dbc02397b45aa9ef88e80"
+checksum = "5e4a90f30f2849a07d91e393b10c0cc05df09b5773c010ddde57dd8b583be230"
 dependencies = [
  "arboard",
- "bevy",
- "egui 0.26.2",
+ "bevy 0.14.0",
+ "bytemuck",
+ "console_log",
+ "crossbeam-channel",
+ "egui 0.28.1",
+ "js-sys",
+ "log",
  "thread_local",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
  "web-sys",
  "webbrowser",
+ "winit 0.30.3",
 ]
 
 [[package]]
@@ -692,8 +997,18 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "887087a5e522d9f20733a84dd7e6e9ca04cd8fdfac659220ed87d675eebc83a7"
 dependencies = [
- "bevy_macro_utils",
- "encase_derive_impl",
+ "bevy_macro_utils 0.13.2",
+ "encase_derive_impl 0.7.0",
+]
+
+[[package]]
+name = "bevy_encase_derive"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0452d8254c8bfae4bff6caca2a8be3b0c1b2e1a72b93e9b9f6a21c8dff807e0"
+dependencies = [
+ "bevy_macro_utils 0.14.0",
+ "encase_derive_impl 0.8.0",
 ]
 
 [[package]]
@@ -702,11 +1017,11 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9d65c75b4f81818cacdc8a4302c5413910c5fb7727564deaf95e56e0dea4bd0"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
  "bevy_eventlistener_derive",
- "bevy_hierarchy",
- "bevy_utils",
+ "bevy_hierarchy 0.13.2",
+ "bevy_utils 0.13.2",
 ]
 
 [[package]]
@@ -717,21 +1032,20 @@ checksum = "fa29be733a02a5d7ca4507ef15f294711c1a0884b9a9a2730640ff4e7d0200ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d133c65ab756f130c65cf00f37dc293fb9a9336c891802baf006c63e300d0e2"
+checksum = "fbad8e59470c3d5cf25aa8c48462c4cf6f0c6314538c68ab2f5cf393146f0fc2"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_input",
- "bevy_log",
- "bevy_time",
- "bevy_utils",
+ "bevy_app 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_input 0.14.0",
+ "bevy_time 0.14.0",
+ "bevy_utils 0.14.0",
  "gilrs",
  "thiserror",
 ]
@@ -742,20 +1056,42 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "054df3550a9d423a961de65b459946ff23304f97f25af8a62c23f4259db8506d"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_ecs",
- "bevy_gizmos_macros",
- "bevy_log",
- "bevy_math",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_core 0.13.2",
+ "bevy_core_pipeline 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_gizmos_macros 0.13.2",
+ "bevy_log 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_sprite 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_utils 0.13.2",
+]
+
+[[package]]
+name = "bevy_gizmos"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdbb0556f0c6e45f4a17aef9c708c06ebf15ae1bed4533d7eddb493409f9f025"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_core_pipeline 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_gizmos_macros 0.14.0",
+ "bevy_math 0.14.0",
  "bevy_pbr",
- "bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_transform",
- "bevy_utils",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_sprite 0.14.0",
+ "bevy_time 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
+ "bytemuck",
 ]
 
 [[package]]
@@ -764,39 +1100,52 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abdcaf74d8cd34aa5c3293527e7a012826840886ad3496c1b963ed8b66b1619f"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.13.2",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "bevy_gizmos_macros"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ef351a4b6498c197d1317c62f46ba84b69fbde3dbeb57beb2e744bbe5b7c3e0"
+dependencies = [
+ "bevy_macro_utils 0.14.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21ecf404295055deb7fe037495891bc135ca10d46bc5b6c55f9ab7b7ebc61d31"
+checksum = "cfd7abeaf3f28afd1f8999c2169aa17b40a37ad11253cf7dd05017024b65adc6"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "bevy_animation",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_log",
- "bevy_math",
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_core 0.14.0",
+ "bevy_core_pipeline 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_hierarchy 0.14.0",
+ "bevy_math 0.14.0",
  "bevy_pbr",
- "bevy_reflect",
- "bevy_render",
- "bevy_scene",
- "bevy_tasks",
- "bevy_transform",
- "bevy_utils",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_scene 0.14.0",
+ "bevy_tasks 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
  "gltf",
  "percent-encoding",
  "serde",
  "serde_json",
+ "smallvec",
  "thiserror",
 ]
 
@@ -806,12 +1155,26 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb3dfad24866a6713dafa3065a91c5cf5e355f6e1b191c25d704ae54185246c"
 dependencies = [
- "bevy_app",
- "bevy_core",
- "bevy_ecs",
- "bevy_log",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_app 0.13.2",
+ "bevy_core 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_log 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_utils 0.13.2",
+]
+
+[[package]]
+name = "bevy_hierarchy"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "802eca6f341d19ade790ccfaba7044be4d823b708087eb5ac4c1f74e4ea0916a"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_core 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_utils 0.14.0",
+ "smallvec",
 ]
 
 [[package]]
@@ -820,11 +1183,26 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47f2b2b3df168c6ef661d25e09abf5bd4fecaacd400f27e5db650df1c3fa3a3b"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_utils 0.13.2",
+ "smol_str",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_input"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d050f1433f48ca23f1ea078734ebff119a3f76eb7d221725ab0f1fd9f81230b"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_utils 0.14.0",
  "smol_str",
  "thiserror",
 ]
@@ -835,37 +1213,73 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f58ec0ce77603df9474cde61f429126bfe06eb79094440e9141afb4217751c79"
 dependencies = [
- "bevy_a11y",
+ "bevy_a11y 0.13.2",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_core 0.13.2",
+ "bevy_core_pipeline 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_diagnostic 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_gizmos 0.13.2",
+ "bevy_hierarchy 0.13.2",
+ "bevy_input 0.13.2",
+ "bevy_log 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_ptr 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_scene 0.13.2",
+ "bevy_sprite 0.13.2",
+ "bevy_tasks 0.13.2",
+ "bevy_text 0.13.2",
+ "bevy_time 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_ui 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_window 0.13.2",
+ "bevy_winit 0.13.2",
+]
+
+[[package]]
+name = "bevy_internal"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ddd2b23e44d3a1f8ae547cbee5b6661f8135cc456c5de206e8648789944e7a1"
+dependencies = [
+ "bevy_a11y 0.14.0",
  "bevy_animation",
- "bevy_app",
- "bevy_asset",
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
  "bevy_audio",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_diagnostic",
- "bevy_ecs",
+ "bevy_color",
+ "bevy_core 0.14.0",
+ "bevy_core_pipeline 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_diagnostic 0.14.0",
+ "bevy_ecs 0.14.0",
  "bevy_gilrs",
- "bevy_gizmos",
+ "bevy_gizmos 0.14.0",
  "bevy_gltf",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_log",
- "bevy_math",
+ "bevy_hierarchy 0.14.0",
+ "bevy_input 0.14.0",
+ "bevy_log 0.14.0",
+ "bevy_math 0.14.0",
  "bevy_pbr",
- "bevy_ptr",
- "bevy_reflect",
- "bevy_render",
- "bevy_scene",
- "bevy_sprite",
- "bevy_tasks",
- "bevy_text",
- "bevy_time",
- "bevy_transform",
- "bevy_ui",
- "bevy_utils",
- "bevy_window",
- "bevy_winit",
+ "bevy_ptr 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_scene 0.14.0",
+ "bevy_sprite 0.14.0",
+ "bevy_state",
+ "bevy_tasks 0.14.0",
+ "bevy_text 0.14.0",
+ "bevy_time 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_ui 0.14.0",
+ "bevy_utils 0.14.0",
+ "bevy_window 0.14.0",
+ "bevy_winit 0.14.0",
 ]
 
 [[package]]
@@ -875,15 +1289,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5eea6c527fd828b7fef8d0f518167f27f405b904a16f227b644687d3f46a809"
 dependencies = [
  "android_log-sys",
- "bevy_app",
- "bevy_ecs",
- "bevy_utils",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_utils 0.13.2",
  "console_error_panic_hook",
  "tracing-log 0.1.4",
  "tracing-subscriber",
  "tracing-wasm",
 ]
 
+[[package]]
+name = "bevy_log"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bab641fd0de254915ab746165a07677465b2d89b72f5b49367d73b9197548a35"
+dependencies = [
+ "android_log-sys",
+ "bevy_app 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_utils 0.14.0",
+ "tracing-log 0.2.0",
+ "tracing-subscriber",
+ "tracing-wasm",
+]
+
 [[package]]
 name = "bevy_macro_utils"
 version = "0.13.2"
@@ -893,27 +1322,61 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc-hash",
- "syn 2.0.66",
- "toml_edit",
+ "syn 2.0.70",
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "bevy_macro_utils"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3ad860d35d74b35d4d6ae7f656d163b6f475aa2e64fc293ee86ac901977ddb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+ "toml_edit 0.22.15",
+]
+
+[[package]]
+name = "bevy_math"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f06daa26ffb82d90ba772256c0ba286f6c305c392f6976c9822717974805837c"
+dependencies = [
+ "glam 0.25.0",
+ "serde",
+]
+
+[[package]]
+name = "bevy_math"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51bd6ce2174d3237d30e0ab5b2508480cc7593ca4d96ffb3a3095f9fc6bbc34c"
+dependencies = [
+ "bevy_reflect 0.14.0",
+ "glam 0.27.0",
+ "rand",
+ "smallvec",
+ "thiserror",
 ]
 
 [[package]]
-name = "bevy_math"
+name = "bevy_mikktspace"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f06daa26ffb82d90ba772256c0ba286f6c305c392f6976c9822717974805837c"
+checksum = "a0d7ef7f2a826d0b19f059035831ce00a5e930435cc53c61e045773d0483f67a"
 dependencies = [
  "glam 0.25.0",
- "serde",
 ]
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d7ef7f2a826d0b19f059035831ce00a5e930435cc53c61e045773d0483f67a"
+checksum = "b7ce4266293629a2d10459cc112dffe3b3e9229a4f2b8a4d20061b8dd53316d0"
 dependencies = [
- "glam 0.25.0",
+ "glam 0.27.0",
 ]
 
 [[package]]
@@ -921,44 +1384,44 @@ name = "bevy_mod_billboard"
 version = "0.6.0"
 source = "git+https://github.com/kulkalkul/bevy_mod_billboard?branch=main#3f7ac1e63b136510637c7d397cc32d2cb301dda1"
 dependencies = [
- "bevy",
- "bitflags 2.5.0",
+ "bevy 0.13.2",
+ "bitflags 2.6.0",
  "smallvec",
 ]
 
 [[package]]
 name = "bevy_mod_outline"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be22e104f55f13887496b799f67911c31159a5bd59d9ef9bdd66dd1193f0424c"
+version = "0.8.0"
+source = "git+https://github.com/komadori/bevy_mod_outline.git#68c6329a81db27c128a9f158cd1ce376edd63efa"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
  "bitfield",
  "interpolation",
+ "nonmax",
  "thiserror",
- "wgpu-types",
+ "wgpu-types 0.20.0",
 ]
 
 [[package]]
 name = "bevy_mod_picking"
-version = "0.18.2"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d79f17a34025d95e2e3525207ec73090647c6f40c3136fc674f87e167a9ae6be"
+checksum = "5cbcb08ab83764e21b725f695827b641701e34e7eff2dbffb6b343847b785873"
 dependencies = [
- "bevy_app",
- "bevy_core",
- "bevy_ecs",
+ "bevy_app 0.13.2",
+ "bevy_core 0.13.2",
+ "bevy_ecs 0.13.2",
  "bevy_eventlistener",
- "bevy_math",
+ "bevy_math 0.13.2",
  "bevy_picking_core",
  "bevy_picking_highlight",
  "bevy_picking_input",
  "bevy_picking_raycast",
  "bevy_picking_selection",
- "bevy_reflect",
- "bevy_render",
- "bevy_utils",
- "bevy_window",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_window 0.13.2",
 ]
 
 [[package]]
@@ -967,135 +1430,137 @@ version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ca646aeaab4a170e1f3e8284b925e2f990eb18616e95d7826c873c8e26ee945"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_derive",
- "bevy_ecs",
- "bevy_gizmos",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_gizmos 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_sprite 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_window 0.13.2",
  "crossbeam-channel",
 ]
 
 [[package]]
 name = "bevy_panorbit_camera"
-version = "0.16.1"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ae36af26f6c75067cba3fac09fbd4cbe7fc565492cc6064338a9e0063363db"
+checksum = "f3314c6336cc4e967ac64da28e91b9e9305fbebd08b30c4e1296dff985f2e0cb"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b29c80269fa6db55c9e33701edd3ecb73d8866ca8cb814d49a9d3fb72531b6"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "bitflags 2.5.0",
+checksum = "3effe8ff28899f14d250d0649ca9868dbe68b389d0f2b7af086759b8e16c6e3d"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_core_pipeline 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
+ "bevy_window 0.14.0",
+ "bitflags 2.6.0",
  "bytemuck",
- "fixedbitset",
+ "fixedbitset 0.5.7",
+ "nonmax",
  "radsort",
  "smallvec",
- "thread_local",
+ "static_assertions",
 ]
 
 [[package]]
 name = "bevy_picking_core"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c8cdca408508a7d006bf077c6cbb6660a65895323333f206b7cce7b801a8e2"
+checksum = "c168fce188e01d19f6db5bde2ca8249ec5b59720ab5ec82826c6906c6f06850c"
 dependencies = [
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
+ "bevy_app 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
  "bevy_eventlistener",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_window 0.13.2",
 ]
 
 [[package]]
 name = "bevy_picking_highlight"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e684569b5f7dae06d1ff66e2287cee808b3862d9ae0d01dbe114d7d199d40cfd"
+checksum = "46e49069da84b0fec990f9b73bb4cdb2767028c0e7e9685180cded2954e22166"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_ecs",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_ecs 0.13.2",
  "bevy_picking_core",
  "bevy_picking_selection",
- "bevy_reflect",
+ "bevy_reflect 0.13.2",
 ]
 
 [[package]]
 name = "bevy_picking_input"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60182209f48943de6c8bc3305a70f52012a18ef26f92f460f9436441b8badf0b"
+checksum = "f72c3ad25a644b19419ef4c7ec1a245bc09858b672ba33583bd17016d0ee4fcb"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_math",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_hierarchy 0.13.2",
+ "bevy_input 0.13.2",
+ "bevy_math 0.13.2",
  "bevy_picking_core",
  "bevy_picking_selection",
- "bevy_reflect",
- "bevy_render",
- "bevy_utils",
- "bevy_window",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_window 0.13.2",
 ]
 
 [[package]]
 name = "bevy_picking_raycast"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2677d0a3402fea3327a216649c104f969685a5c01d969d274c89facba86c164d"
+checksum = "408f961c27043a39451ec0254f0b75325ced3b73d9aa1a0ef4276e43967e16fc"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
  "bevy_mod_raycast",
  "bevy_picking_core",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_window",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_window 0.13.2",
 ]
 
 [[package]]
 name = "bevy_picking_selection"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc986eefd38058918322418d1e6ae398e74d48730e623a55dc20be78d5ee24b"
+checksum = "ca137648ef4ad692cf7fe4ff49b7486ed3fe41217b546cd3eeac1bce701cf235"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
  "bevy_eventlistener",
- "bevy_input",
+ "bevy_input 0.13.2",
  "bevy_picking_core",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_reflect 0.13.2",
+ "bevy_utils 0.13.2",
 ]
 
 [[package]]
@@ -1104,16 +1569,22 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8050e2869fe341db6874203b5a01ff12673807a2c7c80cb829f6c7bea6997268"
 
+[[package]]
+name = "bevy_ptr"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c115c97a5c8a263bd0aa7001b999772c744ac5ba797d07c86f25734ce381ea69"
+
 [[package]]
 name = "bevy_reflect"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccbd7de21d586457a340a0962ad0747dc5098ff925eb6b27a918c4bdd8252f7b"
 dependencies = [
- "bevy_math",
- "bevy_ptr",
- "bevy_reflect_derive",
- "bevy_utils",
+ "bevy_math 0.13.2",
+ "bevy_ptr 0.13.2",
+ "bevy_reflect_derive 0.13.2",
+ "bevy_utils 0.13.2",
  "downcast-rs",
  "erased-serde",
  "glam 0.25.0",
@@ -1122,16 +1593,49 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "bevy_reflect"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "406ea0fce267169c2320c7302d97d09f605105686346762562c5f65960b5ca2f"
+dependencies = [
+ "bevy_ptr 0.14.0",
+ "bevy_reflect_derive 0.14.0",
+ "bevy_utils 0.14.0",
+ "downcast-rs",
+ "erased-serde",
+ "glam 0.27.0",
+ "petgraph",
+ "serde",
+ "smallvec",
+ "smol_str",
+ "thiserror",
+ "uuid",
+]
+
 [[package]]
 name = "bevy_reflect_derive"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ce33051bd49036d4a5a62aa3f2068672ec55f3ebe92aa0d003a341f15cc37ac"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.13.2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_reflect_derive"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0427fdb4425fc72cc96d45e550df83ace6347f0503840de116c76a40843ba751"
+dependencies = [
+ "bevy_macro_utils 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
  "uuid",
 ]
 
@@ -1142,42 +1646,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88b2c4b644c739c0b474b6f8f7b0bc68ac13d83b59688781e9a7753c52780177"
 dependencies = [
  "async-channel",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_derive",
- "bevy_ecs",
- "bevy_encase_derive",
- "bevy_hierarchy",
- "bevy_log",
- "bevy_math",
- "bevy_mikktspace",
- "bevy_reflect",
- "bevy_render_macros",
- "bevy_tasks",
- "bevy_time",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "bitflags 2.5.0",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_core 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_encase_derive 0.13.2",
+ "bevy_hierarchy 0.13.2",
+ "bevy_log 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_mikktspace 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render_macros 0.13.2",
+ "bevy_tasks 0.13.2",
+ "bevy_time 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_window 0.13.2",
+ "bitflags 2.6.0",
  "bytemuck",
  "codespan-reporting",
  "downcast-rs",
- "encase",
+ "encase 0.7.0",
  "futures-lite",
- "hexasphere",
+ "hexasphere 10.0.0",
  "image 0.24.9",
  "js-sys",
+ "naga 0.19.2",
+ "naga_oil 0.13.0",
+ "serde",
+ "thiserror",
+ "thread_local",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu 0.19.4",
+]
+
+[[package]]
+name = "bevy_render"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c48acf1ff4267c231def4cbf573248d42ac60c9952108822d505019460bf36d"
+dependencies = [
+ "async-channel",
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_core 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_diagnostic 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_encase_derive 0.14.0",
+ "bevy_hierarchy 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_mikktspace 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_render_macros 0.14.0",
+ "bevy_tasks 0.14.0",
+ "bevy_time 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
+ "bevy_window 0.14.0",
+ "bitflags 2.6.0",
+ "bytemuck",
+ "codespan-reporting",
+ "downcast-rs",
+ "encase 0.8.0",
+ "futures-lite",
+ "hexasphere 12.0.0",
+ "image 0.25.1",
+ "js-sys",
  "ktx2",
- "naga",
- "naga_oil",
+ "naga 0.20.0",
+ "naga_oil 0.14.0",
+ "nonmax",
  "ruzstd",
+ "send_wrapper",
  "serde",
+ "smallvec",
  "thiserror",
- "thread_local",
  "wasm-bindgen",
  "web-sys",
- "wgpu",
+ "wgpu 0.20.1",
 ]
 
 [[package]]
@@ -1186,10 +1736,22 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "720b88406e786e378829b7d43c1ffb5300186912b99904d0d4d8ec6698a4f210"
 dependencies = [
- "bevy_macro_utils",
+ "bevy_macro_utils 0.13.2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "bevy_render_macros"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ddf4a96d71519c8eca3d74dabcb89a9c0d50ab5d9230638cb004145f46e9ed"
+dependencies = [
+ "bevy_macro_utils 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -1198,15 +1760,35 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3d2caa1bfe7542dbe2c62e1bcc10791ba181fb744d2fe6711d1d373354da7c"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_derive",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_hierarchy 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_utils 0.13.2",
+ "serde",
+ "thiserror",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_scene"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7a9f0388612a116f02ab6187aeab66e52c9e91abbc21f919b8b50230c4d83e7"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_hierarchy 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
  "serde",
  "thiserror",
  "uuid",
@@ -1218,26 +1800,78 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cad1b555161f50e5d62b7fdf7ebeef1b24338aae7a88e51985da9553cd60ddf"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_ecs",
- "bevy_log",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bitflags 2.5.0",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_core_pipeline 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_log 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_utils 0.13.2",
+ "bitflags 2.6.0",
+ "bytemuck",
+ "fixedbitset 0.4.2",
+ "guillotiere",
+ "radsort",
+ "rectangle-pack",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_sprite"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d837e33ed27b9f2e5212eca4bdd5655a9ee64c52914112e6189c043cb25dd1ec"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_core_pipeline 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
+ "bitflags 2.6.0",
  "bytemuck",
- "fixedbitset",
+ "fixedbitset 0.5.7",
  "guillotiere",
  "radsort",
  "rectangle-pack",
  "thiserror",
 ]
 
+[[package]]
+name = "bevy_state"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0959984092d56885fd3b320ea84fb816821bad6bfa3040b9d4ee850d3273233d"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_hierarchy 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_state_macros",
+ "bevy_utils 0.14.0",
+]
+
+[[package]]
+name = "bevy_state_macros"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "887a98bfa268258377cd073f5bb839518d3a1cd6b96ed81418145485b69378e6"
+dependencies = [
+ "bevy_macro_utils 0.14.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
 [[package]]
 name = "bevy_tasks"
 version = "0.13.2"
@@ -1252,6 +1886,19 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "bevy_tasks"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a8bfb8d484bdb1e9bec3789c75202adc5e608c4244347152e50fb31668a54f9"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "concurrent-queue",
+ "futures-lite",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "bevy_text"
 version = "0.13.2"
@@ -1259,16 +1906,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4e8456ae0bea7d6b7621e42c1c12bf66c0891381e62c948ab23920673ce611c"
 dependencies = [
  "ab_glyph",
- "bevy_app",
- "bevy_asset",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_sprite 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_window 0.13.2",
+ "glyph_brush_layout",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_text"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "454fd29b7828244356b2e0ce782e6d0a6f26b47f521456accde3a7191b121727"
+dependencies = [
+ "ab_glyph",
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_ecs 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_sprite 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
+ "bevy_window 0.14.0",
  "glyph_brush_layout",
  "serde",
  "thiserror",
@@ -1280,10 +1950,24 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38ea5ae9fe7f56f555dbb05a88d34931907873e3f0c7dc426591839eef72fe3e"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_utils",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_utils 0.13.2",
+ "crossbeam-channel",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_time"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6c3d3d14ee8b0dbe4819fd516cc75509b61946134d78e0ee89ad3d1835ffe6c"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_utils 0.14.0",
  "crossbeam-channel",
  "thiserror",
 ]
@@ -1294,11 +1978,25 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0d51a1f332cc00939d2f19ed6b909e5ed7037e39c7e25cc86930d79d432163e"
 dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_math",
- "bevy_reflect",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_hierarchy 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_transform"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97e8aa6b16be573277c6ceda30aebf1d78af7c6ede19b448dcb052fb8601d815"
+dependencies = [
+ "bevy_app 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_hierarchy 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
  "thiserror",
 ]
 
@@ -1308,25 +2006,55 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6bbc30be39cfbfa3a073b541d22aea43ab14452dea12d7411ce201df17ff7b1"
 dependencies = [
- "bevy_a11y",
- "bevy_app",
- "bevy_asset",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_log",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_sprite",
- "bevy_text",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
+ "bevy_a11y 0.13.2",
+ "bevy_app 0.13.2",
+ "bevy_asset 0.13.2",
+ "bevy_core_pipeline 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_hierarchy 0.13.2",
+ "bevy_input 0.13.2",
+ "bevy_log 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_render 0.13.2",
+ "bevy_sprite 0.13.2",
+ "bevy_text 0.13.2",
+ "bevy_transform 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_window 0.13.2",
+ "bytemuck",
+ "taffy 0.3.19",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_ui"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d9f864c646f3742ff77f67bcd89a13a7ab024b68ca2f1bfbab8245bcb1c06c"
+dependencies = [
+ "bevy_a11y 0.14.0",
+ "bevy_app 0.14.0",
+ "bevy_asset 0.14.0",
+ "bevy_color",
+ "bevy_core_pipeline 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_hierarchy 0.14.0",
+ "bevy_input 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_render 0.14.0",
+ "bevy_sprite 0.14.0",
+ "bevy_text 0.14.0",
+ "bevy_transform 0.14.0",
+ "bevy_utils 0.14.0",
+ "bevy_window 0.14.0",
  "bytemuck",
- "taffy",
+ "nonmax",
+ "smallvec",
+ "taffy 0.5.2",
  "thiserror",
 ]
 
@@ -1337,7 +2065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a9f845a985c00e0ee8dc2d8af3f417be925fb52aad4bda5b96e2e58a2b4d2eb"
 dependencies = [
  "ahash",
- "bevy_utils_proc_macros",
+ "bevy_utils_proc_macros 0.13.2",
  "getrandom",
  "hashbrown",
  "nonmax",
@@ -1349,6 +2077,21 @@ dependencies = [
  "web-time 0.2.4",
 ]
 
+[[package]]
+name = "bevy_utils"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fab364910e8f5839578aba9cfda00a8388e9ebe352ceb8491a742ce6af9ec6e"
+dependencies = [
+ "ahash",
+ "bevy_utils_proc_macros 0.14.0",
+ "getrandom",
+ "hashbrown",
+ "thread_local",
+ "tracing",
+ "web-time 1.1.0",
+]
+
 [[package]]
 name = "bevy_utils_proc_macros"
 version = "0.13.2"
@@ -1357,7 +2100,18 @@ checksum = "bef158627f30503d5c18c20c60b444829f698d343516eeaf6eeee078c9a45163"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "bevy_utils_proc_macros"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad9db261ab33a046e1f54b35f885a44f21fcc80aa2bc9050319466b88fe58fe3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -1366,14 +2120,30 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976202d2ed838176595b550ac654b15ae236e0178a6f19a94ca6d58f2a96ca60"
 dependencies = [
- "bevy_a11y",
- "bevy_app",
- "bevy_ecs",
- "bevy_input",
- "bevy_math",
- "bevy_reflect",
- "bevy_utils",
- "raw-window-handle 0.6.2",
+ "bevy_a11y 0.13.2",
+ "bevy_app 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_input 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_reflect 0.13.2",
+ "bevy_utils 0.13.2",
+ "raw-window-handle",
+ "smol_str",
+]
+
+[[package]]
+name = "bevy_window"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9ea5777f933bf7ecaeb3af1a30845720ec730e007972ca7d4aba2d3512abe24"
+dependencies = [
+ "bevy_a11y 0.14.0",
+ "bevy_app 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_utils 0.14.0",
+ "raw-window-handle",
  "smol_str",
 ]
 
@@ -1383,50 +2153,51 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa66539aa93d8522b146bf82de429714ea6370a6061fc1f1ff7bcacd4e64c6c4"
 dependencies = [
- "accesskit_winit",
+ "accesskit_winit 0.17.0",
  "approx",
- "bevy_a11y",
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_math",
- "bevy_tasks",
- "bevy_utils",
- "bevy_window",
+ "bevy_a11y 0.13.2",
+ "bevy_app 0.13.2",
+ "bevy_derive 0.13.2",
+ "bevy_ecs 0.13.2",
+ "bevy_hierarchy 0.13.2",
+ "bevy_input 0.13.2",
+ "bevy_math 0.13.2",
+ "bevy_tasks 0.13.2",
+ "bevy_utils 0.13.2",
+ "bevy_window 0.13.2",
  "crossbeam-channel",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "wasm-bindgen",
  "web-sys",
  "winit 0.29.15",
 ]
 
 [[package]]
-name = "bevy_xpbd_3d"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0425ea7361b9b27c2a382e0663deb42f41147eee60fb2b3d5fa7e42d363ea848"
-dependencies = [
- "bevy",
- "bevy_math",
- "bevy_xpbd_derive",
- "derive_more",
- "fxhash",
- "indexmap",
- "itertools",
- "nalgebra",
- "parry3d",
-]
-
-[[package]]
-name = "bevy_xpbd_derive"
-version = "0.1.0"
+name = "bevy_winit"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e1ef1d5e328abe1b76df974245f78e17fd17867583883d5e77444c6a8223a64"
+checksum = "f8c2213bbf14debe819ec8ad4913f233c596002d087bc6f1f20d533e2ebaf8c6"
 dependencies = [
- "quote",
- "syn 2.0.66",
+ "accesskit_winit 0.20.4",
+ "approx",
+ "bevy_a11y 0.14.0",
+ "bevy_app 0.14.0",
+ "bevy_derive 0.14.0",
+ "bevy_ecs 0.14.0",
+ "bevy_hierarchy 0.14.0",
+ "bevy_input 0.14.0",
+ "bevy_log 0.14.0",
+ "bevy_math 0.14.0",
+ "bevy_reflect 0.14.0",
+ "bevy_tasks 0.14.0",
+ "bevy_utils 0.14.0",
+ "bevy_window 0.14.0",
+ "cfg-if",
+ "crossbeam-channel",
+ "raw-window-handle",
+ "wasm-bindgen",
+ "web-sys",
+ "winit 0.30.3",
 ]
 
 [[package]]
@@ -1435,10 +2206,10 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools",
+ "itertools 0.12.1",
  "lazy_static",
  "lazycell",
  "proc-macro2",
@@ -1446,7 +2217,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -1472,9 +2243,9 @@ checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
 
 [[package]]
 name = "bitfield"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
+checksum = "c821a6e124197eb56d907ccc2188eab1038fb919c914f47976e64dd8dbc855d1"
 
 [[package]]
 name = "bitflags"
@@ -1484,9 +2255,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -1578,9 +2349,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -1593,7 +2364,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -1614,7 +2385,7 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "log",
  "polling",
  "rustix",
@@ -1636,9 +2407,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8"
 dependencies = [
  "jobserver",
  "libc",
@@ -1686,14 +2457,14 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.8.3",
+ "libloading 0.8.4",
 ]
 
 [[package]]
 name = "clipboard-win"
-version = "5.3.1"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad"
+checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
 dependencies = [
  "error-code",
 ]
@@ -1774,6 +2545,16 @@ 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"
@@ -1966,8 +2747,19 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
 dependencies = [
- "bitflags 2.5.0",
- "libloading 0.8.3",
+ "bitflags 2.6.0",
+ "libloading 0.8.4",
+ "winapi",
+]
+
+[[package]]
+name = "d3d12"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813"
+dependencies = [
+ "bitflags 2.6.0",
+ "libloading 0.8.4",
  "winapi",
 ]
 
@@ -1999,7 +2791,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -2008,24 +2800,13 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
-[[package]]
-name = "displaydoc"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "dlib"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.3",
+ "libloading 0.8.4",
 ]
 
 [[package]]
@@ -2065,7 +2846,6 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03cfe80b1890e1a8cdbffc6044d6872e814aaf6011835a2a5e2db0e5c5c4ef4e"
 dependencies = [
- "bytemuck",
  "serde",
 ]
 
@@ -2079,11 +2859,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ecolor"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8"
+dependencies = [
+ "bytemuck",
+ "emath 0.28.1",
+]
+
 [[package]]
 name = "editor_as_plugin"
 version = "0.6.0"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
  "space_editor",
  "workspace-hakari",
 ]
@@ -2094,7 +2884,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180f595432a5b615fc6b74afef3955249b86cfea72607b40740a4cd60d5297d0"
 dependencies = [
- "accesskit",
+ "accesskit 0.12.3",
  "ahash",
  "epaint 0.26.2",
  "nohash-hasher",
@@ -2107,13 +2897,25 @@ version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a"
 dependencies = [
- "accesskit",
+ "accesskit 0.12.3",
  "ahash",
  "epaint 0.27.2",
  "nohash-hasher",
  "serde",
 ]
 
+[[package]]
+name = "egui"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798"
+dependencies = [
+ "ahash",
+ "emath 0.28.1",
+ "epaint 0.28.1",
+ "nohash-hasher",
+]
+
 [[package]]
 name = "egui-gizmo"
 version = "0.16.2"
@@ -2186,9 +2988,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "emath"
@@ -2196,7 +2998,6 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6916301ecf80448f786cdf3eb51d9dbdd831538732229d49119e2d4312eaaf09"
 dependencies = [
- "bytemuck",
  "serde",
 ]
 
@@ -2210,6 +3011,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "emath"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "encase"
 version = "0.7.0"
@@ -2217,18 +3027,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103"
 dependencies = [
  "const_panic",
- "encase_derive",
+ "encase_derive 0.7.0",
  "glam 0.25.0",
  "thiserror",
 ]
 
+[[package]]
+name = "encase"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9299a95fa5671ddf29ecc22b00e121843a65cb9ff24911e394b4ae556baf36"
+dependencies = [
+ "const_panic",
+ "encase_derive 0.8.0",
+ "glam 0.27.0",
+ "thiserror",
+]
+
 [[package]]
 name = "encase_derive"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a"
 dependencies = [
- "encase_derive_impl",
+ "encase_derive_impl 0.7.0",
+]
+
+[[package]]
+name = "encase_derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e09decb3beb1fe2db6940f598957b2e1f7df6206a804d438ff6cb2a9cddc10"
+dependencies = [
+ "encase_derive_impl 0.8.0",
 ]
 
 [[package]]
@@ -2239,7 +3070,18 @@ checksum = "92959a9e8d13eaa13b8ae8c7b583c3bf1669ca7a8e7708a088d12587ba86effc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "encase_derive_impl"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -2260,7 +3102,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -2271,7 +3113,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -2282,7 +3124,6 @@ checksum = "77b9fdf617dd7f58b0c8e6e9e4a1281f730cde0831d40547da446b2bb76a47af"
 dependencies = [
  "ab_glyph",
  "ahash",
- "bytemuck",
  "ecolor 0.26.2",
  "emath 0.26.2",
  "nohash-hasher",
@@ -2306,6 +3147,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "epaint"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01"
+dependencies = [
+ "ab_glyph",
+ "ahash",
+ "bytemuck",
+ "ecolor 0.28.1",
+ "emath 0.28.1",
+ "nohash-hasher",
+ "parking_lot",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -2411,6 +3267,12 @@ 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.30"
@@ -2460,7 +3322,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -2503,6 +3365,15 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "fuzzy-matcher"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
+dependencies = [
+ "thread_local",
+]
+
 [[package]]
 name = "fxhash"
 version = "0.2.1"
@@ -2516,7 +3387,7 @@ dependencies = [
 name = "game_app"
 version = "0.1.0"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
  "space_bevy_xpbd_plugin",
  "space_prefab",
  "workspace-hakari",
@@ -2557,9 +3428,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b54e5e39844ab5cddaf3bbbdfdc2923a6cb34e36818b95618da4e3f26302c24c"
+checksum = "3f226b8f4d9bc7da93de8efd8747c6b1086409ca3f4b6d51e9a7f5461a9183fe"
 dependencies = [
  "fnv",
  "gilrs-core",
@@ -2570,9 +3441,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs-core"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b922f294d9f062af517ea0bd0a036ddcf11c2842211c2f9c71a3ceee859e10b6"
+checksum = "bbb5e8d912059b33b463831c16b838d15c4772d584ce332e4a80f6dffdae2bc1"
 dependencies = [
  "core-foundation",
  "inotify",
@@ -2586,7 +3457,7 @@ dependencies = [
  "vec_map",
  "wasm-bindgen",
  "web-sys",
- "windows 0.57.0",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -2617,6 +3488,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "glam"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+dependencies = [
+ "bytemuck",
+ "rand",
+ "serde",
+]
+
 [[package]]
 name = "glam"
 version = "0.28.0"
@@ -2667,7 +3549,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -2693,9 +3575,9 @@ dependencies = [
 
 [[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",
@@ -2708,7 +3590,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "gpu-alloc-types",
 ]
 
@@ -2718,7 +3600,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -2740,8 +3622,19 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
 dependencies = [
- "bitflags 2.5.0",
- "gpu-descriptor-types",
+ "bitflags 2.6.0",
+ "gpu-descriptor-types 0.1.2",
+ "hashbrown",
+]
+
+[[package]]
+name = "gpu-descriptor"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
+dependencies = [
+ "bitflags 2.6.0",
+ "gpu-descriptor-types 0.2.0",
  "hashbrown",
 ]
 
@@ -2751,7 +3644,16 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "gpu-descriptor-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
+dependencies = [
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -2760,6 +3662,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c"
 
+[[package]]
+name = "grid"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82"
+
 [[package]]
 name = "guillotiere"
 version = "0.6.2"
@@ -2797,10 +3705,10 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "com",
  "libc",
- "libloading 0.8.3",
+ "libloading 0.8.4",
  "thiserror",
  "widestring",
  "winapi",
@@ -2828,6 +3736,16 @@ dependencies = [
  "glam 0.25.0",
 ]
 
+[[package]]
+name = "hexasphere"
+version = "12.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd6b038160f086b0a7496edae34169ae22f328793cbe2b627a5a3d8373748ec"
+dependencies = [
+ "constgebra",
+ "glam 0.27.0",
+]
+
 [[package]]
 name = "hexf-parse"
 version = "0.2.1"
@@ -2854,134 +3772,14 @@ dependencies = [
  "objc2 0.4.1",
 ]
 
-[[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.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
-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.66",
-]
-
 [[package]]
 name = "idna"
-version = "1.0.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
- "icu_normalizer",
- "icu_properties",
- "smallvec",
- "utf8_iter",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -3021,6 +3819,15 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
 
+[[package]]
+name = "immutable-chunkmap"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4419f022e55cc63d5bbd6b44b71e1d226b9c9480a47824c706e9d54e5c40c5eb"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@@ -3082,6 +3889,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -3144,7 +3960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading 0.8.3",
+ "libloading 0.8.4",
  "pkg-config",
 ]
 
@@ -3174,9 +3990,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lazycell"
@@ -3219,12 +4035,12 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3239,7 +4055,7 @@ version = "0.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
  "redox_syscall 0.4.1",
 ]
@@ -3260,12 +4076,6 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
-[[package]]
-name = "litemap"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
-
 [[package]]
 name = "litrs"
 version = "0.4.1"
@@ -3284,9 +4094,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "mach2"
@@ -3355,7 +4165,22 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "block",
+ "core-graphics-types",
+ "foreign-types",
+ "log",
+ "objc",
+ "paste",
+]
+
+[[package]]
+name = "metal"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb"
+dependencies = [
+ "bitflags 2.6.0",
  "block",
  "core-graphics-types",
  "foreign-types",
@@ -3388,9 +4213,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -3409,7 +4234,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843"
 dependencies = [
  "bit-set",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "codespan-reporting",
+ "hexf-parse",
+ "indexmap",
+ "log",
+ "num-traits",
+ "pp-rs",
+ "rustc-hash",
+ "spirv",
+ "termcolor",
+ "thiserror",
+ "unicode-xid",
+]
+
+[[package]]
+name = "naga"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231"
+dependencies = [
+ "arrayvec",
+ "bit-set",
+ "bitflags 2.6.0",
  "codespan-reporting",
  "hexf-parse",
  "indexmap",
@@ -3433,7 +4280,27 @@ dependencies = [
  "codespan-reporting",
  "data-encoding",
  "indexmap",
- "naga",
+ "naga 0.19.2",
+ "once_cell",
+ "regex",
+ "regex-syntax 0.8.4",
+ "rustc-hash",
+ "thiserror",
+ "tracing",
+ "unicode-ident",
+]
+
+[[package]]
+name = "naga_oil"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "275d9720a7338eedac966141089232514c84d76a246a58ef501af88c5edf402f"
+dependencies = [
+ "bit-set",
+ "codespan-reporting",
+ "data-encoding",
+ "indexmap",
+ "naga 0.20.0",
  "once_cell",
  "regex",
  "regex-syntax 0.8.4",
@@ -3450,7 +4317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4"
 dependencies = [
  "approx",
- "glam 0.25.0",
+ "glam 0.27.0",
  "matrixmultiply",
  "nalgebra-macros",
  "num-complex",
@@ -3462,13 +4329,13 @@ dependencies = [
 
 [[package]]
 name = "nalgebra-macros"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
+checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -3477,12 +4344,12 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "jni-sys",
  "log",
  "ndk-sys 0.5.0+25.2.9519653",
  "num_enum",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -3492,12 +4359,12 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "jni-sys",
  "log",
  "ndk-sys 0.6.0+11769913",
  "num_enum",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -3544,7 +4411,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "cfg_aliases 0.2.1",
  "libc",
@@ -3608,7 +4475,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -3658,7 +4525,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -3720,7 +4587,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -3736,7 +4603,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -3760,7 +4627,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -3817,7 +4684,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block2 0.5.1",
  "dispatch",
  "libc",
@@ -3842,7 +4709,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -3854,7 +4721,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -3877,7 +4744,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit",
@@ -3909,7 +4776,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -3927,9 +4794,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
+checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
 dependencies = [
  "memchr",
 ]
@@ -3989,9 +4856,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.21.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5"
+checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
 dependencies = [
  "ttf-parser",
 ]
@@ -4022,20 +4889,21 @@ dependencies = [
  "libc",
  "redox_syscall 0.5.2",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "parry3d"
-version = "0.13.8"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d27f5ab3d42400056b5b6a6306dbaa91fc3033d8628146dca0d8ed7fbc20730"
+checksum = "aa342e0cdfc774fed0196714290ba2d85408b8ce9f295c40a0b1e05f3f8256ab"
 dependencies = [
  "approx",
  "arrayvec",
  "bitflags 1.3.2",
  "downcast-rs",
  "either",
+ "log",
  "nalgebra",
  "num-derive",
  "num-traits",
@@ -4070,8 +4938,10 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
- "fixedbitset",
+ "fixedbitset 0.4.2",
  "indexmap",
+ "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -4097,7 +4967,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -4184,7 +5054,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
@@ -4213,9 +5083,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -4237,9 +5107,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.31.0"
+version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
 dependencies = [
  "memchr",
 ]
@@ -4295,12 +5165,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
-[[package]]
-name = "raw-window-handle"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
-
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -4369,7 +5233,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -4438,9 +5302,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.37"
+version = "0.8.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
+checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9"
 dependencies = [
  "bytemuck",
 ]
@@ -4468,12 +5332,13 @@ checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30"
 
 [[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",
 ]
 
 [[package]]
@@ -4483,7 +5348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "serde",
  "serde_derive",
 ]
@@ -4521,7 +5386,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -4530,11 +5395,12 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.4"
+version = "0.23.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
 dependencies = [
  "log",
+ "once_cell",
  "ring",
  "rustls-pki-types",
  "rustls-webpki",
@@ -4550,9 +5416,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.4"
+version = "0.102.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4561,12 +5427,11 @@ dependencies = [
 
 [[package]]
 name = "ruzstd"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
+checksum = "5022b253619b1ba797f243056276bed8ed1a73b0f5a7ce7225d524067644bf8f"
 dependencies = [
  "byteorder",
- "derive_more",
  "twox-hash",
 ]
 
@@ -4578,9 +5443,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "safe_arch"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
+checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a"
 dependencies = [
  "bytemuck",
 ]
@@ -4608,9 +5473,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550"
+checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7"
 dependencies = [
  "ab_glyph",
  "log",
@@ -4621,9 +5486,9 @@ dependencies = [
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de61fa7334ee8ee1f5c3c58dcc414fb9361e7e8f5bff9d45f4d69eeb89a7169"
+checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086"
 dependencies = [
  "ab_glyph",
  "log",
@@ -4638,31 +5503,37 @@ 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 = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "itoa",
  "ryu",
@@ -4751,7 +5622,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
@@ -4783,9 +5654,9 @@ dependencies = [
 name = "space_bevy_xpbd_plugin"
 version = "0.6.0"
 dependencies = [
- "bevy",
+ "avian3d",
+ "bevy 0.14.0",
  "bevy-inspector-egui",
- "bevy_xpbd_3d",
  "space_editor_ui",
  "workspace-hakari",
 ]
@@ -4795,7 +5666,7 @@ name = "space_editor"
 version = "0.6.0"
 dependencies = [
  "backtrace-on-stack-overflow",
- "bevy",
+ "bevy 0.14.0",
  "game_app",
  "space_bevy_xpbd_plugin",
  "space_editor_ui",
@@ -4807,7 +5678,7 @@ dependencies = [
 name = "space_editor_core"
 version = "0.6.0"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
  "bevy_egui",
  "bevy_mod_outline",
  "egui-toast",
@@ -4823,7 +5694,7 @@ dependencies = [
 name = "space_editor_tabs"
 version = "0.6.0"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
  "bevy_egui",
  "convert_case 0.6.0",
  "egui_dock",
@@ -4836,7 +5707,7 @@ name = "space_editor_ui"
 version = "0.6.0"
 dependencies = [
  "anyhow",
- "bevy",
+ "bevy 0.14.0",
  "bevy-inspector-egui",
  "bevy_asset_loader",
  "bevy_debug_grid",
@@ -4861,7 +5732,7 @@ dependencies = [
 name = "space_persistence"
 version = "0.6.0"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
  "ron",
  "serde",
  "workspace-hakari",
@@ -4871,7 +5742,7 @@ dependencies = [
 name = "space_prefab"
 version = "0.6.0"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
  "bevy-inspector-egui",
  "bevy-scene-hook",
  "rand",
@@ -4887,7 +5758,7 @@ name = "space_shared"
 version = "0.6.0"
 dependencies = [
  "anyhow",
- "bevy",
+ "bevy 0.14.0",
  "bevy-inspector-egui",
  "egui-toast",
  "egui_file",
@@ -4899,7 +5770,7 @@ dependencies = [
 name = "space_undo"
 version = "0.6.0"
 dependencies = [
- "bevy",
+ "bevy 0.14.0",
  "pretty-type-name",
  "workspace-hakari",
 ]
@@ -4931,15 +5802,9 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -4957,9 +5822,9 @@ dependencies = [
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "svg_fmt"
@@ -4990,31 +5855,20 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.66"
+version = "2.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16"
 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.66",
-]
-
 [[package]]
 name = "sysinfo"
-version = "0.30.12"
+version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
@@ -5031,8 +5885,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1315457ccd9c3def787a18fae91914e623e4dcff019b64ce39f5268ded53d3d"
 dependencies = [
  "arrayvec",
- "grid",
+ "grid 0.10.0",
+ "num-traits",
+ "slotmap",
+]
+
+[[package]]
+name = "taffy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94"
+dependencies = [
+ "arrayvec",
+ "grid 0.14.0",
  "num-traits",
+ "serde",
  "slotmap",
 ]
 
@@ -5062,7 +5929,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -5112,21 +5979,11 @@ dependencies = [
  "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",
 ]
@@ -5151,7 +6008,18 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
  "indexmap",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -5173,7 +6041,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -5239,9 +6107,9 @@ dependencies = [
 
 [[package]]
 name = "ttf-parser"
-version = "0.21.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
+checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a"
 
 [[package]]
 name = "twox-hash"
@@ -5274,12 +6142,27 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unicode-normalization"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"
@@ -5306,9 +6189,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.9.7"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd"
+checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea"
 dependencies = [
  "base64 0.22.1",
  "flate2",
@@ -5316,16 +6199,15 @@ dependencies = [
  "once_cell",
  "rustls",
  "rustls-pki-types",
- "rustls-webpki",
  "url",
  "webpki-roots",
 ]
 
 [[package]]
 name = "url"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -5376,23 +6258,11 @@ dependencies = [
  "tiny-skia-path",
 ]
 
-[[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.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom",
  "serde",
@@ -5453,7 +6323,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
  "wasm-bindgen-shared",
 ]
 
@@ -5487,7 +6357,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5500,9 +6370,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07"
+checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -5514,11 +6384,11 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.3"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133"
+checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "rustix",
  "wayland-backend",
  "wayland-scanner",
@@ -5530,16 +6400,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cursor-icon",
  "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.3"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9"
+checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2"
 dependencies = [
  "rustix",
  "wayland-client",
@@ -5552,7 +6422,7 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -5564,7 +6434,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -5577,7 +6447,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -5586,9 +6456,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.2"
+version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565"
+checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -5597,12 +6467,13 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.2"
+version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12"
+checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7"
 dependencies = [
  "dlib",
  "log",
+ "once_cell",
  "pkg-config",
 ]
 
@@ -5638,26 +6509,27 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "0.8.15"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b"
+checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e"
 dependencies = [
+ "block2 0.5.1",
  "core-foundation",
  "home",
  "jni",
  "log",
  "ndk-context",
- "objc",
- "raw-window-handle 0.5.2",
+ "objc2 0.5.2",
+ "objc2-foundation",
  "url",
  "web-sys",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.2"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3"
+checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -5679,18 +6551,44 @@ dependencies = [
  "cfg_aliases 0.1.1",
  "js-sys",
  "log",
- "naga",
+ "naga 0.19.2",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "static_assertions",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu-core 0.19.4",
+ "wgpu-hal 0.19.4",
+ "wgpu-types 0.19.2",
+]
+
+[[package]]
+name = "wgpu"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c"
+dependencies = [
+ "arrayvec",
+ "cfg-if",
+ "cfg_aliases 0.1.1",
+ "document-features",
+ "js-sys",
+ "log",
+ "naga 0.20.0",
  "parking_lot",
  "profiling",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "wgpu-core",
- "wgpu-hal",
- "wgpu-types",
+ "wgpu-core 0.21.1",
+ "wgpu-hal 0.21.1",
+ "wgpu-types 0.20.0",
 ]
 
 [[package]]
@@ -5701,22 +6599,49 @@ checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a"
 dependencies = [
  "arrayvec",
  "bit-vec",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "cfg_aliases 0.1.1",
+ "codespan-reporting",
+ "indexmap",
+ "log",
+ "naga 0.19.2",
+ "once_cell",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "rustc-hash",
+ "smallvec",
+ "thiserror",
+ "web-sys",
+ "wgpu-hal 0.19.4",
+ "wgpu-types 0.19.2",
+]
+
+[[package]]
+name = "wgpu-core"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39"
+dependencies = [
+ "arrayvec",
+ "bit-vec",
+ "bitflags 2.6.0",
  "cfg_aliases 0.1.1",
  "codespan-reporting",
+ "document-features",
  "indexmap",
  "log",
- "naga",
+ "naga 0.20.0",
  "once_cell",
  "parking_lot",
  "profiling",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "rustc-hash",
  "smallvec",
  "thiserror",
  "web-sys",
- "wgpu-hal",
- "wgpu-types",
+ "wgpu-hal 0.21.1",
+ "wgpu-types 0.20.0",
 ]
 
 [[package]]
@@ -5729,38 +6654,83 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "block",
+ "cfg_aliases 0.1.1",
+ "core-graphics-types",
+ "d3d12 0.19.0",
+ "glow",
+ "glutin_wgl_sys",
+ "gpu-alloc",
+ "gpu-allocator",
+ "gpu-descriptor 0.2.4",
+ "hassle-rs",
+ "js-sys",
+ "khronos-egl",
+ "libc",
+ "libloading 0.8.4",
+ "log",
+ "metal 0.27.0",
+ "naga 0.19.2",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "objc",
+ "once_cell",
+ "parking_lot",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle",
+ "renderdoc-sys",
+ "rustc-hash",
+ "smallvec",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu-types 0.19.2",
+ "winapi",
+]
+
+[[package]]
+name = "wgpu-hal"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222"
+dependencies = [
+ "android_system_properties",
+ "arrayvec",
+ "ash",
+ "bit-set",
+ "bitflags 2.6.0",
  "block",
  "cfg_aliases 0.1.1",
  "core-graphics-types",
- "d3d12",
+ "d3d12 0.20.0",
  "glow",
  "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
- "gpu-descriptor",
+ "gpu-descriptor 0.3.0",
  "hassle-rs",
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.3",
+ "libloading 0.8.4",
  "log",
- "metal",
- "naga",
+ "metal 0.28.0",
+ "naga 0.20.0",
  "ndk-sys 0.5.0+25.2.9519653",
  "objc",
  "once_cell",
  "parking_lot",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "renderdoc-sys",
  "rustc-hash",
  "smallvec",
  "thiserror",
  "wasm-bindgen",
  "web-sys",
- "wgpu-types",
+ "wgpu-types 0.20.0",
  "winapi",
 ]
 
@@ -5770,16 +6740,27 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "js-sys",
+ "web-sys",
+]
+
+[[package]]
+name = "wgpu-types"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef"
+dependencies = [
+ "bitflags 2.6.0",
  "js-sys",
  "web-sys",
 ]
 
 [[package]]
 name = "wide"
-version = "0.7.24"
+version = "0.7.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a040b111774ab63a19ef46bbc149398ab372b4ccdcfd719e9814dbd7dfd76c8"
+checksum = "2caba658a80831539b30698ae9862a72db6697dfdd7151e46920f5f2755c3ce2"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -5840,7 +6821,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
  "windows-core 0.52.0",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5850,17 +6831,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
  "windows-core 0.54.0",
- "windows-targets 0.52.5",
+ "windows-implement 0.53.0",
+ "windows-interface 0.53.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows"
-version = "0.57.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
 dependencies = [
- "windows-core 0.57.0",
- "windows-targets 0.52.5",
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5869,7 +6852,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5878,20 +6861,21 @@ version = "0.54.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
 dependencies = [
- "windows-result",
- "windows-targets 0.52.5",
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.57.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
- "windows-implement 0.57.0",
- "windows-interface 0.57.0",
- "windows-result",
- "windows-targets 0.52.5",
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
+ "windows-result 0.2.0",
+ "windows-strings",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5907,13 +6891,24 @@ dependencies = [
 
 [[package]]
 name = "windows-implement"
-version = "0.57.0"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -5929,13 +6924,24 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.57.0"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -5944,7 +6950,26 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
 dependencies = [
- "windows-targets 0.52.5",
+ "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]]
@@ -5971,7 +6996,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -6006,18 +7031,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "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.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "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]]
@@ -6034,9 +7059,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -6052,9 +7077,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -6070,15 +7095,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -6094,9 +7119,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -6112,9 +7137,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -6130,9 +7155,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -6148,9 +7173,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winit"
@@ -6161,7 +7186,7 @@ dependencies = [
  "ahash",
  "android-activity 0.5.2",
  "atomic-waker",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "bytemuck",
  "calloop",
  "cfg_aliases 0.1.1",
@@ -6179,10 +7204,10 @@ dependencies = [
  "once_cell",
  "orbclient",
  "percent-encoding",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "redox_syscall 0.3.5",
  "rustix",
- "sctk-adwaita 0.8.1",
+ "sctk-adwaita 0.8.3",
  "smithay-client-toolkit",
  "smol_str",
  "unicode-segmentation",
@@ -6202,14 +7227,14 @@ dependencies = [
 
 [[package]]
 name = "winit"
-version = "0.30.2"
+version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dc930d6cfbf53c4fe0b95689cdc2e17b8658c3f4214b9953298ccb5a1a15c90"
+checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004"
 dependencies = [
  "ahash",
  "android-activity 0.6.0",
  "atomic-waker",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "block2 0.5.1",
  "bytemuck",
  "calloop",
@@ -6230,10 +7255,10 @@ dependencies = [
  "orbclient",
  "percent-encoding",
  "pin-project",
- "raw-window-handle 0.6.2",
+ "raw-window-handle",
  "redox_syscall 0.4.1",
  "rustix",
- "sctk-adwaita 0.9.0",
+ "sctk-adwaita 0.9.1",
  "smithay-client-toolkit",
  "smol_str",
  "tracing",
@@ -6261,14 +7286,22 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "workspace-hakari"
 version = "0.1.0"
 dependencies = [
  "ahash",
- "bevy",
- "bevy_internal",
- "bevy_winit",
+ "bevy 0.14.0",
+ "bevy_winit 0.14.0",
  "bytemuck",
  "crossbeam-utils",
  "derive_more",
@@ -6285,23 +7318,11 @@ dependencies = [
  "num-traits",
  "serde",
  "syn 1.0.109",
- "syn 2.0.66",
+ "syn 2.0.70",
  "uuid",
- "winit 0.30.2",
+ "winit 0.30.3",
 ]
 
-[[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"
@@ -6322,7 +7343,7 @@ dependencies = [
  "as-raw-xcb-connection",
  "gethostname",
  "libc",
- "libloading 0.8.3",
+ "libloading 0.8.4",
  "once_cell",
  "rustix",
  "x11rb-protocol",
@@ -6352,7 +7373,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "dlib",
  "log",
  "once_cell",
@@ -6377,69 +7398,24 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
-[[package]]
-name = "yoke"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "synstructure",
-]
-
 [[package]]
 name = "zerocopy"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.4"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
- "synstructure",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -6448,28 +7424,6 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
-[[package]]
-name = "zerovec"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "zune-inflate"
 version = "0.2.54"
diff --git a/Cargo.toml b/Cargo.toml
index 355a1a1c..f2e4818e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,7 +44,7 @@ repository = "https://github.com/rewin123/space_editor"
 homepage = "https://github.com/rewin123/space_editor"
 
 [workspace.dependencies]
-bevy = "0.13.2"
+bevy = "0.14"
 
 # Editor Crates
 space_prefab = { version = "0.6.0", path = "crates/prefab" }
@@ -57,17 +57,17 @@ space_editor_tabs = { version = "0.6.0", path = "crates/editor_tabs" }
 
 # Crates inner libraries
 anyhow = "1.0"
-bevy_asset_loader = "0.20"
-bevy_debug_grid = "0.5"
-bevy_egui = "0.25"
-bevy-inspector-egui = { version = "0.23", features = [
+bevy_asset_loader = "0.21"
+bevy_debug_grid = "0.6"
+bevy_egui = "0.28"
+bevy-inspector-egui = { version = "0.25", features = [
     "bevy_pbr",
     "highlight_changes",
 ] }
 bevy_mod_billboard = { git = "https://github.com/kulkalkul/bevy_mod_billboard", branch = "main" }
 bevy_mod_picking = { version = "0.18.2", default-features = false, features = ["backend_raycast",  "selection",] }
-bevy_panorbit_camera = { version = "0.16", default-features = false }
-bevy-scene-hook = "10"
+bevy_panorbit_camera = { version = "0.19", default-features = false }
+bevy-scene-hook = {git = "https://github.com/stargazing-dino/bevy-scene-hook.git", branch= "update-14.0"}
 convert_case = "0.6"
 egui_dock = "0.11"
 egui_extras = { version = "0.26", features = ["all_loaders"] }
@@ -83,7 +83,7 @@ serde = "1"
 # Community Modules
 space_bevy_xpbd_plugin = { version = "0.6.0", path = "modules/bevy_xpbd_plugin"}
 game_app = { version = "0.1.0", path = "game" }
-bevy_xpbd_3d = { version = "0.4.2", default-features = false }
+avian3d = { version = "0.1.0", default-features = false }
 
 [dependencies]
 bevy.workspace = true
diff --git a/crates/editor_core/Cargo.toml b/crates/editor_core/Cargo.toml
index 7377cbc6..5b4b5c74 100644
--- a/crates/editor_core/Cargo.toml
+++ b/crates/editor_core/Cargo.toml
@@ -22,7 +22,7 @@ bevy_egui.workspace = true
 egui_dock.workspace = true
 egui-toast.workspace = true
 
-bevy_mod_outline = {version = "0.7.0", optional = true}
+bevy_mod_outline = {git = "https://github.com/komadori/bevy_mod_outline.git", optional = true}
 workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [features]
diff --git a/external/editor_as_plugin/Cargo.toml b/external/editor_as_plugin/Cargo.toml
index f7a4d8d7..5f71d62c 100644
--- a/external/editor_as_plugin/Cargo.toml
+++ b/external/editor_as_plugin/Cargo.toml
@@ -12,7 +12,7 @@ homepage.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.13.2"
+bevy = "0.14"
 space_editor = { path = "../../"}
 workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
diff --git a/modules/bevy_xpbd_plugin/Cargo.toml b/modules/bevy_xpbd_plugin/Cargo.toml
index 4f75cc59..9028db20 100644
--- a/modules/bevy_xpbd_plugin/Cargo.toml
+++ b/modules/bevy_xpbd_plugin/Cargo.toml
@@ -11,7 +11,7 @@ description = "Space XPBD plugin for space_editor crate"
 [dependencies]
 bevy.workspace = true 
 space_editor_ui.workspace = true
-bevy_xpbd_3d = { workspace = true, features = ["3d", "f32", "collider-from-mesh", "debug-plugin", "default-collider", "parry-f32"] }
+avian3d = { workspace = true, features = ["3d", "f32", "collider-from-mesh", "debug-plugin", "default-collider", "parry-f32"] }
 bevy-inspector-egui.workspace = true 
 workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
diff --git a/workspace-hakari/Cargo.toml b/workspace-hakari/Cargo.toml
index c9b23a48..ec12dd20 100644
--- a/workspace-hakari/Cargo.toml
+++ b/workspace-hakari/Cargo.toml
@@ -15,9 +15,8 @@ publish = false
 ### BEGIN HAKARI SECTION
 [dependencies]
 ahash = { version = "0.8", features = ["no-rng", "serde"] }
-bevy = { version = "0.13", features = ["wayland"] }
-bevy_internal = { version = "0.13", default-features = false, features = ["android_shared_stdcxx", "animation", "bevy_asset", "bevy_debug_stepping", "bevy_gilrs", "bevy_gizmos", "bevy_gltf", "bevy_pbr", "bevy_scene", "bevy_sprite", "bevy_text", "bevy_ui", "default_font", "hdr", "ktx2", "multi-threaded", "png", "tonemapping_luts", "vorbis", "wayland", "webgl", "x11", "zstd"] }
-bevy_winit = { version = "0.13", default-features = false, features = ["wayland", "x11"] }
+bevy = { version = "0.14", features = ["wayland"] }
+bevy_winit = { version = "0.14", default-features = false, features = ["wayland", "x11"] }
 bytemuck = { version = "1", default-features = false, features = ["aarch64_simd", "derive", "extern_crate_alloc"] }
 crossbeam-utils = { version = "0.8" }
 ecolor = { version = "0.27", default-features = false, features = ["bytemuck", "serde"] }

From 75643eec8f3a45c68a0bdd656a4809c6707fe322 Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Tue, 9 Jul 2024 23:28:22 +0300
Subject: [PATCH 02/17] Move out of bevy 0..13

---
 Cargo.lock | 237 ++++++++---------------------------------------------
 Cargo.toml |   2 +-
 2 files changed, 33 insertions(+), 206 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d0f5dd6d..0f882d1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -402,7 +402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a8da53296a1bc166b84f99aa7c6b9d8c10c71f0c022bc4fc72dd1fc49323b29"
 dependencies = [
  "avian_derive",
- "bevy 0.14.0",
+ "bevy",
  "bevy_math 0.14.0",
  "bitflags 2.6.0",
  "derive_more",
@@ -462,22 +462,13 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "bevy"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65b9eadaacf8fe971331bc3f250f35c18bc9dace3f96b483062f38ac07e3a1b4"
-dependencies = [
- "bevy_internal 0.13.2",
-]
-
 [[package]]
 name = "bevy"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e938630e9f472b1899c78ef84aa907081b23bad8333140e2295c620485b6ee7"
 dependencies = [
- "bevy_internal 0.14.0",
+ "bevy_internal",
 ]
 
 [[package]]
@@ -529,7 +520,7 @@ name = "bevy-scene-hook"
 version = "11.0.0"
 source = "git+https://github.com/stargazing-dino/bevy-scene-hook.git?branch=update-14.0#c29f2d579e0ba1cd195065e59f1f763e0f933468"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
 ]
 
 [[package]]
@@ -691,7 +682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47863215e4454e0142cc7e0f7801ad256d44e690f43186743e3e2bc9da2de870"
 dependencies = [
  "anyhow",
- "bevy 0.14.0",
+ "bevy",
  "bevy_asset_loader_derive",
  "path-slash",
 ]
@@ -847,7 +838,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cec97f2d56a2c00ac8cc3fd3915555f322d28558671adbb9efc5dd08ee41d34e"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
 ]
 
 [[package]]
@@ -872,22 +863,6 @@ dependencies = [
  "syn 2.0.70",
 ]
 
-[[package]]
-name = "bevy_diagnostic"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1401cdccec7e49378d013dfb0ff62c251f85b3be19dcdf04cfd827f793d1ee9"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_core 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_log 0.13.2",
- "bevy_time 0.13.2",
- "bevy_utils 0.13.2",
- "const-fnv1a-hash",
- "sysinfo",
-]
-
 [[package]]
 name = "bevy_diagnostic"
 version = "0.14.0"
@@ -976,7 +951,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e4a90f30f2849a07d91e393b10c0cc05df09b5773c010ddde57dd8b583be230"
 dependencies = [
  "arboard",
- "bevy 0.14.0",
+ "bevy",
  "bytemuck",
  "console_log",
  "crossbeam-channel",
@@ -1066,7 +1041,6 @@ dependencies = [
  "bevy_math 0.13.2",
  "bevy_reflect 0.13.2",
  "bevy_render 0.13.2",
- "bevy_sprite 0.13.2",
  "bevy_transform 0.13.2",
  "bevy_utils 0.13.2",
 ]
@@ -1137,7 +1111,7 @@ dependencies = [
  "bevy_pbr",
  "bevy_reflect 0.14.0",
  "bevy_render 0.14.0",
- "bevy_scene 0.14.0",
+ "bevy_scene",
  "bevy_tasks 0.14.0",
  "bevy_transform 0.14.0",
  "bevy_utils 0.14.0",
@@ -1207,40 +1181,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_internal"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58ec0ce77603df9474cde61f429126bfe06eb79094440e9141afb4217751c79"
-dependencies = [
- "bevy_a11y 0.13.2",
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_core 0.13.2",
- "bevy_core_pipeline 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_diagnostic 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_gizmos 0.13.2",
- "bevy_hierarchy 0.13.2",
- "bevy_input 0.13.2",
- "bevy_log 0.13.2",
- "bevy_math 0.13.2",
- "bevy_ptr 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_scene 0.13.2",
- "bevy_sprite 0.13.2",
- "bevy_tasks 0.13.2",
- "bevy_text 0.13.2",
- "bevy_time 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_ui 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_window 0.13.2",
- "bevy_winit 0.13.2",
-]
-
 [[package]]
 name = "bevy_internal"
 version = "0.14.0"
@@ -1256,7 +1196,7 @@ dependencies = [
  "bevy_core 0.14.0",
  "bevy_core_pipeline 0.14.0",
  "bevy_derive 0.14.0",
- "bevy_diagnostic 0.14.0",
+ "bevy_diagnostic",
  "bevy_ecs 0.14.0",
  "bevy_gilrs",
  "bevy_gizmos 0.14.0",
@@ -1269,14 +1209,14 @@ dependencies = [
  "bevy_ptr 0.14.0",
  "bevy_reflect 0.14.0",
  "bevy_render 0.14.0",
- "bevy_scene 0.14.0",
+ "bevy_scene",
  "bevy_sprite 0.14.0",
  "bevy_state",
  "bevy_tasks 0.14.0",
- "bevy_text 0.14.0",
+ "bevy_text",
  "bevy_time 0.14.0",
  "bevy_transform 0.14.0",
- "bevy_ui 0.14.0",
+ "bevy_ui",
  "bevy_utils 0.14.0",
  "bevy_window 0.14.0",
  "bevy_winit 0.14.0",
@@ -1382,9 +1322,9 @@ dependencies = [
 [[package]]
 name = "bevy_mod_billboard"
 version = "0.6.0"
-source = "git+https://github.com/kulkalkul/bevy_mod_billboard?branch=main#3f7ac1e63b136510637c7d397cc32d2cb301dda1"
+source = "git+https://github.com/rewin123/bevy_mod_billboard.git?branch=bevy-0.14#5158e15c620cd533e3dea3f296c918acb113f987"
 dependencies = [
- "bevy 0.13.2",
+ "bevy",
  "bitflags 2.6.0",
  "smallvec",
 ]
@@ -1394,7 +1334,7 @@ name = "bevy_mod_outline"
 version = "0.8.0"
 source = "git+https://github.com/komadori/bevy_mod_outline.git#68c6329a81db27c128a9f158cd1ce376edd63efa"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
  "bitfield",
  "interpolation",
  "nonmax",
@@ -1451,7 +1391,7 @@ version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3314c6336cc4e967ac64da28e91b9e9305fbebd08b30c4e1296dff985f2e0cb"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
 ]
 
 [[package]]
@@ -1694,7 +1634,7 @@ dependencies = [
  "bevy_color",
  "bevy_core 0.14.0",
  "bevy_derive 0.14.0",
- "bevy_diagnostic 0.14.0",
+ "bevy_diagnostic",
  "bevy_ecs 0.14.0",
  "bevy_encase_derive 0.14.0",
  "bevy_hierarchy 0.14.0",
@@ -1754,26 +1694,6 @@ dependencies = [
  "syn 2.0.70",
 ]
 
-[[package]]
-name = "bevy_scene"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3d2caa1bfe7542dbe2c62e1bcc10791ba181fb744d2fe6711d1d373354da7c"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_hierarchy 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_utils 0.13.2",
- "serde",
- "thiserror",
- "uuid",
-]
-
 [[package]]
 name = "bevy_scene"
 version = "0.14.0"
@@ -1899,28 +1819,6 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
-[[package]]
-name = "bevy_text"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e8456ae0bea7d6b7621e42c1c12bf66c0891381e62c948ab23920673ce611c"
-dependencies = [
- "ab_glyph",
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_sprite 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_window 0.13.2",
- "glyph_brush_layout",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_text"
 version = "0.14.0"
@@ -2000,34 +1898,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_ui"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bbc30be39cfbfa3a073b541d22aea43ab14452dea12d7411ce201df17ff7b1"
-dependencies = [
- "bevy_a11y 0.13.2",
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_core_pipeline 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_hierarchy 0.13.2",
- "bevy_input 0.13.2",
- "bevy_log 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_sprite 0.13.2",
- "bevy_text 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_window 0.13.2",
- "bytemuck",
- "taffy 0.3.19",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_ui"
 version = "0.14.0"
@@ -2047,14 +1917,14 @@ dependencies = [
  "bevy_reflect 0.14.0",
  "bevy_render 0.14.0",
  "bevy_sprite 0.14.0",
- "bevy_text 0.14.0",
+ "bevy_text",
  "bevy_transform 0.14.0",
  "bevy_utils 0.14.0",
  "bevy_window 0.14.0",
  "bytemuck",
  "nonmax",
  "smallvec",
- "taffy 0.5.2",
+ "taffy",
  "thiserror",
 ]
 
@@ -2873,7 +2743,7 @@ dependencies = [
 name = "editor_as_plugin"
 version = "0.6.0"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
  "space_editor",
  "workspace-hakari",
 ]
@@ -3387,7 +3257,7 @@ dependencies = [
 name = "game_app"
 version = "0.1.0"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
  "space_bevy_xpbd_plugin",
  "space_prefab",
  "workspace-hakari",
@@ -3656,12 +3526,6 @@ dependencies = [
  "bitflags 2.6.0",
 ]
 
-[[package]]
-name = "grid"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c"
-
 [[package]]
 name = "grid"
 version = "0.14.0"
@@ -5471,19 +5335,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "sctk-adwaita"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7"
-dependencies = [
- "ab_glyph",
- "log",
- "memmap2",
- "smithay-client-toolkit",
- "tiny-skia",
-]
-
 [[package]]
 name = "sctk-adwaita"
 version = "0.9.1"
@@ -5655,7 +5506,7 @@ name = "space_bevy_xpbd_plugin"
 version = "0.6.0"
 dependencies = [
  "avian3d",
- "bevy 0.14.0",
+ "bevy",
  "bevy-inspector-egui",
  "space_editor_ui",
  "workspace-hakari",
@@ -5666,7 +5517,7 @@ name = "space_editor"
 version = "0.6.0"
 dependencies = [
  "backtrace-on-stack-overflow",
- "bevy 0.14.0",
+ "bevy",
  "game_app",
  "space_bevy_xpbd_plugin",
  "space_editor_ui",
@@ -5678,7 +5529,7 @@ dependencies = [
 name = "space_editor_core"
 version = "0.6.0"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
  "bevy_egui",
  "bevy_mod_outline",
  "egui-toast",
@@ -5694,7 +5545,7 @@ dependencies = [
 name = "space_editor_tabs"
 version = "0.6.0"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
  "bevy_egui",
  "convert_case 0.6.0",
  "egui_dock",
@@ -5707,7 +5558,7 @@ name = "space_editor_ui"
 version = "0.6.0"
 dependencies = [
  "anyhow",
- "bevy 0.14.0",
+ "bevy",
  "bevy-inspector-egui",
  "bevy_asset_loader",
  "bevy_debug_grid",
@@ -5732,7 +5583,7 @@ dependencies = [
 name = "space_persistence"
 version = "0.6.0"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
  "ron",
  "serde",
  "workspace-hakari",
@@ -5742,7 +5593,7 @@ dependencies = [
 name = "space_prefab"
 version = "0.6.0"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
  "bevy-inspector-egui",
  "bevy-scene-hook",
  "rand",
@@ -5758,7 +5609,7 @@ name = "space_shared"
 version = "0.6.0"
 dependencies = [
  "anyhow",
- "bevy 0.14.0",
+ "bevy",
  "bevy-inspector-egui",
  "egui-toast",
  "egui_file",
@@ -5770,7 +5621,7 @@ dependencies = [
 name = "space_undo"
 version = "0.6.0"
 dependencies = [
- "bevy 0.14.0",
+ "bevy",
  "pretty-type-name",
  "workspace-hakari",
 ]
@@ -5878,18 +5729,6 @@ dependencies = [
  "windows 0.52.0",
 ]
 
-[[package]]
-name = "taffy"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1315457ccd9c3def787a18fae91914e623e4dcff019b64ce39f5268ded53d3d"
-dependencies = [
- "arrayvec",
- "grid 0.10.0",
- "num-traits",
- "slotmap",
-]
-
 [[package]]
 name = "taffy"
 version = "0.5.2"
@@ -5897,7 +5736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94"
 dependencies = [
  "arrayvec",
- "grid 0.14.0",
+ "grid",
  "num-traits",
  "serde",
  "slotmap",
@@ -7183,11 +7022,9 @@ version = "0.29.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca"
 dependencies = [
- "ahash",
  "android-activity 0.5.2",
  "atomic-waker",
  "bitflags 2.6.0",
- "bytemuck",
  "calloop",
  "cfg_aliases 0.1.1",
  "core-foundation",
@@ -7197,31 +7034,21 @@ dependencies = [
  "js-sys",
  "libc",
  "log",
- "memmap2",
  "ndk 0.8.0",
  "ndk-sys 0.5.0+25.2.9519653",
  "objc2 0.4.1",
  "once_cell",
  "orbclient",
- "percent-encoding",
  "raw-window-handle",
  "redox_syscall 0.3.5",
  "rustix",
- "sctk-adwaita 0.8.3",
- "smithay-client-toolkit",
  "smol_str",
  "unicode-segmentation",
  "wasm-bindgen",
  "wasm-bindgen-futures",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "wayland-protocols-plasma",
  "web-sys",
  "web-time 0.2.4",
  "windows-sys 0.48.0",
- "x11-dl",
- "x11rb",
  "xkbcommon-dl",
 ]
 
@@ -7258,7 +7085,7 @@ dependencies = [
  "raw-window-handle",
  "redox_syscall 0.4.1",
  "rustix",
- "sctk-adwaita 0.9.1",
+ "sctk-adwaita",
  "smithay-client-toolkit",
  "smol_str",
  "tracing",
@@ -7300,7 +7127,7 @@ name = "workspace-hakari"
 version = "0.1.0"
 dependencies = [
  "ahash",
- "bevy 0.14.0",
+ "bevy",
  "bevy_winit 0.14.0",
  "bytemuck",
  "crossbeam-utils",
diff --git a/Cargo.toml b/Cargo.toml
index f2e4818e..294187de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,7 +64,7 @@ bevy-inspector-egui = { version = "0.25", features = [
     "bevy_pbr",
     "highlight_changes",
 ] }
-bevy_mod_billboard = { git = "https://github.com/kulkalkul/bevy_mod_billboard", branch = "main" }
+bevy_mod_billboard = { git = "https://github.com/rewin123/bevy_mod_billboard.git", branch = "bevy-0.14" }
 bevy_mod_picking = { version = "0.18.2", default-features = false, features = ["backend_raycast",  "selection",] }
 bevy_panorbit_camera = { version = "0.19", default-features = false }
 bevy-scene-hook = {git = "https://github.com/stargazing-dino/bevy-scene-hook.git", branch= "update-14.0"}

From ed462243299ca04a2cd4a434e1ede3dac80d083a Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Tue, 9 Jul 2024 23:43:54 +0300
Subject: [PATCH 03/17] test fix

---
 Cargo.lock                      | 330 +++++++++++++++++++++++++++++++-
 Cargo.toml                      |   2 +-
 crates/persistence/src/lib.rs   |   8 +-
 crates/persistence/src/tests.rs |  58 +++---
 crates/shared/src/asset_fs.rs   |   1 +
 crates/undo/src/lib.rs          |   8 +-
 crates/undo/src/tests.rs        | 172 ++++++++---------
 7 files changed, 453 insertions(+), 126 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0f882d1d..c7ca0ad4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -170,6 +170,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aligned-vec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.18"
@@ -275,6 +281,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+
 [[package]]
 name = "arboard"
 version = "3.4.0"
@@ -293,6 +305,17 @@ dependencies = [
  "x11rb",
 ]
 
+[[package]]
+name = "arg_enum_proc_macro"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.7"
@@ -395,6 +418,20 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
+[[package]]
+name = "av1-grain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
+dependencies = [
+ "anyhow",
+ "arrayvec",
+ "log",
+ "nom",
+ "num-rational",
+ "v_frame",
+]
+
 [[package]]
 name = "avian3d"
 version = "0.1.0"
@@ -424,6 +461,15 @@ dependencies = [
  "syn 2.0.70",
 ]
 
+[[package]]
+name = "avif-serialize"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.73"
@@ -2132,6 +2178,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bitstream-io"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da"
+
 [[package]]
 name = "blake3"
 version = "1.5.1"
@@ -2211,6 +2263,12 @@ dependencies = [
  "piper",
 ]
 
+[[package]]
+name = "built"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16"
+
 [[package]]
 name = "bumpalo"
 version = "3.16.0"
@@ -2243,6 +2301,12 @@ 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.6.0"
@@ -2301,6 +2365,16 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "cfg-expr"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -2706,7 +2780,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro-error",
 ]
 
@@ -3584,6 +3658,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.4.0"
@@ -3672,9 +3752,29 @@ checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
 dependencies = [
  "bytemuck",
  "byteorder",
+ "color_quant",
+ "exr",
+ "gif",
+ "image-webp",
  "num-traits",
  "png",
+ "qoi",
+ "ravif",
+ "rayon",
+ "rgb",
  "tiff",
+ "zune-core",
+ "zune-jpeg",
+]
+
+[[package]]
+name = "image-webp"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d"
+dependencies = [
+ "byteorder-lite",
+ "thiserror",
 ]
 
 [[package]]
@@ -3683,6 +3783,12 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
 
+[[package]]
+name = "imgref"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
+
 [[package]]
 name = "immutable-chunkmap"
 version = "2.0.5"
@@ -3728,6 +3834,17 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "interpolate_name"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
 [[package]]
 name = "interpolation"
 version = "0.3.0"
@@ -3887,6 +4004,17 @@ version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.4"
@@ -3962,6 +4090,15 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
+[[package]]
+name = "loop9"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
+dependencies = [
+ "imgref",
+]
+
 [[package]]
 name = "mach2"
 version = "0.4.2"
@@ -3999,6 +4136,16 @@ dependencies = [
  "rawpointer",
 ]
 
+[[package]]
+name = "maybe-rayon"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
+dependencies = [
+ "cfg-if",
+ "rayon",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.4"
@@ -4256,6 +4403,12 @@ dependencies = [
  "jni-sys",
 ]
 
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
 [[package]]
 name = "nix"
 version = "0.23.2"
@@ -4303,6 +4456,12 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
 
+[[package]]
+name = "noop_proc_macro"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
+
 [[package]]
 name = "ntapi"
 version = "0.4.1"
@@ -4322,6 +4481,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num-bigint"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-complex"
 version = "0.4.6"
@@ -4357,6 +4527,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
+ "num-bigint",
  "num-integer",
  "num-traits",
 ]
@@ -4959,6 +5130,19 @@ name = "profiling"
 version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
+dependencies = [
+ "quote",
+ "syn 2.0.70",
+]
 
 [[package]]
 name = "qoi"
@@ -4969,6 +5153,12 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
 [[package]]
 name = "quick-xml"
 version = "0.34.0"
@@ -5029,6 +5219,56 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
+[[package]]
+name = "rav1e"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9"
+dependencies = [
+ "arbitrary",
+ "arg_enum_proc_macro",
+ "arrayvec",
+ "av1-grain",
+ "bitstream-io",
+ "built",
+ "cfg-if",
+ "interpolate_name",
+ "itertools 0.12.1",
+ "libc",
+ "libfuzzer-sys",
+ "log",
+ "maybe-rayon",
+ "new_debug_unreachable",
+ "noop_proc_macro",
+ "num-derive",
+ "num-traits",
+ "once_cell",
+ "paste",
+ "profiling",
+ "rand",
+ "rand_chacha",
+ "simd_helpers",
+ "system-deps",
+ "thiserror",
+ "v_frame",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ravif"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234"
+dependencies = [
+ "avif-serialize",
+ "imgref",
+ "loop9",
+ "quick-error",
+ "rav1e",
+ "rayon",
+ "rgb",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -5391,6 +5631,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -5425,6 +5674,15 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
+[[package]]
+name = "simd_helpers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
+dependencies = [
+ "quote",
+]
+
 [[package]]
 name = "simplecss"
 version = "0.2.1"
@@ -5613,7 +5871,7 @@ dependencies = [
  "bevy-inspector-egui",
  "egui-toast",
  "egui_file",
- "image 0.24.9",
+ "image 0.25.1",
  "workspace-hakari",
 ]
 
@@ -5729,6 +5987,19 @@ dependencies = [
  "windows 0.52.0",
 ]
 
+[[package]]
+name = "system-deps"
+version = "6.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+dependencies = [
+ "cfg-expr",
+ "heck 0.5.0",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
 [[package]]
 name = "taffy"
 version = "0.5.2"
@@ -5742,6 +6013,12 @@ dependencies = [
  "slotmap",
 ]
 
+[[package]]
+name = "target-lexicon"
+version = "0.12.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+
 [[package]]
 name = "termcolor"
 version = "1.4.1"
@@ -5833,11 +6110,26 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
+[[package]]
+name = "toml"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.15",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "toml_edit"
@@ -5857,6 +6149,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1"
 dependencies = [
  "indexmap",
+ "serde",
+ "serde_spanned",
  "toml_datetime",
  "winnow 0.6.13",
 ]
@@ -6107,6 +6401,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "v_frame"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
+dependencies = [
+ "aligned-vec",
+ "num-traits",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -6119,6 +6424,12 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
+[[package]]
+name = "version-compare"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -7251,6 +7562,12 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
 [[package]]
 name = "zune-inflate"
 version = "0.2.54"
@@ -7259,3 +7576,12 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
 dependencies = [
  "simd-adler32",
 ]
+
+[[package]]
+name = "zune-jpeg"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
+dependencies = [
+ "zune-core",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 294187de..24207444 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -74,7 +74,7 @@ egui_extras = { version = "0.26", features = ["all_loaders"] }
 egui_file = "0.15"
 egui-gizmo = "0.16.1"
 egui-toast = "0.12.1"
-image = {version = "0.24.8", feature = ["png"] }
+image = {version = "0.25.1", feature = ["png"] }
 pretty-type-name = "1"
 rand = "*"
 ron = "0.8"
diff --git a/crates/persistence/src/lib.rs b/crates/persistence/src/lib.rs
index 8879e8d7..17707993 100644
--- a/crates/persistence/src/lib.rs
+++ b/crates/persistence/src/lib.rs
@@ -6,7 +6,7 @@ mod tests;
 use bevy::{
     prelude::*,
     reflect::{
-        serde::{ReflectSerializer, UntypedReflectDeserializer},
+        serde::{ReflectDeserializer, ReflectSerializer},
         GetTypeRegistration,
     },
     utils::HashMap,
@@ -253,7 +253,7 @@ impl AppPersistenceExt for App {
     fn persistence_resource<T: Default + Reflect + FromReflect + Resource + GetTypeRegistration>(
         &mut self,
     ) -> &mut Self {
-        self.world
+        self.world_mut()
             .resource_mut::<PersistenceRegistry>()
             .target_count += 1;
 
@@ -276,7 +276,7 @@ impl AppPersistenceExt for App {
         &mut self,
         load_function: Box<dyn Fn(&mut T, T) + Send + Sync>,
     ) -> &mut Self {
-        self.world
+        self.world_mut()
             .resource_mut::<PersistenceRegistry>()
             .target_count += 1;
 
@@ -333,7 +333,7 @@ fn persistence_resource_system<
                     continue;
                 };
                 let type_registry = registry.read();
-                let deserializer = UntypedReflectDeserializer::new(&type_registry);
+                let deserializer = ReflectDeserializer::new(&type_registry);
                 let Ok(reflected_value) =
                     deserializer.deserialize(&mut ron::Deserializer::from_str(data).unwrap())
                 else {
diff --git a/crates/persistence/src/tests.rs b/crates/persistence/src/tests.rs
index 65012479..5fd5622c 100644
--- a/crates/persistence/src/tests.rs
+++ b/crates/persistence/src/tests.rs
@@ -7,12 +7,12 @@ fn save_on_close_triggers_event() {
         .add_event::<PersistenceEvent>()
         .add_event::<WindowCloseRequested>()
         .add_systems(PreUpdate, persistence_save_on_close);
-    app.world.send_event(WindowCloseRequested {
+    app.world_mut().send_event(WindowCloseRequested {
         window: Entity::PLACEHOLDER,
     });
     app.update();
 
-    let event = app.world.get_resource::<Events<PersistenceEvent>>();
+    let event = app.world_mut().get_resource::<Events<PersistenceEvent>>();
 
     assert!(event.is_some());
     assert_eq!(event.unwrap().len(), 1);
@@ -28,12 +28,12 @@ fn save_on_close_false_doesnt_triggers_event() {
     .add_event::<PersistenceEvent>()
     .add_event::<WindowCloseRequested>()
     .add_systems(PreUpdate, persistence_save_on_close);
-    app.world.send_event(WindowCloseRequested {
+    app.world_mut().send_event(WindowCloseRequested {
         window: Entity::PLACEHOLDER,
     });
     app.update();
 
-    let event = app.world.get_resource::<Events<PersistenceEvent>>();
+    let event = app.world_mut().get_resource::<Events<PersistenceEvent>>();
 
     assert!(event.is_some());
     assert_eq!(event.unwrap().len(), 0);
@@ -47,7 +47,7 @@ fn load_on_startup_triggers_event() {
         .add_systems(Update, persistence_startup_load);
     app.update();
 
-    let events = app.world.get_resource::<Events<PersistenceEvent>>();
+    let events = app.world_mut().get_resource::<Events<PersistenceEvent>>();
     assert!(events.is_some());
     assert_eq!(events.unwrap().len(), 1);
 }
@@ -63,7 +63,7 @@ fn not_load_on_startup_triggers_event() {
     .add_systems(Update, persistence_startup_load);
     app.update();
 
-    let events = app.world.get_resource::<Events<PersistenceEvent>>();
+    let events = app.world_mut().get_resource::<Events<PersistenceEvent>>();
     assert!(events.is_some());
     assert_eq!(events.unwrap().len(), 0);
 }
@@ -76,17 +76,17 @@ fn persistence_starts_on_save() {
         .add_event::<PersistenceResourceBroadcastEvent>()
         .add_systems(PreUpdate, persistence_start);
 
-    app.world.send_event(PersistenceEvent::Save);
+    app.world_mut().send_event(PersistenceEvent::Save);
     app.update();
 
     let event = app
-        .world
+        .world_mut()
         .get_resource::<Events<PersistenceResourceBroadcastEvent>>();
 
     assert!(event.is_some());
     assert_eq!(event.unwrap().len(), 1);
 
-    let persistence = app.world.get_resource::<PersistenceRegistry>();
+    let persistence = app.world_mut().get_resource::<PersistenceRegistry>();
 
     assert!(persistence.is_some());
     let reg = persistence.unwrap();
@@ -105,17 +105,17 @@ fn persistence_starts_on_load_mem() {
     .add_event::<PersistenceResourceBroadcastEvent>()
     .add_systems(PreUpdate, persistence_start);
 
-    app.world.send_event(PersistenceEvent::Load);
+    app.world_mut().send_event(PersistenceEvent::Load);
     app.update();
 
     let event = app
-        .world
+        .world_mut()
         .get_resource::<Events<PersistenceResourceBroadcastEvent>>();
 
     assert!(event.is_some());
     assert_eq!(event.unwrap().len(), 1);
 
-    let persistence = app.world.get_resource::<PersistenceRegistry>();
+    let persistence = app.world_mut().get_resource::<PersistenceRegistry>();
 
     assert!(persistence.is_some());
     let reg = persistence.unwrap();
@@ -134,17 +134,17 @@ fn persistence_starts_on_load_file() {
     .add_event::<PersistenceResourceBroadcastEvent>()
     .add_systems(PreUpdate, persistence_start);
 
-    app.world.send_event(PersistenceEvent::Load);
+    app.world_mut().send_event(PersistenceEvent::Load);
     app.update();
 
     let event = app
-        .world
+        .world_mut()
         .get_resource::<Events<PersistenceResourceBroadcastEvent>>();
 
     assert!(event.is_some());
     assert_eq!(event.unwrap().len(), 1);
 
-    let persistence = app.world.get_resource::<PersistenceRegistry>();
+    let persistence = app.world_mut().get_resource::<PersistenceRegistry>();
 
     assert!(persistence.is_some());
     let reg = persistence.unwrap();
@@ -166,16 +166,16 @@ fn persistence_starts_on_file_not_found() {
     .add_event::<PersistenceResourceBroadcastEvent>()
     .add_systems(PreUpdate, persistence_start);
 
-    app.world.send_event(PersistenceEvent::Load);
+    app.world_mut().send_event(PersistenceEvent::Load);
     app.update();
 
     let event = app
-        .world
+        .world_mut()
         .get_resource::<Events<PersistenceResourceBroadcastEvent>>();
 
     assert_eq!(event.unwrap().len(), 0);
 
-    let persistence = app.world.get_resource::<PersistenceRegistry>();
+    let persistence = app.world_mut().get_resource::<PersistenceRegistry>();
     let reg = persistence.unwrap();
     assert_eq!(reg.mode, PersistenceMode::None);
     assert!(reg.data.is_empty());
@@ -192,17 +192,17 @@ fn persistence_starts_on_load_from_memory() {
     .add_event::<PersistenceResourceBroadcastEvent>()
     .add_systems(PreUpdate, persistence_start);
 
-    app.world.send_event(PersistenceEvent::Load);
+    app.world_mut().send_event(PersistenceEvent::Load);
     app.update();
 
     let event = app
-        .world
+        .world_mut()
         .get_resource::<Events<PersistenceResourceBroadcastEvent>>();
 
     assert!(event.is_some());
     assert_eq!(event.unwrap().len(), 1);
 
-    let persistence = app.world.get_resource::<PersistenceRegistry>();
+    let persistence = app.world_mut().get_resource::<PersistenceRegistry>();
 
     assert!(persistence.is_some());
     let reg = persistence.unwrap();
@@ -232,7 +232,7 @@ fn persistence_end_from_loading() {
 
     app.update();
 
-    let persistence = app.world.resource::<PersistenceRegistry>();
+    let persistence = app.world_mut().resource::<PersistenceRegistry>();
     assert_eq!(persistence.mode, PersistenceMode::None);
 }
 
@@ -248,7 +248,7 @@ fn persistence_end_from_saving_mem() {
 
     app.update();
 
-    let persistence = app.world.resource::<PersistenceRegistry>();
+    let persistence = app.world_mut().resource::<PersistenceRegistry>();
     assert_eq!(persistence.mode, PersistenceMode::None);
 }
 
@@ -265,7 +265,7 @@ fn persistence_end_from_saving_file() {
 
     app.update();
 
-    let persistence = app.world.resource::<PersistenceRegistry>();
+    let persistence = app.world_mut().resource::<PersistenceRegistry>();
     assert_eq!(persistence.mode, PersistenceMode::None);
 
     assert!(std::fs::metadata("../../target/fake_editor.ron").is_ok());
@@ -294,12 +294,12 @@ fn persistence_system_unpack() {
     );
     app.persistence_resource::<PersistenceSettings>();
     app.update();
-    app.world
+    app.world_mut()
         .send_event(PersistenceResourceBroadcastEvent::Unpack);
     app.update();
 
-    let settings = app.world.resource::<PersistenceSettings>();
-    let count = app.world.resource::<PersistenceRegistry>();
+    let settings = app.world().resource::<PersistenceSettings>();
+    let count = app.world().resource::<PersistenceRegistry>();
 
     assert_eq!(count.target_count, 1);
     assert_eq!(count.load_counter, 1);
@@ -331,10 +331,10 @@ fn persistence_system_pack() {
     );
     app.persistence_resource::<PersistenceSettings>();
     app.update();
-    app.world
+    app.world_mut()
         .send_event(PersistenceResourceBroadcastEvent::Pack);
     app.update();
 
-    let reg = app.world.resource::<PersistenceRegistry>();
+    let reg = app.world_mut().resource::<PersistenceRegistry>();
     assert_eq!(reg.save_counter, 1)
 }
diff --git a/crates/shared/src/asset_fs.rs b/crates/shared/src/asset_fs.rs
index dd50a6af..39f2d602 100644
--- a/crates/shared/src/asset_fs.rs
+++ b/crates/shared/src/asset_fs.rs
@@ -1,5 +1,6 @@
 use anyhow::Result;
 use bevy::prelude::*;
+use image::DynamicImage;
 
 use crate::gizmos::{
     CAMERA_GIZMO, DIRECTION_LIGHT_GIZMO, POINT_LIGHT_GIZMO, SPOT_LIGHT_GIZMO, UNKNOWN,
diff --git a/crates/undo/src/lib.rs b/crates/undo/src/lib.rs
index f6e9fbfa..a6d2d89f 100644
--- a/crates/undo/src/lib.rs
+++ b/crates/undo/src/lib.rs
@@ -686,11 +686,11 @@ pub trait AppAutoUndo {
 
 impl AppAutoUndo for App {
     fn auto_undo<T: Component + Clone>(&mut self) -> &mut Self {
-        if !self.world.contains_resource::<ChangeChain>() {
+        if !self.world_mut().contains_resource::<ChangeChain>() {
             return self;
         }
 
-        self.world.insert_resource(AutoUndoStorage::<T>::default());
+        self.world_mut().insert_resource(AutoUndoStorage::<T>::default());
         self.add_event::<UndoRedoApplied<T>>();
 
         self.add_systems(
@@ -711,11 +711,11 @@ impl AppAutoUndo for App {
     }
 
     fn auto_reflected_undo<T: Component + Reflect + FromReflect>(&mut self) -> &mut Self {
-        if !self.world.contains_resource::<ChangeChain>() {
+        if !self.world_mut().contains_resource::<ChangeChain>() {
             return self;
         }
 
-        self.world.insert_resource(AutoUndoStorage::<T>::default());
+        self.world_mut().insert_resource(AutoUndoStorage::<T>::default());
         self.add_event::<UndoRedoApplied<T>>();
 
         self.add_systems(
diff --git a/crates/undo/src/tests.rs b/crates/undo/src/tests.rs
index 2aedb728..ecd2faf0 100644
--- a/crates/undo/src/tests.rs
+++ b/crates/undo/src/tests.rs
@@ -20,50 +20,50 @@ fn test_undo() {
 
     app.update();
 
-    let test_id = app.world.spawn_empty().id();
-    app.world.send_event(NewChange {
+    let test_id = app.world_mut().spawn_empty().id();
+    app.world_mut().send_event(NewChange {
         change: Arc::new(AddedEntity { entity: test_id }),
     });
 
     app.update();
     app.update();
 
-    app.world
+    app.world_mut()
         .entity_mut(test_id)
         .insert(Name::default())
         .insert(UndoMarker);
-    app.world.get_mut::<Name>(test_id).unwrap().set_changed();
+    app.world_mut().get_mut::<Name>(test_id).unwrap().set_changed();
     repeat_update(&mut app, 10);
-    assert!(app.world.get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_some());
 
-    app.world.get_mut::<Name>(test_id).unwrap().set("foo");
+    app.world_mut().get_mut::<Name>(test_id).unwrap().set("foo");
     repeat_update(&mut app, 10);
-    assert_eq!(app.world.get::<Name>(test_id).unwrap().to_string(), "foo");
+    assert_eq!(app.world_mut().get::<Name>(test_id).unwrap().to_string(), "foo");
 
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert_eq!(app.world.get::<Name>(test_id).unwrap().to_string(), "");
+    assert_eq!(app.world_mut().get::<Name>(test_id).unwrap().to_string(), "");
 
-    app.world.send_event(UndoRedo::Redo);
+    app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 4);
-    assert_eq!(app.world.get::<Name>(test_id).unwrap().to_string(), "foo");
-    app.world.send_event(UndoRedo::Undo);
+    assert_eq!(app.world_mut().get::<Name>(test_id).unwrap().to_string(), "foo");
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
 
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert!(app.world.get::<Name>(test_id).is_none());
-    assert!(app.world.get_entity(test_id).is_some());
+    assert!(app.world_mut().get::<Name>(test_id).is_none());
+    assert!(app.world_mut().get_entity(test_id).is_some());
 
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert!(app.world.get_entity(test_id).is_none());
+    assert!(app.world_mut().get_entity(test_id).is_none());
 
-    app.world.send_event(UndoRedo::Redo);
+    app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 2);
 
-    let mut query = app.world.query_filtered::<(), With<UndoMarker>>();
-    assert!(query.iter(&app.world).next().is_some());
+    let mut query = app.world_mut().query_filtered::<(), With<UndoMarker>>();
+    assert!(query.iter(&app.world_mut()).next().is_some());
 }
 
 #[test]
@@ -73,60 +73,60 @@ fn test_reflected_undo() {
 
     app.update();
 
-    let test_id = app.world.spawn_empty().id();
-    app.world.send_event(NewChange {
+    let test_id = app.world_mut().spawn_empty().id();
+    app.world_mut().send_event(NewChange {
         change: Arc::new(AddedEntity { entity: test_id }),
     });
     repeat_update(&mut app, 2);
 
-    app.world
+    app.world_mut()
         .entity_mut(test_id)
         .insert(Transform::default())
         .insert(UndoMarker);
-    app.world
+    app.world_mut()
         .get_mut::<Transform>(test_id)
         .unwrap()
         .set_changed();
     repeat_update(&mut app, 10);
-    assert!(app.world.get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_some());
 
-    app.world.get_mut::<Transform>(test_id).unwrap().translation = Vec3::X;
-    app.world
+    app.world_mut().get_mut::<Transform>(test_id).unwrap().translation = Vec3::X;
+    app.world_mut()
         .get_mut::<Transform>(test_id)
         .unwrap()
         .set_changed();
     repeat_update(&mut app, 10);
     assert_eq!(
-        app.world.get::<Transform>(test_id).unwrap().translation,
+        app.world_mut().get::<Transform>(test_id).unwrap().translation,
         Vec3::X
     );
-    assert_eq!(app.world.resource::<ChangeChain>().changes.len(), 3);
+    assert_eq!(app.world_mut().resource::<ChangeChain>().changes.len(), 3);
 
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
     assert_eq!(
-        app.world.get::<Transform>(test_id).unwrap().translation,
+        app.world_mut().get::<Transform>(test_id).unwrap().translation,
         Vec3::ZERO
     );
 
-    app.world.send_event(UndoRedo::Redo);
+    app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 4);
     assert_eq!(
-        app.world.get::<Transform>(test_id).unwrap().translation,
+        app.world_mut().get::<Transform>(test_id).unwrap().translation,
         Vec3::X
     );
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
 
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert!(app.world.get::<Transform>(test_id).is_none());
-    assert!(app.world.get_entity(test_id).is_some());
+    assert!(app.world_mut().get::<Transform>(test_id).is_none());
+    assert!(app.world_mut().get_entity(test_id).is_some());
 
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     app.update();
     app.update();
-    assert!(app.world.get_entity(test_id).is_none());
+    assert!(app.world_mut().get_entity(test_id).is_none());
 }
 
 #[test]
@@ -136,42 +136,42 @@ fn test_reflected_redo() {
 
     app.update();
 
-    let test_id = app.world.spawn_empty().id();
-    app.world.send_event(NewChange {
+    let test_id = app.world_mut().spawn_empty().id();
+    app.world_mut().send_event(NewChange {
         change: Arc::new(AddedEntity { entity: test_id }),
     });
     repeat_update(&mut app, 2);
 
-    app.world
+    app.world_mut()
         .entity_mut(test_id)
         .insert(Transform::default())
         .insert(UndoMarker);
-    app.world
+    app.world_mut()
         .get_mut::<Transform>(test_id)
         .unwrap()
         .set_changed();
     repeat_update(&mut app, 10);
-    assert!(app.world.get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_some());
 
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert!(app.world.get_entity(test_id).is_some());
-    assert!(app.world.get::<Transform>(test_id).is_none());
+    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get::<Transform>(test_id).is_none());
 
-    app.world.send_event(UndoRedo::Redo);
+    app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 10);
-    assert!(app.world.get_entity(test_id).is_some());
-    assert!(app.world.get::<Transform>(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_some());
+    assert!(app.world_mut().get::<Transform>(test_id).is_some());
 
-    app.world.entity_mut(test_id).remove::<Transform>();
+    app.world_mut().entity_mut(test_id).remove::<Transform>();
     repeat_update(&mut app, 10);
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert!(app.world.entity(test_id).get::<Transform>().is_some());
+    assert!(app.world_mut().entity(test_id).get::<Transform>().is_some());
 
-    app.world.send_event(UndoRedo::Redo);
+    app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 2);
-    assert!(app.world.entity(test_id).get::<Transform>().is_none());
+    assert!(app.world_mut().entity(test_id).get::<Transform>().is_none());
 }
 
 #[test]
@@ -180,29 +180,29 @@ fn test_redo() {
     app.auto_undo::<Name>();
     app.update();
 
-    let test_id = app.world.spawn(Name::default()).id();
-    app.world.send_event(NewChange {
+    let test_id = app.world_mut().spawn(Name::default()).id();
+    app.world_mut().send_event(NewChange {
         change: Arc::new(AddedEntity { entity: test_id }),
     });
     repeat_update(&mut app, 10);
 
-    app.world
+    app.world_mut()
         .entity_mut(test_id)
         .insert(Name::default())
         .insert(UndoMarker);
-    app.world.get_mut::<Name>(test_id).unwrap().set_changed();
+    app.world_mut().get_mut::<Name>(test_id).unwrap().set_changed();
     repeat_update(&mut app, 10);
-    assert!(app.world.get_entity(test_id).is_some());
+    assert!(app.world_mut().get_entity(test_id).is_some());
 
-    app.world.entity_mut(test_id).remove::<Name>();
+    app.world_mut().entity_mut(test_id).remove::<Name>();
     repeat_update(&mut app, 10);
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert!(app.world.get::<Name>(test_id).is_some());
+    assert!(app.world_mut().get::<Name>(test_id).is_some());
 
-    app.world.send_event(UndoRedo::Redo);
+    app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 2);
-    assert!(app.world.get::<Name>(test_id).is_none());
+    assert!(app.world_mut().get::<Name>(test_id).is_none());
 }
 
 #[test]
@@ -213,35 +213,35 @@ fn test_undo_with_remap() {
     app.auto_reflected_undo::<Parent>();
     app.auto_reflected_undo::<Children>();
 
-    let test_id_1 = app.world.spawn(UndoMarker).id();
-    let test_id_2 = app.world.spawn(UndoMarker).id();
+    let test_id_1 = app.world_mut().spawn(UndoMarker).id();
+    let test_id_2 = app.world_mut().spawn(UndoMarker).id();
 
-    app.world.send_event(NewChange {
+    app.world_mut().send_event(NewChange {
         change: Arc::new(AddedEntity { entity: test_id_1 }),
     });
-    app.world.send_event(NewChange {
+    app.world_mut().send_event(NewChange {
         change: Arc::new(AddedEntity { entity: test_id_2 }),
     });
     repeat_update(&mut app, 2);
-    app.world.entity_mut(test_id_1).add_child(test_id_2);
+    app.world_mut().entity_mut(test_id_1).add_child(test_id_2);
     repeat_update(&mut app, 2);
     app.cleanup();
 
-    app.world.entity_mut(test_id_1).despawn_recursive();
-    app.world.send_event(NewChange {
+    app.world_mut().entity_mut(test_id_1).despawn_recursive();
+    app.world_mut().send_event(NewChange {
         change: Arc::new(RemovedEntity { entity: test_id_1 }),
     });
     repeat_update(&mut app, 2);
 
-    app.world.send_event(UndoRedo::Undo);
+    app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
 
-    assert!(app.world.get_entity(test_id_1).is_none());
-    assert!(app.world.get_entity(test_id_2).is_none());
-    assert_eq!(app.world.entities().len(), 2);
+    assert!(app.world_mut().get_entity(test_id_1).is_none());
+    assert!(app.world_mut().get_entity(test_id_2).is_none());
+    assert_eq!(app.world_mut().entities().len(), 2);
 
-    let mut query = app.world.query::<&Children>();
-    assert!(query.get_single(&app.world).is_ok());
+    let mut query = app.world_mut().query::<&Children>();
+    assert!(query.get_single(&app.world_mut()).is_ok());
 }
 
 #[test]
@@ -256,10 +256,10 @@ fn clear_one_frame_ignores() {
         .add_systems(Update, clear_one_frame_ignore);
     repeat_update(&mut app, 1);
 
-    let mut query = app.world.query::<(Entity, &OneFrameUndoIgnore)>();
+    let mut query = app.world_mut().query::<(Entity, &OneFrameUndoIgnore)>();
 
-    assert_eq!(query.iter(&app.world).count(), 1);
-    assert!(query.iter(&app.world).all(|(_, i)| i.counter == 1));
+    assert_eq!(query.iter(&app.world_mut()).count(), 1);
+    assert!(query.iter(&app.world_mut()).all(|(_, i)| i.counter == 1));
 }
 
 #[test]
@@ -281,7 +281,7 @@ fn undo_ignore_ticks() {
 
     app.update();
 
-    let ignore_storage = app.world.resource::<UndoIgnoreStorage>();
+    let ignore_storage = app.world_mut().resource::<UndoIgnoreStorage>();
 
     assert_eq!(ignore_storage.storage.len(), 1)
 }
@@ -299,14 +299,14 @@ fn test_marker_sync() {
     app.update();
 
     //Test create UndoMarker after TestSync
-    let id1 = app.world.spawn((TestSync,)).id();
+    let id1 = app.world_mut().spawn((TestSync,)).id();
     repeat_update(&mut app, 2);
 
-    assert!(app.world.get::<UndoMarker>(id1).is_some());
+    assert!(app.world_mut().get::<UndoMarker>(id1).is_some());
 
     //Test remove UndoMarker after TestSync
-    app.world.entity_mut(id1).remove::<TestSync>();
+    app.world_mut().entity_mut(id1).remove::<TestSync>();
     repeat_update(&mut app, 2);
 
-    assert!(app.world.get::<UndoMarker>(id1).is_none());
+    assert!(app.world_mut().get::<UndoMarker>(id1).is_none());
 }

From ca514765f3b7e5a1a236bc10c305f6d351f79ff3 Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Tue, 9 Jul 2024 23:52:48 +0300
Subject: [PATCH 04/17] Renaming to bevy-0.14

---
 crates/prefab/src/component/mod.rs       |  4 +-
 crates/prefab/src/component/shape.rs     |  2 +-
 crates/prefab/src/editor_registry/mod.rs | 74 +++++++++++-----------
 crates/prefab/src/plugins.rs             | 28 ++++-----
 crates/prefab/src/save.rs                | 24 ++++----
 crates/prefab/src/spawn_system.rs        | 78 ++++++++++++------------
 6 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/crates/prefab/src/component/mod.rs b/crates/prefab/src/component/mod.rs
index 54e7093f..0af30930 100644
--- a/crates/prefab/src/component/mod.rs
+++ b/crates/prefab/src/component/mod.rs
@@ -176,12 +176,12 @@ mod tests {
 
         app.update();
 
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world_mut().resource::<AssetServer>();
         let prefab = AutoStruct::<TestAuto>::new(&TestAuto { value: false }, server);
 
         app.update();
 
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world_mut().resource::<AssetServer>();
         assert_eq!(prefab.get_data(server), TestAuto { value: false });
     }
 }
diff --git a/crates/prefab/src/component/shape.rs b/crates/prefab/src/component/shape.rs
index ffe5b1d6..c516dfee 100644
--- a/crates/prefab/src/component/shape.rs
+++ b/crates/prefab/src/component/shape.rs
@@ -337,7 +337,7 @@ impl PlanePrefab {
 #[derive(Reflect, Clone)]
 #[reflect(Default)]
 pub struct Plane3dPrefab {
-    pub normal: Direction3d,
+    pub normal: Dir3,
     pub transform: Vec3,
 }
 
diff --git a/crates/prefab/src/editor_registry/mod.rs b/crates/prefab/src/editor_registry/mod.rs
index dbf72e28..24e8a4d1 100644
--- a/crates/prefab/src/editor_registry/mod.rs
+++ b/crates/prefab/src/editor_registry/mod.rs
@@ -276,10 +276,10 @@ impl EditorRegistryExt for App {
     >(
         &mut self,
     ) -> &mut Self {
-        if let Some(mut registry) = self.world.get_resource_mut::<EditorRegistry>() {
+        if let Some(mut registry) = self.world_mut().get_resource_mut::<EditorRegistry>() {
             registry.register::<T>()
         }
-        self.world.init_component::<T>();
+        self.world_mut().init_component::<T>();
         self.register_type::<T>();
         self.auto_reflected_undo::<T>();
         self
@@ -290,7 +290,7 @@ impl EditorRegistryExt for App {
     >(
         &mut self,
     ) -> &mut Self {
-        if let Some(mut registry) = self.world.get_resource_mut::<EditorRegistry>() {
+        if let Some(mut registry) = self.world_mut().get_resource_mut::<EditorRegistry>() {
             registry.only_clone_register::<T>()
         }
         self.register_type::<T>();
@@ -302,7 +302,7 @@ impl EditorRegistryExt for App {
     >(
         &mut self,
     ) -> &mut Self {
-        if let Some(mut registry) = self.world.get_resource_mut::<EditorRegistry>() {
+        if let Some(mut registry) = self.world_mut().get_resource_mut::<EditorRegistry>() {
             registry.silent_register::<T>()
         }
         self.register_type::<T>();
@@ -360,9 +360,9 @@ impl EditorRegistryExt for App {
         #[cfg(not(feature = "no_event_registration"))]
         {
             self.register_type::<T>();
-            self.world.init_resource::<T>();
+            self.world_mut().init_resource::<T>();
         }
-        if let Some(mut registry) = self.world.get_resource_mut::<EditorRegistry>() {
+        if let Some(mut registry) = self.world_mut().get_resource_mut::<EditorRegistry>() {
             registry.event_register::<T>()
         }
         self
@@ -415,7 +415,7 @@ fn relation_system<T: Component, Relation: Component + Default>(
 
 #[cfg(test)]
 mod tests {
-    use bevy::{ecs::system::CommandQueue, prelude::*};
+    use bevy::{ecs::world::CommandQueue, prelude::*};
 
     use super::*;
 
@@ -432,8 +432,8 @@ mod tests {
             });
         app.update();
 
-        let mut query = app.world.query::<(&Name, &TestRelation)>();
-        let s = query.single(&app.world);
+        let mut query = app.world_mut().query::<(&Name, &TestRelation)>();
+        let s = query.single(&app.world());
 
         assert_eq!(s.0, &Name::from("value"));
     }
@@ -453,8 +453,8 @@ mod tests {
         });
         app.update();
 
-        let mut query = app.world.query::<(&Name, &TestRelation)>();
-        let s = query.single(&app.world);
+        let mut query = app.world_mut().query::<(&Name, &TestRelation)>();
+        let s = query.single(&app.world());
 
         assert_eq!(s.0, &Name::from("value"));
     }
@@ -468,24 +468,24 @@ mod tests {
         app.editor_registry::<Name>();
 
         let name = "name";
-        let e = app.world.spawn(Name::new(name)).id();
+        let e = app.world_mut().spawn(Name::new(name)).id();
 
         let new_e_id;
         {
             let mut command_queue = CommandQueue::default();
-            let mut cmds = Commands::new(&mut command_queue, &app.world);
+            let mut cmds = Commands::new(&mut command_queue, &app.world());
 
             let mut new_e = cmds.spawn_empty();
             new_e_id = new_e.id();
 
-            app.world
+            app.world()
                 .resource::<EditorRegistry>()
-                .clone_entity_flat(&mut new_e, &app.world.entity(e));
-            command_queue.apply(&mut app.world);
+                .clone_entity_flat(&mut new_e, &app.world().entity(e));
+            command_queue.apply(app.world_mut());
         }
 
         assert_eq!(
-            app.world.entity(new_e_id).get::<Name>().unwrap().as_str(),
+            app.world_mut().entity(new_e_id).get::<Name>().unwrap().as_str(),
             name
         );
     }
@@ -510,26 +510,26 @@ mod tests {
         );
         assert_eq!(send_event.type_id, TypeId::of::<AnEvent>());
 
-        send_event.send(&mut app.world);
+        send_event.send(&mut app.world_mut());
         app.update();
 
-        let events = app.world.resource::<Events<AnEvent>>();
+        let events = app.world_mut().resource::<Events<AnEvent>>();
         let mut events_reader = events.get_reader();
         let an_event = events_reader.read(events).next().unwrap();
 
         // Check the event has been sent
         assert_eq!(an_event.val, 0);
-        let mut events = app.world.resource_mut::<Events<AnEvent>>();
+        let mut events = app.world_mut().resource_mut::<Events<AnEvent>>();
         events.clear();
 
         // Change send event value
-        app.world.resource_mut::<AnEvent>().val = 17;
+        app.world_mut().resource_mut::<AnEvent>().val = 17;
         app.update();
 
-        send_event.send(&mut app.world);
+        send_event.send(app.world_mut());
         app.update();
 
-        let events = app.world.resource::<Events<AnEvent>>();
+        let events = app.world_mut().resource::<Events<AnEvent>>();
         let mut events_reader = events.get_reader();
         let an_event = events_reader.read(events).next().unwrap();
 
@@ -559,8 +559,8 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world.query::<(&Name, &Named)>();
-        let s = query.single(&app.world);
+        let mut query = app.world_mut().query::<(&Name, &Named)>();
+        let s = query.single(app.world());
         assert_eq!(s.1.name, "value");
     }
 
@@ -577,7 +577,7 @@ mod tests {
             .add_event::<AnEvent>();
         app.update();
 
-        let registry = app.world.resource::<EditorRegistry>();
+        let registry = app.world_mut().resource::<EditorRegistry>();
         assert_eq!("AnEvent", registry.send_events.first().unwrap().name);
     }
 
@@ -590,23 +590,23 @@ mod tests {
 
         let name = "name";
         let e = app
-            .world
+            .world_mut()
             .spawn((Name::new(name), VisibilityBundle::default()))
             .id();
 
         {
             let mut command_queue = CommandQueue::default();
-            let mut cmds = Commands::new(&mut command_queue, &app.world);
+            let mut cmds = Commands::new(&mut command_queue, app.world());
 
-            app.world
+            app.world()
                 .resource::<EditorRegistry>()
                 .remove_by_id(&mut cmds.entity(e), &TypeId::of::<Name>());
-            command_queue.apply(&mut app.world);
+            command_queue.apply(app.world_mut());
         }
 
-        assert_eq!(app.world.entity(e).get::<Name>(), None);
+        assert_eq!(app.world_mut().entity(e).get::<Name>(), None);
         assert_eq!(
-            app.world.entity(e).get::<Visibility>(),
+            app.world_mut().entity(e).get::<Visibility>(),
             Some(&Visibility::Inherited)
         );
     }
@@ -624,22 +624,22 @@ mod tests {
 
         let name = "name";
         let e = app
-            .world
+            .world_mut()
             .spawn((Name::new(name), VisibilityBundle::default()))
             .id();
 
         let mut command_queue = CommandQueue::default();
 
         let add = app
-            .world
+            .world_mut()
             .resource::<EditorRegistry>()
             .get_spawn_command(&TypeId::of::<AStruct>());
-        command_queue.apply(&mut app.world);
+        command_queue.apply(app.world_mut());
 
-        (add.func)(e, &mut app.world);
+        (add.func)(e, app.world_mut());
 
         assert_eq!(
-            app.world.entity(e).get::<AStruct>(),
+            app.world_mut().entity(e).get::<AStruct>(),
             Some(&AStruct { boolean: false })
         );
     }
diff --git a/crates/prefab/src/plugins.rs b/crates/prefab/src/plugins.rs
index 3ebb7708..a979b246 100644
--- a/crates/prefab/src/plugins.rs
+++ b/crates/prefab/src/plugins.rs
@@ -67,8 +67,8 @@ impl Plugin for BasePrefabPlugin {
 
         app.register_type::<EntityLink>();
 
-        app.register_type::<Direction3d>();
-        app.register_type::<Direction2d>();
+        app.register_type::<Dir3>();
+        app.register_type::<Dir2>();
 
         app.editor_registry::<Transform>();
         app.editor_registry::<Name>();
@@ -372,9 +372,9 @@ mod test {
         app.update();
 
         let mut query = app
-            .world
+            .world_mut()
             .query_filtered::<Entity, With<CameraRenderGraph>>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
     #[test]
@@ -389,9 +389,9 @@ mod test {
         app.update();
 
         let mut query = app
-            .world
+            .world_mut()
             .query_filtered::<Entity, (Without<Transform>, With<GlobalTransform>)>();
-        assert_eq!(query.iter(&app.world).count(), 0);
+        assert_eq!(query.iter(&app.world_mut()).count(), 0);
     }
 
     #[test]
@@ -407,13 +407,13 @@ mod test {
 
         app.update();
 
-        let mut query = app.world.query_filtered::<Entity, With<ViewVisibility>>();
-        assert_eq!(query.iter(&app.world).count(), 3);
+        let mut query = app.world_mut().query_filtered::<Entity, With<ViewVisibility>>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 3);
 
-        let mut query = app.world.query::<&InheritedVisibility>();
+        let mut query = app.world_mut().query::<&InheritedVisibility>();
         assert_eq!(
             query
-                .iter(&app.world)
+                .iter(&app.world_mut())
                 .filter(|v| v == &&InheritedVisibility::VISIBLE)
                 .count(),
             2
@@ -433,8 +433,8 @@ mod test {
 
         app.update();
 
-        let mut query = app.world.query_filtered::<Entity, With<ViewVisibility>>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        let mut query = app.world_mut().query_filtered::<Entity, With<ViewVisibility>>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
     #[test]
@@ -453,8 +453,8 @@ mod test {
         app.update();
 
         let mut query = app
-            .world
+            .world_mut()
             .query_filtered::<Entity, (With<Transform>, With<GlobalTransform>)>();
-        assert_eq!(query.iter(&app.world).count(), 4);
+        assert_eq!(query.iter(&app.world_mut()).count(), 4);
     }
 }
diff --git a/crates/prefab/src/save.rs b/crates/prefab/src/save.rs
index a1c0bc4b..012e910f 100644
--- a/crates/prefab/src/save.rs
+++ b/crates/prefab/src/save.rs
@@ -153,7 +153,7 @@ pub fn serialize_scene(world: &mut World) {
         error!("App Registry not initialized");
         return;
     };
-    let res = scene.serialize_ron(app_registry);
+    let res = scene.serialize(&app_registry.read());
 
     if let Ok(str) = res {
         // Write the scene RON data to file
@@ -236,7 +236,7 @@ mod tests {
 
         app.update();
 
-        serialize_scene(&mut app.world);
+        serialize_scene(&mut app.world_mut());
 
         // Delay for 0.2 second for IOTaskPool to finish
         std::thread::sleep(std::time::Duration::from_secs_f32(0.2));
@@ -279,9 +279,9 @@ mod tests {
 
         app.update();
 
-        serialize_scene(&mut app.world);
+        serialize_scene(&mut app.world_mut());
         assert!(app
-            .world
+            .world_mut()
             .resource_mut::<PrefabMemoryCache>()
             .scene
             .is_some());
@@ -299,8 +299,8 @@ mod tests {
         .add_systems(Update, prepare_children);
         app.update();
 
-        let mut query = app.world.query_filtered::<Entity, With<ChildrenPrefab>>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        let mut query = app.world_mut().query_filtered::<Entity, With<ChildrenPrefab>>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
     #[test]
@@ -320,8 +320,8 @@ mod tests {
         .add_systems(Update, delete_prepared_children);
         app.update();
 
-        let mut query = app.world.query_filtered::<Entity, With<ChildrenPrefab>>();
-        assert_eq!(query.iter(&app.world).count(), 0);
+        let mut query = app.world_mut().query_filtered::<Entity, With<ChildrenPrefab>>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 0);
     }
 
     #[test]
@@ -357,9 +357,9 @@ mod tests {
 
         app.update();
 
-        serialize_scene(&mut app.world);
+        serialize_scene(&mut app.world_mut());
         let events = app
-            .world
+            .world_mut()
             .resource::<Events<space_shared::toast::ToastMessage>>();
 
         let mut iter = events.get_reader();
@@ -384,7 +384,7 @@ mod tests {
         .add_systems(Update, prepare_children);
         app.update();
 
-        let mut query = app.world.query_filtered::<Entity, With<ChildrenPrefab>>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        let mut query = app.world_mut().query_filtered::<Entity, With<ChildrenPrefab>>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 }
diff --git a/crates/prefab/src/spawn_system.rs b/crates/prefab/src/spawn_system.rs
index 198d51b3..382a7ebb 100644
--- a/crates/prefab/src/spawn_system.rs
+++ b/crates/prefab/src/spawn_system.rs
@@ -265,8 +265,8 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world.query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        let mut query = app.world_mut().query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
     #[test]
@@ -283,9 +283,9 @@ mod tests {
         app.update();
 
         let mut query = app
-            .world
+            .world_mut()
             .query::<(&MaterialPrefab, &Handle<StandardMaterial>)>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
     #[test]
@@ -300,8 +300,8 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world.query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        let mut query = app.world_mut().query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
     #[test]
@@ -320,9 +320,9 @@ mod tests {
         app.update();
 
         let mut query = app
-            .world
+            .world_mut()
             .query::<(&ColorMaterialPrefab, &Handle<ColorMaterial>)>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
     #[test]
@@ -338,20 +338,20 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world.query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        let mut query = app.world_mut().query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
 
         let mut query = app
-            .world
+            .world_mut()
             .query_filtered::<Entity, With<MeshPrimitive2dPrefab>>();
-        let entity = query.single(&app.world);
-        app.world
+        let entity = query.single(&app.world_mut());
+        app.world_mut()
             .entity_mut(entity)
             .remove::<MeshPrimitive2dPrefab>();
 
         app.update();
-        let mut query = app.world.query_filtered::<Entity, With<Mesh2dHandle>>();
-        assert_eq!(query.iter(&app.world).count(), 0);
+        let mut query = app.world_mut().query_filtered::<Entity, With<Mesh2dHandle>>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 0);
     }
 
     #[test]
@@ -367,20 +367,20 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world.query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        let mut query = app.world_mut().query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
 
         let mut query = app
-            .world
+            .world_mut()
             .query_filtered::<Entity, With<MeshPrimitive3dPrefab>>();
-        let entity = query.single(&app.world);
-        app.world
+        let entity = query.single(&app.world_mut());
+        app.world_mut()
             .entity_mut(entity)
             .remove::<MeshPrimitive3dPrefab>();
 
         app.update();
-        let mut query = app.world.query_filtered::<Entity, With<Handle<Mesh>>>();
-        assert_eq!(query.iter(&app.world).count(), 0);
+        let mut query = app.world_mut().query_filtered::<Entity, With<Handle<Mesh>>>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 0);
     }
 
     #[test]
@@ -401,8 +401,8 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world.query::<(&SpriteTexture, &Sprite)>();
-        assert_eq!(query.iter(&app.world).count(), 1);
+        let mut query = app.world_mut().query::<(&SpriteTexture, &Sprite)>();
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
     #[test]
@@ -424,7 +424,7 @@ mod tests {
         .add_systems(Update, spawn_player_start);
         app.update();
 
-        let events = app.world.resource::<Events<ToastMessage>>();
+        let events = app.world_mut().resource::<Events<ToastMessage>>();
         let mut man_events = events.get_reader();
         let mut events = man_events.read(events);
         let event = events.next().unwrap();
@@ -436,9 +436,9 @@ mod tests {
         );
 
         let mut query = app
-            .world
+            .world_mut()
             .query::<(Entity, &PlayerStart, Option<&Children>)>();
-        let mut iter = query.iter(&app.world);
+        let mut iter = query.iter(&app.world_mut());
         assert!(iter.next().unwrap().2.is_some());
     }
 
@@ -474,14 +474,14 @@ mod tests {
         app.update();
 
         let mut parent_query = app
-            .world
+            .world_mut()
             .query_filtered::<Entity, (Without<WantChildPath>, Without<Parent>, With<Children>)>();
-        assert_eq!(parent_query.iter(&app.world).count(), 1);
+        assert_eq!(parent_query.iter(&app.world_mut()).count(), 1);
 
         let possibilities = vec![vec![0], vec![1], vec![0, 0], vec![1, 0], vec![]];
-        let mut child_paths = app.world.query::<&ChildPath>();
+        let mut child_paths = app.world_mut().query::<&ChildPath>();
         child_paths
-            .iter(&app.world)
+            .iter(&app.world_mut())
             .for_each(|d| assert!(possibilities.contains(&d.0)));
     }
 
@@ -509,9 +509,9 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world.query::<(&TextureAtlas, &Sprite)>();
+        let mut query = app.world_mut().query::<(&TextureAtlas, &Sprite)>();
 
-        assert_eq!(query.iter(&app.world).count(), 1);
+        assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
     #[test]
@@ -539,18 +539,18 @@ mod tests {
         app.update();
 
         let mut query = app
-            .world
+            .world_mut()
             .query::<(&Handle<Scene>, &SceneAutoRoot, &Visibility, &Transform)>();
 
-        let s = query.single(&app.world);
+        let s = query.single(&app.world_mut());
 
         assert_eq!(
             s.0.path().unwrap().to_string(),
             "low_poly_fighter_2.gltf#Scene0"
         );
 
-        let mut query = app.world.query::<(Entity, &DespawnTestChild)>();
-        assert!(query.get_single(&app.world).is_err());
+        let mut query = app.world_mut().query::<(Entity, &DespawnTestChild)>();
+        assert!(query.get_single(&app.world_mut()).is_err());
     }
 
     #[test]
@@ -576,10 +576,10 @@ mod tests {
         app.update();
 
         let mut query = app
-            .world
+            .world_mut()
             .query::<(&Handle<Scene>, &Visibility, &Transform)>();
 
-        let s = query.single(&app.world);
+        let s = query.single(&app.world_mut());
 
         assert_eq!(s.1, Visibility::Hidden);
         assert_eq!(s.2, &Transform::IDENTITY);

From 4fcaf7cac6807a362968fc43653619bed0f385bf Mon Sep 17 00:00:00 2001
From: MiniMinerX <jessehrupe@gmail.com>
Date: Sat, 20 Jul 2024 13:55:13 -0700
Subject: [PATCH 05/17] mostly done

---
 Cargo.lock                                    | 1890 ++++-------------
 Cargo.toml                                    |   10 +-
 crates/editor_core/src/gltf_unpack.rs         |    2 +-
 crates/editor_core/src/hotkeys.rs             |   16 +-
 crates/editor_core/src/selected.rs            |    2 +-
 crates/editor_core/src/task_storage.rs        |    8 +-
 crates/editor_core/src/toast.rs               |   60 +-
 crates/editor_tabs/src/lib.rs                 |    8 +-
 crates/editor_tabs/src/schedule_editor_tab.rs |    2 +-
 crates/editor_tabs/src/start_layout.rs        |    4 +-
 crates/editor_ui/src/camera_plugin.rs         |   15 +-
 .../src/inspector/components_order.rs         |    6 +-
 crates/editor_ui/src/inspector/mod.rs         |    2 +-
 crates/editor_ui/src/lib.rs                   |   11 +-
 crates/editor_ui/src/meshless_visualizer.rs   |   41 +-
 crates/editor_ui/src/selection.rs             |    2 +-
 crates/editor_ui/src/settings.rs              |    2 +-
 crates/editor_ui/src/tool.rs                  |    2 +-
 crates/editor_ui/src/tools/gizmo.rs           |   10 +-
 crates/editor_ui/src/ui_registration.rs       |    6 +-
 crates/prefab/src/component/material.rs       |   14 +-
 crates/prefab/src/component/shape.rs          |   24 +-
 crates/prefab/src/component/sprite.rs         |   37 +-
 crates/prefab/src/load.rs                     |    8 +-
 crates/prefab/src/spawn_system.rs             |    6 +-
 crates/prefab/src/sub_scene/mod.rs            |   20 +-
 crates/shared/src/toast.rs                    |    1 +
 27 files changed, 618 insertions(+), 1591 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c7ca0ad4..cd545e42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -34,15 +34,6 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448"
 
-[[package]]
-name = "accesskit_consumer"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6"
-dependencies = [
- "accesskit 0.12.3",
-]
-
 [[package]]
 name = "accesskit_consumer"
 version = "0.22.0"
@@ -53,18 +44,6 @@ dependencies = [
  "immutable-chunkmap",
 ]
 
-[[package]]
-name = "accesskit_macos"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
-dependencies = [
- "accesskit 0.12.3",
- "accesskit_consumer 0.16.1",
- "objc2 0.3.0-beta.3.patch-leaks.3",
- "once_cell",
-]
-
 [[package]]
 name = "accesskit_macos"
 version = "0.15.0"
@@ -72,27 +51,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c236a84ff1111defc280cee755eaa953d0b24398786851b9d28322c6d3bb1ebd"
 dependencies = [
  "accesskit 0.14.0",
- "accesskit_consumer 0.22.0",
- "objc2 0.5.2",
+ "accesskit_consumer",
+ "objc2",
  "objc2-app-kit",
  "objc2-foundation",
  "once_cell",
 ]
 
-[[package]]
-name = "accesskit_windows"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b"
-dependencies = [
- "accesskit 0.12.3",
- "accesskit_consumer 0.16.1",
- "once_cell",
- "paste",
- "static_assertions",
- "windows 0.48.0",
-]
-
 [[package]]
 name = "accesskit_windows"
 version = "0.20.0"
@@ -100,25 +65,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d7f43d24b16b3e76bef248124fbfd2493c3a9860edb5aae1010c890e826de5e"
 dependencies = [
  "accesskit 0.14.0",
- "accesskit_consumer 0.22.0",
+ "accesskit_consumer",
  "paste",
  "static_assertions",
  "windows 0.54.0",
 ]
 
-[[package]]
-name = "accesskit_winit"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45f8f7c9f66d454d5fd8e344c8c8c7324b57194e1041b955519fc58a01e77a25"
-dependencies = [
- "accesskit 0.12.3",
- "accesskit_macos 0.10.1",
- "accesskit_windows 0.15.1",
- "raw-window-handle",
- "winit 0.29.15",
-]
-
 [[package]]
 name = "accesskit_winit"
 version = "0.20.4"
@@ -126,10 +78,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "755535e6bf711a42dac28b888b884b10fc00ff4010d9d3bd871c5f5beae5aa78"
 dependencies = [
  "accesskit 0.14.0",
- "accesskit_macos 0.15.0",
- "accesskit_windows 0.20.0",
+ "accesskit_macos",
+ "accesskit_windows",
  "raw-window-handle",
- "winit 0.30.3",
+ "winit",
 ]
 
 [[package]]
@@ -203,27 +155,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "android-activity"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
-dependencies = [
- "android-properties",
- "bitflags 2.6.0",
- "cc",
- "cesu8",
- "jni",
- "jni-sys",
- "libc",
- "log",
- "ndk 0.8.0",
- "ndk-context",
- "ndk-sys 0.5.0+25.2.9519653",
- "num_enum",
- "thiserror",
-]
-
 [[package]]
 name = "android-activity"
 version = "0.6.0"
@@ -297,7 +228,7 @@ dependencies = [
  "core-graphics",
  "image 0.25.1",
  "log",
- "objc2 0.5.2",
+ "objc2",
  "objc2-app-kit",
  "objc2-foundation",
  "parking_lot",
@@ -440,7 +371,7 @@ checksum = "0a8da53296a1bc166b84f99aa7c6b9d8c10c71f0c022bc4fc72dd1fc49323b29"
 dependencies = [
  "avian_derive",
  "bevy",
- "bevy_math 0.14.0",
+ "bevy_math",
  "bitflags 2.6.0",
  "derive_more",
  "fxhash",
@@ -524,23 +455,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "094e2d697a9dcbbd62fc6ff133d1d95990f66b6c4d25cdfb528f4b102c6a3ed1"
 dependencies = [
  "bevy-inspector-egui-derive",
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_core 0.14.0",
- "bevy_core_pipeline 0.14.0",
- "bevy_ecs 0.14.0",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
  "bevy_egui",
- "bevy_hierarchy 0.14.0",
- "bevy_log 0.14.0",
- "bevy_math 0.14.0",
+ "bevy_hierarchy",
+ "bevy_log",
+ "bevy_math",
  "bevy_pbr",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
+ "bevy_reflect",
+ "bevy_render",
  "bevy_state",
- "bevy_time 0.14.0",
- "bevy_utils 0.14.0",
- "bevy_window 0.14.0",
+ "bevy_time",
+ "bevy_utils",
+ "bevy_window",
  "bytemuck",
  "egui 0.28.1",
  "fuzzy-matcher",
@@ -569,18 +500,6 @@ dependencies = [
  "bevy",
 ]
 
-[[package]]
-name = "bevy_a11y"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8ef2795f7f5c816a4eda04834083eb5a92e8fef603bc21d2091c6e3b63621a"
-dependencies = [
- "accesskit 0.12.3",
- "bevy_app 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
-]
-
 [[package]]
 name = "bevy_a11y"
 version = "0.14.0"
@@ -588,9 +507,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e613f0e7d5a92637e59744f7185e374c9a59654ecc6d7575adcec9581db1363"
 dependencies = [
  "accesskit 0.14.0",
- "bevy_app 0.14.0",
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
 ]
 
 [[package]]
@@ -599,20 +518,20 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23aa4141df149b743e69c90244261c6372bafb70d9f115885de48a75fc28fd9b"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_core 0.14.0",
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_hierarchy 0.14.0",
- "bevy_log 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
- "bevy_time 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_core",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_log",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
  "blake3",
  "fixedbitset 0.5.7",
  "petgraph",
@@ -623,33 +542,17 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "bevy_app"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab348a32e46d21c5d61794294a92d415a770d26c7ba8951830b127b40b53ccc4"
-dependencies = [
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_tasks 0.13.2",
- "bevy_utils 0.13.2",
- "downcast-rs",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "bevy_app"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f548e9dab7d10c5f99e3b504c758c4bf87aa67df9bcb9cc8b317a0271770e72"
 dependencies = [
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_tasks 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "console_error_panic_hook",
  "downcast-rs",
  "thiserror",
@@ -657,38 +560,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "bevy_asset"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50028e0d4f28a9f6aab48f61b688ba2793141188f88cdc9aa6c2bca2cc02ad35"
-dependencies = [
- "async-broadcast",
- "async-fs",
- "async-lock",
- "bevy_app 0.13.2",
- "bevy_asset_macros 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_log 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_tasks 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_winit 0.13.2",
- "blake3",
- "crossbeam-channel",
- "downcast-rs",
- "futures-io",
- "futures-lite",
- "js-sys",
- "parking_lot",
- "ron",
- "serde",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "bevy_asset"
 version = "0.14.0"
@@ -698,13 +569,13 @@ dependencies = [
  "async-broadcast",
  "async-fs",
  "async-lock",
- "bevy_app 0.14.0",
- "bevy_asset_macros 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_tasks 0.14.0",
- "bevy_utils 0.14.0",
- "bevy_winit 0.14.0",
+ "bevy_app",
+ "bevy_asset_macros",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
+ "bevy_winit",
  "blake3",
  "crossbeam-channel",
  "downcast-rs",
@@ -744,25 +615,13 @@ dependencies = [
  "syn 2.0.70",
 ]
 
-[[package]]
-name = "bevy_asset_macros"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6617475908368418d815360148fdbb82f879dc255a70d2d7baa3766f0cd4bfd7"
-dependencies = [
- "bevy_macro_utils 0.13.2",
- "proc-macro2",
- "quote",
- "syn 2.0.70",
-]
-
 [[package]]
 name = "bevy_asset_macros"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11b2cbeba287a4b44e116c33dbaf37dce80a9d84477b2bb35ff459999d6c9e1b"
 dependencies = [
- "bevy_macro_utils 0.14.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.70",
@@ -774,15 +633,15 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e41ecf15d0aae31bdb6d2b5cc590f966451e9736ddfee634c8f1ca5af1ac4342"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_hierarchy 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_transform",
+ "bevy_utils",
  "cpal",
  "rodio",
 ]
@@ -793,28 +652,13 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a933306f5c7dc9568209180f482b28b5f40d2f8d5b361bc1b270c0a588752c0"
 dependencies = [
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
+ "bevy_math",
+ "bevy_reflect",
  "bytemuck",
- "encase 0.8.0",
+ "encase",
  "serde",
  "thiserror",
- "wgpu-types 0.20.0",
-]
-
-[[package]]
-name = "bevy_core"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b0042f241ba7cd61487aadd8addfb56f7eeb662d713ac1577026704508fc6c"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_tasks 0.13.2",
- "bevy_utils 0.13.2",
- "bytemuck",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -823,53 +667,31 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ddeed5ebf2fa75a4d4f32e2da9c60f11037e36252695059a151c6685cd3d72b"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_tasks 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "uuid",
 ]
 
-[[package]]
-name = "bevy_core_pipeline"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48b7a471cb8ba665f12f7a167faa5566c11386f5bfc77d2e10bfde22b179f7b3"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_core 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_log 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_utils 0.13.2",
- "bitflags 2.6.0",
- "radsort",
- "serde",
-]
-
 [[package]]
 name = "bevy_core_pipeline"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b978220b5edc98f2c5cbbd14c118c74b3ec7216e5416d3c187c1097279b009b"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_core 0.14.0",
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_core",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
  "bitflags 2.6.0",
  "nonmax",
  "radsort",
@@ -887,24 +709,13 @@ dependencies = [
  "bevy",
 ]
 
-[[package]]
-name = "bevy_derive"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e01f8343f391e2d6a63b368b82fb5b252ed43c8713fc87f9a8f2d59407dd00"
-dependencies = [
- "bevy_macro_utils 0.13.2",
- "quote",
- "syn 2.0.70",
-]
-
 [[package]]
 name = "bevy_derive"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8a8173bad3ed53fa158806b1beda147263337d6ef71a093780dd141b74386b1"
 dependencies = [
- "bevy_macro_utils 0.14.0",
+ "bevy_macro_utils",
  "quote",
  "syn 2.0.70",
 ]
@@ -915,36 +726,16 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7f82011fd70048be282526a99756d54bf00e874edafa9664ba0dc247678f03"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_core 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_tasks 0.14.0",
- "bevy_time 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_app",
+ "bevy_core",
+ "bevy_ecs",
+ "bevy_tasks",
+ "bevy_time",
+ "bevy_utils",
  "const-fnv1a-hash",
  "sysinfo",
 ]
 
-[[package]]
-name = "bevy_ecs"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98e612a8e7962ead849e370f3a7e972b88df879ced05cd9dad6a0286d14650cf"
-dependencies = [
- "async-channel",
- "bevy_ecs_macros 0.13.2",
- "bevy_ptr 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_tasks 0.13.2",
- "bevy_utils 0.13.2",
- "downcast-rs",
- "fixedbitset 0.4.2",
- "rustc-hash",
- "serde",
- "thiserror",
- "thread_local",
-]
-
 [[package]]
 name = "bevy_ecs"
 version = "0.14.0"
@@ -952,11 +743,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c77fdc3a7230eff2fcebe4bd17c155bd238c660a0089d0f98c39ba0d461b923"
 dependencies = [
  "arrayvec",
- "bevy_ecs_macros 0.14.0",
- "bevy_ptr 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_tasks 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_ecs_macros",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "bitflags 2.6.0",
  "concurrent-queue",
  "fixedbitset 0.5.7",
@@ -966,25 +757,13 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_ecs_macros"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "807b5106c3410e58f4f523b55ea3c071e2a09e31e9510f3c22021c6a04732b5b"
-dependencies = [
- "bevy_macro_utils 0.13.2",
- "proc-macro2",
- "quote",
- "syn 2.0.70",
-]
-
 [[package]]
 name = "bevy_ecs_macros"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9272b511958525306cd141726d3ca59740f79fc0707c439b55a007bcc3497308"
 dependencies = [
- "bevy_macro_utils 0.14.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.70",
@@ -1009,17 +788,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "webbrowser",
- "winit 0.30.3",
-]
-
-[[package]]
-name = "bevy_encase_derive"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887087a5e522d9f20733a84dd7e6e9ca04cd8fdfac659220ed87d675eebc83a7"
-dependencies = [
- "bevy_macro_utils 0.13.2",
- "encase_derive_impl 0.7.0",
+ "winit",
 ]
 
 [[package]]
@@ -1028,28 +797,28 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0452d8254c8bfae4bff6caca2a8be3b0c1b2e1a72b93e9b9f6a21c8dff807e0"
 dependencies = [
- "bevy_macro_utils 0.14.0",
- "encase_derive_impl 0.8.0",
+ "bevy_macro_utils",
+ "encase_derive_impl",
 ]
 
 [[package]]
 name = "bevy_eventlistener"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d65c75b4f81818cacdc8a4302c5413910c5fb7727564deaf95e56e0dea4bd0"
+checksum = "63aff74ac1477b88b57ff2f82fc711a7931414be7ee7d0e96aeea45b6d4a7cb6"
 dependencies = [
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
+ "bevy_app",
+ "bevy_ecs",
  "bevy_eventlistener_derive",
- "bevy_hierarchy 0.13.2",
- "bevy_utils 0.13.2",
+ "bevy_hierarchy",
+ "bevy_utils",
 ]
 
 [[package]]
 name = "bevy_eventlistener_derive"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa29be733a02a5d7ca4507ef15f294711c1a0884b9a9a2730640ff4e7d0200ab"
+checksum = "3fc779559aa23b81da2b14fba90586755d225983c5b6d3154658e42fc088de7f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1062,77 +831,45 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbad8e59470c3d5cf25aa8c48462c4cf6f0c6314538c68ab2f5cf393146f0fc2"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_input 0.14.0",
- "bevy_time 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_time",
+ "bevy_utils",
  "gilrs",
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_gizmos"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054df3550a9d423a961de65b459946ff23304f97f25af8a62c23f4259db8506d"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_core 0.13.2",
- "bevy_core_pipeline 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_gizmos_macros 0.13.2",
- "bevy_log 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_utils 0.13.2",
-]
-
 [[package]]
 name = "bevy_gizmos"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdbb0556f0c6e45f4a17aef9c708c06ebf15ae1bed4533d7eddb493409f9f025"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_core_pipeline 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_gizmos_macros 0.14.0",
- "bevy_math 0.14.0",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_gizmos_macros",
+ "bevy_math",
  "bevy_pbr",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
- "bevy_sprite 0.14.0",
- "bevy_time 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
  "bytemuck",
 ]
 
-[[package]]
-name = "bevy_gizmos_macros"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abdcaf74d8cd34aa5c3293527e7a012826840886ad3496c1b963ed8b66b1619f"
-dependencies = [
- "bevy_macro_utils 0.13.2",
- "proc-macro2",
- "quote",
- "syn 2.0.70",
-]
-
 [[package]]
 name = "bevy_gizmos_macros"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ef351a4b6498c197d1317c62f46ba84b69fbde3dbeb57beb2e744bbe5b7c3e0"
 dependencies = [
- "bevy_macro_utils 0.14.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.70",
@@ -1146,21 +883,21 @@ checksum = "cfd7abeaf3f28afd1f8999c2169aa17b40a37ad11253cf7dd05017024b65adc6"
 dependencies = [
  "base64 0.22.1",
  "bevy_animation",
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_core 0.14.0",
- "bevy_core_pipeline 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_hierarchy 0.14.0",
- "bevy_math 0.14.0",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_math",
  "bevy_pbr",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
+ "bevy_reflect",
+ "bevy_render",
  "bevy_scene",
- "bevy_tasks 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_tasks",
+ "bevy_transform",
+ "bevy_utils",
  "gltf",
  "percent-encoding",
  "serde",
@@ -1169,60 +906,31 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_hierarchy"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb3dfad24866a6713dafa3065a91c5cf5e355f6e1b191c25d704ae54185246c"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_core 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_log 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_utils 0.13.2",
-]
-
 [[package]]
 name = "bevy_hierarchy"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "802eca6f341d19ade790ccfaba7044be4d823b708087eb5ac4c1f74e4ea0916a"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_core 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_app",
+ "bevy_core",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
  "smallvec",
 ]
 
-[[package]]
-name = "bevy_input"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47f2b2b3df168c6ef661d25e09abf5bd4fecaacd400f27e5db650df1c3fa3a3b"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_utils 0.13.2",
- "smol_str",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_input"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d050f1433f48ca23f1ea078734ebff119a3f76eb7d221725ab0f1fd9f81230b"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_utils",
  "smol_str",
  "thiserror",
 ]
@@ -1233,55 +941,39 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ddd2b23e44d3a1f8ae547cbee5b6661f8135cc456c5de206e8648789944e7a1"
 dependencies = [
- "bevy_a11y 0.14.0",
+ "bevy_a11y",
  "bevy_animation",
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_audio",
  "bevy_color",
- "bevy_core 0.14.0",
- "bevy_core_pipeline 0.14.0",
- "bevy_derive 0.14.0",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_derive",
  "bevy_diagnostic",
- "bevy_ecs 0.14.0",
+ "bevy_ecs",
  "bevy_gilrs",
- "bevy_gizmos 0.14.0",
+ "bevy_gizmos",
  "bevy_gltf",
- "bevy_hierarchy 0.14.0",
- "bevy_input 0.14.0",
- "bevy_log 0.14.0",
- "bevy_math 0.14.0",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math",
  "bevy_pbr",
- "bevy_ptr 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_render",
  "bevy_scene",
- "bevy_sprite 0.14.0",
+ "bevy_sprite",
  "bevy_state",
- "bevy_tasks 0.14.0",
+ "bevy_tasks",
  "bevy_text",
- "bevy_time 0.14.0",
- "bevy_transform 0.14.0",
+ "bevy_time",
+ "bevy_transform",
  "bevy_ui",
- "bevy_utils 0.14.0",
- "bevy_window 0.14.0",
- "bevy_winit 0.14.0",
-]
-
-[[package]]
-name = "bevy_log"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5eea6c527fd828b7fef8d0f518167f27f405b904a16f227b644687d3f46a809"
-dependencies = [
- "android_log-sys",
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_utils 0.13.2",
- "console_error_panic_hook",
- "tracing-log 0.1.4",
- "tracing-subscriber",
- "tracing-wasm",
+ "bevy_utils",
+ "bevy_window",
+ "bevy_winit",
 ]
 
 [[package]]
@@ -1291,27 +983,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bab641fd0de254915ab746165a07677465b2d89b72f5b49367d73b9197548a35"
 dependencies = [
  "android_log-sys",
- "bevy_app 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_utils 0.14.0",
- "tracing-log 0.2.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_utils",
+ "tracing-log",
  "tracing-subscriber",
  "tracing-wasm",
 ]
 
-[[package]]
-name = "bevy_macro_utils"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb270c98a96243b29465139ed10bda2f675d00a11904f6588a5f7fc4774119c7"
-dependencies = [
- "proc-macro2",
- "quote",
- "rustc-hash",
- "syn 2.0.70",
- "toml_edit 0.21.1",
-]
-
 [[package]]
 name = "bevy_macro_utils"
 version = "0.14.0"
@@ -1324,38 +1003,19 @@ dependencies = [
  "toml_edit 0.22.15",
 ]
 
-[[package]]
-name = "bevy_math"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f06daa26ffb82d90ba772256c0ba286f6c305c392f6976c9822717974805837c"
-dependencies = [
- "glam 0.25.0",
- "serde",
-]
-
 [[package]]
 name = "bevy_math"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51bd6ce2174d3237d30e0ab5b2508480cc7593ca4d96ffb3a3095f9fc6bbc34c"
 dependencies = [
- "bevy_reflect 0.14.0",
+ "bevy_reflect",
  "glam 0.27.0",
  "rand",
  "smallvec",
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_mikktspace"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d7ef7f2a826d0b19f059035831ce00a5e930435cc53c61e045773d0483f67a"
-dependencies = [
- "glam 0.25.0",
-]
-
 [[package]]
 name = "bevy_mikktspace"
 version = "0.14.0"
@@ -1385,49 +1045,50 @@ dependencies = [
  "interpolation",
  "nonmax",
  "thiserror",
- "wgpu-types 0.20.0",
+ "wgpu-types",
 ]
 
 [[package]]
 name = "bevy_mod_picking"
-version = "0.18.3"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbcb08ab83764e21b725f695827b641701e34e7eff2dbffb6b343847b785873"
+checksum = "e290b8ad3e72dc621da7a9c21129da10540d78290ef8857353190e0213cac692"
 dependencies = [
- "bevy_app 0.13.2",
- "bevy_core 0.13.2",
- "bevy_ecs 0.13.2",
+ "bevy_app",
+ "bevy_core",
+ "bevy_ecs",
  "bevy_eventlistener",
- "bevy_math 0.13.2",
+ "bevy_math",
  "bevy_picking_core",
  "bevy_picking_highlight",
  "bevy_picking_input",
  "bevy_picking_raycast",
  "bevy_picking_selection",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_window 0.13.2",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_utils",
+ "bevy_window",
 ]
 
 [[package]]
 name = "bevy_mod_raycast"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca646aeaab4a170e1f3e8284b925e2f990eb18616e95d7826c873c8e26ee945"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_gizmos 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_sprite 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_window 0.13.2",
+checksum = "d9e4ff45885c4716771a9f55977d8ce69596502a5241da55bf608d7cd71a9cb3"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_color",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_gizmos",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
  "crossbeam-channel",
 ]
 
@@ -1446,18 +1107,18 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3effe8ff28899f14d250d0649ca9868dbe68b389d0f2b7af086759b8e16c6e3d"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_core_pipeline 0.14.0",
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
- "bevy_window 0.14.0",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
  "bitflags 2.6.0",
  "bytemuck",
  "fixedbitset 0.5.7",
@@ -1469,125 +1130,103 @@ dependencies = [
 
 [[package]]
 name = "bevy_picking_core"
-version = "0.18.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168fce188e01d19f6db5bde2ca8249ec5b59720ab5ec82826c6906c6f06850c"
+checksum = "020b6cf6079927a1e6a3dd883986546632d8d09ab77840997f4936a74eade722"
 dependencies = [
- "bevy_app 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
  "bevy_eventlistener",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_window 0.13.2",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "uuid",
 ]
 
 [[package]]
 name = "bevy_picking_highlight"
-version = "0.18.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46e49069da84b0fec990f9b73bb4cdb2767028c0e7e9685180cded2954e22166"
+checksum = "8ba45161608da1bb58cbc55fd83cf5e529e616a180778c394733c85056cd2b76"
 dependencies = [
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_ecs 0.13.2",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_color",
+ "bevy_ecs",
  "bevy_picking_core",
  "bevy_picking_selection",
- "bevy_reflect 0.13.2",
+ "bevy_reflect",
 ]
 
 [[package]]
 name = "bevy_picking_input"
-version = "0.18.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f72c3ad25a644b19419ef4c7ec1a245bc09858b672ba33583bd17016d0ee4fcb"
+checksum = "0ba8cf67c68a5e150c066366744f9a44006ead9ad280de1c9ca69a6a13c5e283"
 dependencies = [
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_hierarchy 0.13.2",
- "bevy_input 0.13.2",
- "bevy_math 0.13.2",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_math",
  "bevy_picking_core",
  "bevy_picking_selection",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_window 0.13.2",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_utils",
+ "bevy_window",
 ]
 
 [[package]]
 name = "bevy_picking_raycast"
-version = "0.18.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "408f961c27043a39451ec0254f0b75325ced3b73d9aa1a0ef4276e43967e16fc"
+checksum = "679184dad110d1532ee6c4c872a0a5807277ea091406915aab27149a3b344fed"
 dependencies = [
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
+ "bevy_app",
+ "bevy_ecs",
  "bevy_mod_raycast",
  "bevy_picking_core",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_window 0.13.2",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_window",
 ]
 
 [[package]]
 name = "bevy_picking_selection"
-version = "0.18.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca137648ef4ad692cf7fe4ff49b7486ed3fe41217b546cd3eeac1bce701cf235"
+checksum = "bf0769d84e944fbc09b0475f068e5232a8a4be15339796539aecd747413ededd"
 dependencies = [
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
+ "bevy_app",
+ "bevy_ecs",
  "bevy_eventlistener",
- "bevy_input 0.13.2",
+ "bevy_input",
  "bevy_picking_core",
- "bevy_reflect 0.13.2",
- "bevy_utils 0.13.2",
+ "bevy_reflect",
+ "bevy_utils",
 ]
 
-[[package]]
-name = "bevy_ptr"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8050e2869fe341db6874203b5a01ff12673807a2c7c80cb829f6c7bea6997268"
-
 [[package]]
 name = "bevy_ptr"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c115c97a5c8a263bd0aa7001b999772c744ac5ba797d07c86f25734ce381ea69"
 
-[[package]]
-name = "bevy_reflect"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccbd7de21d586457a340a0962ad0747dc5098ff925eb6b27a918c4bdd8252f7b"
-dependencies = [
- "bevy_math 0.13.2",
- "bevy_ptr 0.13.2",
- "bevy_reflect_derive 0.13.2",
- "bevy_utils 0.13.2",
- "downcast-rs",
- "erased-serde",
- "glam 0.25.0",
- "serde",
- "smol_str",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_reflect"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "406ea0fce267169c2320c7302d97d09f605105686346762562c5f65960b5ca2f"
 dependencies = [
- "bevy_ptr 0.14.0",
- "bevy_reflect_derive 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_ptr",
+ "bevy_reflect_derive",
+ "bevy_utils",
  "downcast-rs",
  "erased-serde",
  "glam 0.27.0",
@@ -1599,75 +1238,19 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "bevy_reflect_derive"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ce33051bd49036d4a5a62aa3f2068672ec55f3ebe92aa0d003a341f15cc37ac"
-dependencies = [
- "bevy_macro_utils 0.13.2",
- "proc-macro2",
- "quote",
- "syn 2.0.70",
- "uuid",
-]
-
 [[package]]
 name = "bevy_reflect_derive"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0427fdb4425fc72cc96d45e550df83ace6347f0503840de116c76a40843ba751"
 dependencies = [
- "bevy_macro_utils 0.14.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.70",
  "uuid",
 ]
 
-[[package]]
-name = "bevy_render"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b2c4b644c739c0b474b6f8f7b0bc68ac13d83b59688781e9a7753c52780177"
-dependencies = [
- "async-channel",
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_core 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_encase_derive 0.13.2",
- "bevy_hierarchy 0.13.2",
- "bevy_log 0.13.2",
- "bevy_math 0.13.2",
- "bevy_mikktspace 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render_macros 0.13.2",
- "bevy_tasks 0.13.2",
- "bevy_time 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_window 0.13.2",
- "bitflags 2.6.0",
- "bytemuck",
- "codespan-reporting",
- "downcast-rs",
- "encase 0.7.0",
- "futures-lite",
- "hexasphere 10.0.0",
- "image 0.24.9",
- "js-sys",
- "naga 0.19.2",
- "naga_oil 0.13.0",
- "serde",
- "thiserror",
- "thread_local",
- "wasm-bindgen",
- "web-sys",
- "wgpu 0.19.4",
-]
-
 [[package]]
 name = "bevy_render"
 version = "0.14.0"
@@ -1675,36 +1258,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c48acf1ff4267c231def4cbf573248d42ac60c9952108822d505019460bf36d"
 dependencies = [
  "async-channel",
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_core 0.14.0",
- "bevy_derive 0.14.0",
+ "bevy_core",
+ "bevy_derive",
  "bevy_diagnostic",
- "bevy_ecs 0.14.0",
- "bevy_encase_derive 0.14.0",
- "bevy_hierarchy 0.14.0",
- "bevy_math 0.14.0",
- "bevy_mikktspace 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_render_macros 0.14.0",
- "bevy_tasks 0.14.0",
- "bevy_time 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
- "bevy_window 0.14.0",
+ "bevy_ecs",
+ "bevy_encase_derive",
+ "bevy_hierarchy",
+ "bevy_math",
+ "bevy_mikktspace",
+ "bevy_reflect",
+ "bevy_render_macros",
+ "bevy_tasks",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
  "bitflags 2.6.0",
  "bytemuck",
  "codespan-reporting",
  "downcast-rs",
- "encase 0.8.0",
+ "encase",
  "futures-lite",
- "hexasphere 12.0.0",
+ "hexasphere",
  "image 0.25.1",
  "js-sys",
  "ktx2",
- "naga 0.20.0",
- "naga_oil 0.14.0",
+ "naga",
+ "naga_oil",
  "nonmax",
  "ruzstd",
  "send_wrapper",
@@ -1713,19 +1296,7 @@ dependencies = [
  "thiserror",
  "wasm-bindgen",
  "web-sys",
- "wgpu 0.20.1",
-]
-
-[[package]]
-name = "bevy_render_macros"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "720b88406e786e378829b7d43c1ffb5300186912b99904d0d4d8ec6698a4f210"
-dependencies = [
- "bevy_macro_utils 0.13.2",
- "proc-macro2",
- "quote",
- "syn 2.0.70",
+ "wgpu",
 ]
 
 [[package]]
@@ -1734,7 +1305,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72ddf4a96d71519c8eca3d74dabcb89a9c0d50ab5d9230638cb004145f46e9ed"
 dependencies = [
- "bevy_macro_utils 0.14.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.70",
@@ -1746,63 +1317,37 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7a9f0388612a116f02ab6187aeab66e52c9e91abbc21f919b8b50230c4d83e7"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_hierarchy 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
  "serde",
  "thiserror",
  "uuid",
 ]
 
-[[package]]
-name = "bevy_sprite"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cad1b555161f50e5d62b7fdf7ebeef1b24338aae7a88e51985da9553cd60ddf"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_asset 0.13.2",
- "bevy_core_pipeline 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_log 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_render 0.13.2",
- "bevy_transform 0.13.2",
- "bevy_utils 0.13.2",
- "bitflags 2.6.0",
- "bytemuck",
- "fixedbitset 0.4.2",
- "guillotiere",
- "radsort",
- "rectangle-pack",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_sprite"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d837e33ed27b9f2e5212eca4bdd5655a9ee64c52914112e6189c043cb25dd1ec"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_core_pipeline 0.14.0",
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
  "bitflags 2.6.0",
  "bytemuck",
  "fixedbitset 0.5.7",
@@ -1818,12 +1363,12 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0959984092d56885fd3b320ea84fb816821bad6bfa3040b9d4ee850d3273233d"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_hierarchy 0.14.0",
- "bevy_reflect 0.14.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_reflect",
  "bevy_state_macros",
- "bevy_utils 0.14.0",
+ "bevy_utils",
 ]
 
 [[package]]
@@ -1832,26 +1377,12 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "887a98bfa268258377cd073f5bb839518d3a1cd6b96ed81418145485b69378e6"
 dependencies = [
- "bevy_macro_utils 0.14.0",
+ "bevy_macro_utils",
  "proc-macro2",
  "quote",
  "syn 2.0.70",
 ]
 
-[[package]]
-name = "bevy_tasks"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f07fcc4969b357de143509925b39c9a2c56eaa8750828d97f319ca9ed41897cb"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-task",
- "concurrent-queue",
- "futures-lite",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "bevy_tasks"
 version = "0.14.0"
@@ -1872,75 +1403,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "454fd29b7828244356b2e0ce782e6d0a6f26b47f521456accde3a7191b121727"
 dependencies = [
  "ab_glyph",
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_ecs 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
- "bevy_sprite 0.14.0",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
- "bevy_window 0.14.0",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
  "glyph_brush_layout",
  "serde",
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_time"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ea5ae9fe7f56f555dbb05a88d34931907873e3f0c7dc426591839eef72fe3e"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_utils 0.13.2",
- "crossbeam-channel",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_time"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6c3d3d14ee8b0dbe4819fd516cc75509b61946134d78e0ee89ad3d1835ffe6c"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
  "crossbeam-channel",
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_transform"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d51a1f332cc00939d2f19ed6b909e5ed7037e39c7e25cc86930d79d432163e"
-dependencies = [
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_hierarchy 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "thiserror",
-]
-
 [[package]]
 name = "bevy_transform"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97e8aa6b16be573277c6ceda30aebf1d78af7c6ede19b448dcb052fb8601d815"
 dependencies = [
- "bevy_app 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_hierarchy 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_math",
+ "bevy_reflect",
  "thiserror",
 ]
 
@@ -1950,23 +1453,23 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38d9f864c646f3742ff77f67bcd89a13a7ab024b68ca2f1bfbab8245bcb1c06c"
 dependencies = [
- "bevy_a11y 0.14.0",
- "bevy_app 0.14.0",
- "bevy_asset 0.14.0",
+ "bevy_a11y",
+ "bevy_app",
+ "bevy_asset",
  "bevy_color",
- "bevy_core_pipeline 0.14.0",
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_hierarchy 0.14.0",
- "bevy_input 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_render 0.14.0",
- "bevy_sprite 0.14.0",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
  "bevy_text",
- "bevy_transform 0.14.0",
- "bevy_utils 0.14.0",
- "bevy_window 0.14.0",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
  "bytemuck",
  "nonmax",
  "smallvec",
@@ -1974,25 +1477,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "bevy_utils"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9f845a985c00e0ee8dc2d8af3f417be925fb52aad4bda5b96e2e58a2b4d2eb"
-dependencies = [
- "ahash",
- "bevy_utils_proc_macros 0.13.2",
- "getrandom",
- "hashbrown",
- "nonmax",
- "petgraph",
- "smallvec",
- "thiserror",
- "tracing",
- "uuid",
- "web-time 0.2.4",
-]
-
 [[package]]
 name = "bevy_utils"
 version = "0.14.0"
@@ -2000,23 +1484,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fab364910e8f5839578aba9cfda00a8388e9ebe352ceb8491a742ce6af9ec6e"
 dependencies = [
  "ahash",
- "bevy_utils_proc_macros 0.14.0",
+ "bevy_utils_proc_macros",
  "getrandom",
  "hashbrown",
  "thread_local",
  "tracing",
- "web-time 1.1.0",
-]
-
-[[package]]
-name = "bevy_utils_proc_macros"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef158627f30503d5c18c20c60b444829f698d343516eeaf6eeee078c9a45163"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.70",
+ "web-time",
 ]
 
 [[package]]
@@ -2030,90 +1503,48 @@ dependencies = [
  "syn 2.0.70",
 ]
 
-[[package]]
-name = "bevy_window"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976202d2ed838176595b550ac654b15ae236e0178a6f19a94ca6d58f2a96ca60"
-dependencies = [
- "bevy_a11y 0.13.2",
- "bevy_app 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_input 0.13.2",
- "bevy_math 0.13.2",
- "bevy_reflect 0.13.2",
- "bevy_utils 0.13.2",
- "raw-window-handle",
- "smol_str",
-]
-
 [[package]]
 name = "bevy_window"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9ea5777f933bf7ecaeb3af1a30845720ec730e007972ca7d4aba2d3512abe24"
 dependencies = [
- "bevy_a11y 0.14.0",
- "bevy_app 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_utils 0.14.0",
+ "bevy_a11y",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_utils",
  "raw-window-handle",
  "smol_str",
 ]
 
-[[package]]
-name = "bevy_winit"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa66539aa93d8522b146bf82de429714ea6370a6061fc1f1ff7bcacd4e64c6c4"
-dependencies = [
- "accesskit_winit 0.17.0",
- "approx",
- "bevy_a11y 0.13.2",
- "bevy_app 0.13.2",
- "bevy_derive 0.13.2",
- "bevy_ecs 0.13.2",
- "bevy_hierarchy 0.13.2",
- "bevy_input 0.13.2",
- "bevy_math 0.13.2",
- "bevy_tasks 0.13.2",
- "bevy_utils 0.13.2",
- "bevy_window 0.13.2",
- "crossbeam-channel",
- "raw-window-handle",
- "wasm-bindgen",
- "web-sys",
- "winit 0.29.15",
-]
-
 [[package]]
 name = "bevy_winit"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8c2213bbf14debe819ec8ad4913f233c596002d087bc6f1f20d533e2ebaf8c6"
 dependencies = [
- "accesskit_winit 0.20.4",
+ "accesskit_winit",
  "approx",
- "bevy_a11y 0.14.0",
- "bevy_app 0.14.0",
- "bevy_derive 0.14.0",
- "bevy_ecs 0.14.0",
- "bevy_hierarchy 0.14.0",
- "bevy_input 0.14.0",
- "bevy_log 0.14.0",
- "bevy_math 0.14.0",
- "bevy_reflect 0.14.0",
- "bevy_tasks 0.14.0",
- "bevy_utils 0.14.0",
- "bevy_window 0.14.0",
+ "bevy_a11y",
+ "bevy_app",
+ "bevy_derive",
+ "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",
  "web-sys",
- "winit 0.30.3",
+ "winit",
 ]
 
 [[package]]
@@ -2203,51 +1634,13 @@ 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 0.2.0-beta.2",
-]
-
-[[package]]
-name = "block-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7"
-dependencies = [
- "objc-sys 0.3.5",
-]
-
-[[package]]
-name = "block2"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
-dependencies = [
- "block-sys 0.1.0-beta.1",
- "objc2-encode 2.0.0-pre.2",
-]
-
-[[package]]
-name = "block2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
-dependencies = [
- "block-sys 0.2.1",
- "objc2 0.4.1",
-]
-
 [[package]]
 name = "block2"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
- "objc2 0.5.2",
+ "objc2",
 ]
 
 [[package]]
@@ -2685,17 +2078,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
 
-[[package]]
-name = "d3d12"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
-dependencies = [
- "bitflags 2.6.0",
- "libloading 0.8.4",
- "winapi",
-]
-
 [[package]]
 name = "d3d12"
 version = "0.20.0"
@@ -2789,9 +2171,6 @@ name = "ecolor"
 version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03cfe80b1890e1a8cdbffc6044d6872e814aaf6011835a2a5e2db0e5c5c4ef4e"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "ecolor"
@@ -2811,6 +2190,7 @@ checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8"
 dependencies = [
  "bytemuck",
  "emath 0.28.1",
+ "serde",
 ]
 
 [[package]]
@@ -2828,11 +2208,9 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180f595432a5b615fc6b74afef3955249b86cfea72607b40740a4cd60d5297d0"
 dependencies = [
- "accesskit 0.12.3",
  "ahash",
  "epaint 0.26.2",
  "nohash-hasher",
- "serde",
 ]
 
 [[package]]
@@ -2854,10 +2232,12 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798"
 dependencies = [
+ "accesskit 0.12.3",
  "ahash",
  "emath 0.28.1",
  "epaint 0.28.1",
  "nohash-hasher",
+ "serde",
 ]
 
 [[package]]
@@ -2873,34 +2253,35 @@ dependencies = [
 
 [[package]]
 name = "egui-toast"
-version = "0.12.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe0437ed2c827749fb57edb3dc62e796805974b11ce7aed1a001200fee92aba"
+checksum = "6652cccda84ba174437caa128e4e28a3502a3c62c9e39e381c24f1f0445946f1"
 dependencies = [
- "egui 0.26.2",
+ "egui 0.28.1",
 ]
 
 [[package]]
 name = "egui_dock"
-version = "0.11.4"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a062ac200c9f3ddf120ffcc5582f9fbd5d8fbd046d2eed215ed5426f56513d0"
+checksum = "629a8b0e440d69996795669ceacc0dd839a997843489273600d31d16c9cb3500"
 dependencies = [
  "duplicate",
- "egui 0.26.2",
+ "egui 0.28.1",
  "paste",
 ]
 
 [[package]]
 name = "egui_extras"
-version = "0.26.2"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f4a6962241a76da5be5e64e41b851ee1c95fda11f76635522a3c82b119b5475"
+checksum = "5bb783d9fa348f69ed5c340aa25af78b5472043090e8b809040e30960cc2a746"
 dependencies = [
- "egui 0.26.2",
+ "ahash",
+ "egui 0.28.1",
  "ehttp",
  "enum-map",
- "image 0.24.9",
+ "image 0.25.1",
  "log",
  "mime_guess2",
  "resvg",
@@ -2909,18 +2290,18 @@ dependencies = [
 
 [[package]]
 name = "egui_file"
-version = "0.15.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7ab9511d758f446da19bc1341d32014dea4c5c8328709975937b97b33b2347e"
+checksum = "60f345a124846bdfe3b35a43b74bb2a485c5494c106cb646748edcd6c10bc24d"
 dependencies = [
- "egui 0.26.2",
+ "egui 0.28.1",
 ]
 
 [[package]]
 name = "ehttp"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e598cc2bfc28612f26426259ed99a978270e9433d63ae6d2843e30fb0974cd02"
+checksum = "59a81c221a1e4dad06cb9c9deb19aea1193a5eea084e8cd42d869068132bf876"
 dependencies = [
  "document-features",
  "js-sys",
@@ -2941,9 +2322,6 @@ name = "emath"
 version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6916301ecf80448f786cdf3eb51d9dbdd831538732229d49119e2d4312eaaf09"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "emath"
@@ -2962,18 +2340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6"
 dependencies = [
  "bytemuck",
-]
-
-[[package]]
-name = "encase"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103"
-dependencies = [
- "const_panic",
- "encase_derive 0.7.0",
- "glam 0.25.0",
- "thiserror",
+ "serde",
 ]
 
 [[package]]
@@ -2983,38 +2350,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a9299a95fa5671ddf29ecc22b00e121843a65cb9ff24911e394b4ae556baf36"
 dependencies = [
  "const_panic",
- "encase_derive 0.8.0",
+ "encase_derive",
  "glam 0.27.0",
  "thiserror",
 ]
 
-[[package]]
-name = "encase_derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a"
-dependencies = [
- "encase_derive_impl 0.7.0",
-]
-
 [[package]]
 name = "encase_derive"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e09decb3beb1fe2db6940f598957b2e1f7df6206a804d438ff6cb2a9cddc10"
 dependencies = [
- "encase_derive_impl 0.8.0",
-]
-
-[[package]]
-name = "encase_derive_impl"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92959a9e8d13eaa13b8ae8c7b583c3bf1669ca7a8e7708a088d12587ba86effc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.70",
+ "encase_derive_impl",
 ]
 
 [[package]]
@@ -3072,7 +2419,6 @@ dependencies = [
  "emath 0.26.2",
  "nohash-hasher",
  "parking_lot",
- "serde",
 ]
 
 [[package]]
@@ -3104,6 +2450,7 @@ dependencies = [
  "emath 0.28.1",
  "nohash-hasher",
  "parking_lot",
+ "serde",
 ]
 
 [[package]]
@@ -3427,9 +2774,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
 dependencies = [
- "bytemuck",
  "mint",
- "serde",
 ]
 
 [[package]]
@@ -3560,17 +2905,6 @@ dependencies = [
  "windows 0.52.0",
 ]
 
-[[package]]
-name = "gpu-descriptor"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
-dependencies = [
- "bitflags 2.6.0",
- "gpu-descriptor-types 0.1.2",
- "hashbrown",
-]
-
 [[package]]
 name = "gpu-descriptor"
 version = "0.3.0"
@@ -3578,19 +2912,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
 dependencies = [
  "bitflags 2.6.0",
- "gpu-descriptor-types 0.2.0",
+ "gpu-descriptor-types",
  "hashbrown",
 ]
 
-[[package]]
-name = "gpu-descriptor-types"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
-dependencies = [
- "bitflags 2.6.0",
-]
-
 [[package]]
 name = "gpu-descriptor-types"
 version = "0.2.0"
@@ -3670,16 +2995,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
-[[package]]
-name = "hexasphere"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33ddb7f7143d9e703c072e88b98cd8b9719f174137a671429351bd2ee43c02a"
-dependencies = [
- "constgebra",
- "glam 0.25.0",
-]
-
 [[package]]
 name = "hexasphere"
 version = "12.0.0"
@@ -3705,17 +3020,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "icrate"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
-dependencies = [
- "block2 0.3.0",
- "dispatch",
- "objc2 0.4.1",
-]
-
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -4163,26 +3467,11 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "metal"
-version = "0.27.0"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
- "bitflags 2.6.0",
- "block",
- "core-graphics-types",
- "foreign-types",
- "log",
- "objc",
- "paste",
+ "autocfg",
 ]
 
 [[package]]
@@ -4238,27 +3527,6 @@ version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
-[[package]]
-name = "naga"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843"
-dependencies = [
- "bit-set",
- "bitflags 2.6.0",
- "codespan-reporting",
- "hexf-parse",
- "indexmap",
- "log",
- "num-traits",
- "pp-rs",
- "rustc-hash",
- "spirv",
- "termcolor",
- "thiserror",
- "unicode-xid",
-]
-
 [[package]]
 name = "naga"
 version = "0.20.0"
@@ -4281,26 +3549,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "naga_oil"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1"
-dependencies = [
- "bit-set",
- "codespan-reporting",
- "data-encoding",
- "indexmap",
- "naga 0.19.2",
- "once_cell",
- "regex",
- "regex-syntax 0.8.4",
- "rustc-hash",
- "thiserror",
- "tracing",
- "unicode-ident",
-]
-
 [[package]]
 name = "naga_oil"
 version = "0.14.0"
@@ -4311,7 +3559,7 @@ dependencies = [
  "codespan-reporting",
  "data-encoding",
  "indexmap",
- "naga 0.20.0",
+ "naga",
  "once_cell",
  "regex",
  "regex-syntax 0.8.4",
@@ -4360,7 +3608,6 @@ dependencies = [
  "log",
  "ndk-sys 0.5.0+25.2.9519653",
  "num_enum",
- "raw-window-handle",
  "thiserror",
 ]
 
@@ -4570,50 +3817,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
  "malloc_buf",
- "objc_exception",
 ]
 
-[[package]]
-name = "objc-sys"
-version = "0.2.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
-
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
 
-[[package]]
-name = "objc2"
-version = "0.3.0-beta.3.patch-leaks.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
-dependencies = [
- "block2 0.2.0-alpha.6",
- "objc-sys 0.2.0-beta.2",
- "objc2-encode 2.0.0-pre.2",
-]
-
-[[package]]
-name = "objc2"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
-dependencies = [
- "objc-sys 0.3.5",
- "objc2-encode 3.0.0",
-]
-
 [[package]]
 name = "objc2"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
 dependencies = [
- "objc-sys 0.3.5",
- "objc2-encode 4.0.3",
+ "objc-sys",
+ "objc2-encode",
 ]
 
 [[package]]
@@ -4623,9 +3842,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
  "bitflags 2.6.0",
- "block2 0.5.1",
+ "block2",
  "libc",
- "objc2 0.5.2",
+ "objc2",
  "objc2-core-data",
  "objc2-core-image",
  "objc2-foundation",
@@ -4639,8 +3858,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
  "bitflags 2.6.0",
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-core-location",
  "objc2-foundation",
 ]
@@ -4651,8 +3870,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -4663,8 +3882,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
  "bitflags 2.6.0",
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -4674,8 +3893,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
 dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-foundation",
  "objc2-metal",
 ]
@@ -4686,27 +3905,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
 dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-contacts",
  "objc2-foundation",
 ]
 
-[[package]]
-name = "objc2-encode"
-version = "2.0.0-pre.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
-dependencies = [
- "objc-sys 0.2.0-beta.2",
-]
-
-[[package]]
-name = "objc2-encode"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
-
 [[package]]
 name = "objc2-encode"
 version = "4.0.3"
@@ -4720,10 +3924,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
  "bitflags 2.6.0",
- "block2 0.5.1",
+ "block2",
  "dispatch",
  "libc",
- "objc2 0.5.2",
+ "objc2",
 ]
 
 [[package]]
@@ -4732,8 +3936,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
 dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-app-kit",
  "objc2-foundation",
 ]
@@ -4745,8 +3949,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
  "bitflags 2.6.0",
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -4757,8 +3961,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
  "bitflags 2.6.0",
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-foundation",
  "objc2-metal",
 ]
@@ -4769,7 +3973,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
 dependencies = [
- "objc2 0.5.2",
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -4780,8 +3984,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
  "bitflags 2.6.0",
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-cloud-kit",
  "objc2-core-data",
  "objc2-core-image",
@@ -4800,8 +4004,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
 dependencies = [
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-foundation",
 ]
 
@@ -4812,21 +4016,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
  "bitflags 2.6.0",
- "block2 0.5.1",
- "objc2 0.5.2",
+ "block2",
+ "objc2",
  "objc2-core-location",
  "objc2-foundation",
 ]
 
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "object"
 version = "0.36.1"
@@ -5313,15 +4508,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb"
 
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -5721,9 +4907,6 @@ name = "smallvec"
 version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -6187,17 +5370,6 @@ dependencies = [
  "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"
@@ -6224,7 +5396,7 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log 0.2.0",
+ "tracing-log",
 ]
 
 [[package]]
@@ -6637,16 +5809,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "web-time"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "web-time"
 version = "1.1.0"
@@ -6663,13 +5825,13 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e"
 dependencies = [
- "block2 0.5.1",
+ "block2",
  "core-foundation",
  "home",
  "jni",
  "log",
  "ndk-context",
- "objc2 0.5.2",
+ "objc2",
  "objc2-foundation",
  "url",
  "web-sys",
@@ -6690,31 +5852,6 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
-[[package]]
-name = "wgpu"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01"
-dependencies = [
- "arrayvec",
- "cfg-if",
- "cfg_aliases 0.1.1",
- "js-sys",
- "log",
- "naga 0.19.2",
- "parking_lot",
- "profiling",
- "raw-window-handle",
- "smallvec",
- "static_assertions",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core 0.19.4",
- "wgpu-hal 0.19.4",
- "wgpu-types 0.19.2",
-]
-
 [[package]]
 name = "wgpu"
 version = "0.20.1"
@@ -6727,7 +5864,7 @@ dependencies = [
  "document-features",
  "js-sys",
  "log",
- "naga 0.20.0",
+ "naga",
  "parking_lot",
  "profiling",
  "raw-window-handle",
@@ -6736,35 +5873,9 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "wgpu-core 0.21.1",
- "wgpu-hal 0.21.1",
- "wgpu-types 0.20.0",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a"
-dependencies = [
- "arrayvec",
- "bit-vec",
- "bitflags 2.6.0",
- "cfg_aliases 0.1.1",
- "codespan-reporting",
- "indexmap",
- "log",
- "naga 0.19.2",
- "once_cell",
- "parking_lot",
- "profiling",
- "raw-window-handle",
- "rustc-hash",
- "smallvec",
- "thiserror",
- "web-sys",
- "wgpu-hal 0.19.4",
- "wgpu-types 0.19.2",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -6781,62 +5892,17 @@ dependencies = [
  "document-features",
  "indexmap",
  "log",
- "naga 0.20.0",
- "once_cell",
- "parking_lot",
- "profiling",
- "raw-window-handle",
- "rustc-hash",
- "smallvec",
- "thiserror",
- "web-sys",
- "wgpu-hal 0.21.1",
- "wgpu-types 0.20.0",
-]
-
-[[package]]
-name = "wgpu-hal"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3"
-dependencies = [
- "android_system_properties",
- "arrayvec",
- "ash",
- "bit-set",
- "bitflags 2.6.0",
- "block",
- "cfg_aliases 0.1.1",
- "core-graphics-types",
- "d3d12 0.19.0",
- "glow",
- "glutin_wgl_sys",
- "gpu-alloc",
- "gpu-allocator",
- "gpu-descriptor 0.2.4",
- "hassle-rs",
- "js-sys",
- "khronos-egl",
- "libc",
- "libloading 0.8.4",
- "log",
- "metal 0.27.0",
- "naga 0.19.2",
- "ndk-sys 0.5.0+25.2.9519653",
- "objc",
+ "naga",
  "once_cell",
  "parking_lot",
  "profiling",
- "range-alloc",
  "raw-window-handle",
- "renderdoc-sys",
  "rustc-hash",
  "smallvec",
  "thiserror",
- "wasm-bindgen",
  "web-sys",
- "wgpu-types 0.19.2",
- "winapi",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
@@ -6853,20 +5919,20 @@ dependencies = [
  "block",
  "cfg_aliases 0.1.1",
  "core-graphics-types",
- "d3d12 0.20.0",
+ "d3d12",
  "glow",
  "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
- "gpu-descriptor 0.3.0",
+ "gpu-descriptor",
  "hassle-rs",
  "js-sys",
  "khronos-egl",
  "libc",
  "libloading 0.8.4",
  "log",
- "metal 0.28.0",
- "naga 0.20.0",
+ "metal",
+ "naga",
  "ndk-sys 0.5.0+25.2.9519653",
  "objc",
  "once_cell",
@@ -6880,21 +5946,10 @@ dependencies = [
  "thiserror",
  "wasm-bindgen",
  "web-sys",
- "wgpu-types 0.20.0",
+ "wgpu-types",
  "winapi",
 ]
 
-[[package]]
-name = "wgpu-types"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805"
-dependencies = [
- "bitflags 2.6.0",
- "js-sys",
- "web-sys",
-]
-
 [[package]]
 name = "wgpu-types"
 version = "0.20.0"
@@ -6953,17 +6008,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-dependencies = [
- "windows-implement 0.48.0",
- "windows-interface 0.48.0",
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows"
 version = "0.52.0"
@@ -7028,17 +6072,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-implement"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "windows-implement"
 version = "0.53.0"
@@ -7061,17 +6094,6 @@ dependencies = [
  "syn 2.0.70",
 ]
 
-[[package]]
-name = "windows-interface"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "windows-interface"
 version = "0.53.0"
@@ -7327,42 +6349,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winit"
-version = "0.29.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca"
-dependencies = [
- "android-activity 0.5.2",
- "atomic-waker",
- "bitflags 2.6.0",
- "calloop",
- "cfg_aliases 0.1.1",
- "core-foundation",
- "core-graphics",
- "cursor-icon",
- "icrate",
- "js-sys",
- "libc",
- "log",
- "ndk 0.8.0",
- "ndk-sys 0.5.0+25.2.9519653",
- "objc2 0.4.1",
- "once_cell",
- "orbclient",
- "raw-window-handle",
- "redox_syscall 0.3.5",
- "rustix",
- "smol_str",
- "unicode-segmentation",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "web-time 0.2.4",
- "windows-sys 0.48.0",
- "xkbcommon-dl",
-]
-
 [[package]]
 name = "winit"
 version = "0.30.3"
@@ -7370,10 +6356,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004"
 dependencies = [
  "ahash",
- "android-activity 0.6.0",
+ "android-activity",
  "atomic-waker",
  "bitflags 2.6.0",
- "block2 0.5.1",
+ "block2",
  "bytemuck",
  "calloop",
  "cfg_aliases 0.2.1",
@@ -7386,7 +6372,7 @@ dependencies = [
  "libc",
  "memmap2",
  "ndk 0.9.0",
- "objc2 0.5.2",
+ "objc2",
  "objc2-app-kit",
  "objc2-foundation",
  "objc2-ui-kit",
@@ -7408,7 +6394,7 @@ dependencies = [
  "wayland-protocols",
  "wayland-protocols-plasma",
  "web-sys",
- "web-time 1.1.0",
+ "web-time",
  "windows-sys 0.52.0",
  "x11-dl",
  "x11rb",
@@ -7439,7 +6425,7 @@ version = "0.1.0"
 dependencies = [
  "ahash",
  "bevy",
- "bevy_winit 0.14.0",
+ "bevy_winit",
  "bytemuck",
  "crossbeam-utils",
  "derive_more",
@@ -7458,7 +6444,7 @@ dependencies = [
  "syn 1.0.109",
  "syn 2.0.70",
  "uuid",
- "winit 0.30.3",
+ "winit",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 24207444..283d5a68 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -65,15 +65,15 @@ bevy-inspector-egui = { version = "0.25", features = [
     "highlight_changes",
 ] }
 bevy_mod_billboard = { git = "https://github.com/rewin123/bevy_mod_billboard.git", branch = "bevy-0.14" }
-bevy_mod_picking = { version = "0.18.2", default-features = false, features = ["backend_raycast",  "selection",] }
+bevy_mod_picking = { version = "0.20.1", default-features = false, features = ["backend_raycast",  "selection",] }
 bevy_panorbit_camera = { version = "0.19", default-features = false }
 bevy-scene-hook = {git = "https://github.com/stargazing-dino/bevy-scene-hook.git", branch= "update-14.0"}
 convert_case = "0.6"
-egui_dock = "0.11"
-egui_extras = { version = "0.26", features = ["all_loaders"] }
-egui_file = "0.15"
+egui_dock = "0.13"
+egui_extras = { version = "0.28.1", features = ["all_loaders"] }
+egui_file = "0.18"
 egui-gizmo = "0.16.1"
-egui-toast = "0.12.1"
+egui-toast = "0.14.0"
 image = {version = "0.25.1", feature = ["png"] }
 pretty-type-name = "1"
 rand = "*"
diff --git a/crates/editor_core/src/gltf_unpack.rs b/crates/editor_core/src/gltf_unpack.rs
index 79ace9ad..83e40efe 100644
--- a/crates/editor_core/src/gltf_unpack.rs
+++ b/crates/editor_core/src/gltf_unpack.rs
@@ -1,6 +1,6 @@
 use bevy::{
     asset::{AssetPath, LoadState},
-    ecs::system::CommandQueue,
+    ecs::world::CommandQueue,
     gltf::{Gltf, GltfMesh, GltfNode},
     prelude::*,
     utils::HashMap,
diff --git a/crates/editor_core/src/hotkeys.rs b/crates/editor_core/src/hotkeys.rs
index 822383ed..0141fd72 100644
--- a/crates/editor_core/src/hotkeys.rs
+++ b/crates/editor_core/src/hotkeys.rs
@@ -107,16 +107,16 @@ pub trait HotkeyAppExt {
 
 impl HotkeyAppExt for App {
     fn editor_hotkey<T: Hotkey>(&mut self, key: T, binding: Vec<KeyCode>) -> &mut Self {
-        if !self.world.contains_resource::<AllHotkeys>() {
+        if !self.world().contains_resource::<AllHotkeys>() {
             self.insert_resource(AllHotkeys::default());
         }
 
-        if !self.world.contains_resource::<HotkeySet<T>>() {
+        if !self.world().contains_resource::<HotkeySet<T>>() {
             self.insert_resource(HotkeySet::<T>::default());
             self.init_resource::<ButtonInput<T>>();
             #[cfg(feature = "persistence_editor")]
             {
-                if self.world.contains_resource::<PersistenceRegistry>() {
+                if self.world().contains_resource::<PersistenceRegistry>() {
                     self.persistence_resource_with_fn::<HotkeySet<T>>(Box::new(
                         |dst: &mut HotkeySet<T>, src: HotkeySet<T>| {
                             dst.bindings.extend(src.bindings);
@@ -129,7 +129,7 @@ impl HotkeyAppExt for App {
             self.register_type::<HotkeySet<T>>();
             self.register_type::<HashMap<T, Vec<KeyCode>>>();
             self.register_type::<T>();
-            self.world
+            self.world_mut()
                 // Safe, was injected in this function
                 .resource_mut::<AllHotkeys>()
                 .mappers
@@ -141,7 +141,7 @@ impl HotkeyAppExt for App {
                     });
                 }));
 
-            self.world
+            self.world_mut()
                 // Safe, was injected in this function
                 .resource_mut::<AllHotkeys>()
                 .global_mapper
@@ -152,7 +152,7 @@ impl HotkeyAppExt for App {
                 }))
         }
 
-        let Some(mut set) = self.world.get_resource_mut::<HotkeySet<T>>() else {
+        let Some(mut set) = self.world_mut().get_resource_mut::<HotkeySet<T>>() else {
             return self;
         };
         set.bindings.insert(key, binding);
@@ -213,14 +213,14 @@ mod tests {
 
         app.update();
         {
-            let mut input = app.world.resource_mut::<ButtonInput<KeyCode>>();
+            let mut input = app.world_mut().resource_mut::<ButtonInput<KeyCode>>();
             input.press(KeyCode::KeyA);
             assert!(input.pressed(KeyCode::KeyA));
         }
         app.update();
 
         {
-            let input = app.world.resource::<ButtonInput<TestKey>>();
+            let input = app.world().resource::<ButtonInput<TestKey>>();
             assert_eq!(input.pressed(TestKey::A), true);
         }
     }
diff --git a/crates/editor_core/src/selected.rs b/crates/editor_core/src/selected.rs
index 0ab8ab51..a07befe4 100644
--- a/crates/editor_core/src/selected.rs
+++ b/crates/editor_core/src/selected.rs
@@ -73,7 +73,7 @@ fn selected_entity_wireframe_update(
         cmds.entity(e).insert(OutlineBundle {
             outline: OutlineVolume {
                 visible: true,
-                colour: Color::YELLOW,
+                colour: Color::srgb(1.0, 1.0, 0.0),
                 width: 2.0,
             },
             mode: bevy_mod_outline::OutlineMode::RealVertex,
diff --git a/crates/editor_core/src/task_storage.rs b/crates/editor_core/src/task_storage.rs
index e20ebe8b..1d653af4 100644
--- a/crates/editor_core/src/task_storage.rs
+++ b/crates/editor_core/src/task_storage.rs
@@ -29,8 +29,8 @@ fn update_storage(mut storage: ResMut<BackgroundTaskStorage>, assets: Res<AssetS
                 let load_state = assets.get_load_state(handle.id());
                 if load_state == Some(LoadState::Loaded)
                     || load_state.is_none()
-                    || load_state == Some(LoadState::Failed)
-                {
+                    || matches!(load_state, Some(LoadState::Failed(_)))
+                    {
                     need_remove_task = true;
                 }
             }
@@ -64,9 +64,9 @@ mod tests {
             ))
             .add_systems(Update, update_storage);
 
-        assert_eq!(app.world.resource::<BackgroundTaskStorage>().tasks.len(), 1);
+        assert_eq!(app.world().resource::<BackgroundTaskStorage>().tasks.len(), 1);
         app.update();
 
-        assert_eq!(app.world.resource::<BackgroundTaskStorage>().tasks.len(), 0);
+        assert_eq!(app.world().resource::<BackgroundTaskStorage>().tasks.len(), 0);
     }
 }
diff --git a/crates/editor_core/src/toast.rs b/crates/editor_core/src/toast.rs
index 920f8cfd..16ea4299 100644
--- a/crates/editor_core/src/toast.rs
+++ b/crates/editor_core/src/toast.rs
@@ -148,26 +148,26 @@ mod tests {
 
         app.update();
         assert!(!app
-            .world
+            .world()
             .get_resource::<ToastStorage>()
             .unwrap()
             .has_toasts());
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Error));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Error));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Error));
         app.update();
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Warning));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Warning));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Warning));
         app.update();
 
-        let storage: &ToastStorage = app.world.get_resource::<ToastStorage>().unwrap();
+        let storage: &ToastStorage = app.world().get_resource::<ToastStorage>().unwrap();
         assert_eq!(storage.toasts_per_kind.error.len(), 3);
         assert_eq!(storage.toasts_per_kind.warning.len(), 3);
         assert!(storage.has_toasts());
@@ -180,30 +180,30 @@ mod tests {
 
         app.update();
         assert!(!app
-            .world
+            .world()
             .get_resource::<ToastStorage>()
             .unwrap()
             .has_toasts());
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Error));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Error));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Error));
         app.update();
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Warning));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Warning));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Warning));
         app.update();
 
-        app.world.send_event(ClearToastMessage::error(1));
-        app.world.send_event(ClearToastMessage::warn(1));
+        app.world_mut().send_event(ClearToastMessage::error(1));
+        app.world_mut().send_event(ClearToastMessage::warn(1));
         app.update();
 
-        let storage: &ToastStorage = app.world.get_resource::<ToastStorage>().unwrap();
+        let storage: &ToastStorage = app.world().get_resource::<ToastStorage>().unwrap();
         assert_eq!(storage.toasts_per_kind.error.len(), 2);
         assert_eq!(storage.toasts_per_kind.warning.len(), 2);
     }
@@ -215,29 +215,29 @@ mod tests {
 
         app.update();
         assert!(!app
-            .world
+            .world()
             .get_resource::<ToastStorage>()
             .unwrap()
             .has_toasts());
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Error));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Error));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Error));
         app.update();
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Warning));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Warning));
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Warning));
         app.update();
 
-        app.world.send_event(ClearToastMessage::all());
+        app.world_mut().send_event(ClearToastMessage::all());
         app.update();
 
-        let storage: &ToastStorage = app.world.get_resource::<ToastStorage>().unwrap();
+        let storage: &ToastStorage = app.world().get_resource::<ToastStorage>().unwrap();
         assert!(!storage.has_toasts());
     }
 
@@ -248,15 +248,15 @@ mod tests {
 
         app.update();
         assert!(!app
-            .world
+            .world()
             .get_resource::<ToastStorage>()
             .unwrap()
             .has_toasts());
-        app.world
+        app.world_mut()
             .send_event(ToastMessage::new("Test message", ToastKind::Info));
         app.update();
 
-        let storage: &ToastStorage = app.world.get_resource::<ToastStorage>().unwrap();
+        let storage: &ToastStorage = app.world().get_resource::<ToastStorage>().unwrap();
         assert!(!storage.has_toasts());
     }
 }
diff --git a/crates/editor_tabs/src/lib.rs b/crates/editor_tabs/src/lib.rs
index e5bdf671..02e8d911 100644
--- a/crates/editor_tabs/src/lib.rs
+++ b/crates/editor_tabs/src/lib.rs
@@ -8,7 +8,7 @@ pub mod tab_viewer;
 
 use std::fmt::Display;
 
-use bevy::{ecs::system::CommandQueue, prelude::*, utils::HashMap, window::PrimaryWindow};
+use bevy::{ecs::world::CommandQueue, prelude::*, utils::HashMap, window::PrimaryWindow};
 
 use bevy_egui::{egui, EguiContext};
 
@@ -231,7 +231,7 @@ impl EditorUiAppExt for App {
             }),
         };
 
-        if let Some(mut editor) = self.world.get_resource_mut::<EditorUi>() {
+        if let Some(mut editor) = self.world_mut().get_resource_mut::<EditorUi>() {
             editor.registry.insert(tab_name, reg);
         };
         self
@@ -252,11 +252,11 @@ impl EditorUiAppExt for App {
         tab.schedule.add_systems(tab_systems);
 
         // Not much we can do here
-        self.world
+        self.world_mut()
             .resource_mut::<ScheduleEditorTabStorage>()
             .0
             .insert(tab_name_holder.clone(), tab);
-        if let Some(mut editor) = self.world.get_resource_mut::<EditorUi>() {
+        if let Some(mut editor) = self.world_mut().get_resource_mut::<EditorUi>() {
             editor
                 .registry
                 .insert(tab_name_holder, EditorUiReg::Schedule);
diff --git a/crates/editor_tabs/src/schedule_editor_tab.rs b/crates/editor_tabs/src/schedule_editor_tab.rs
index 0cc6da5a..ddbb8b4e 100644
--- a/crates/editor_tabs/src/schedule_editor_tab.rs
+++ b/crates/editor_tabs/src/schedule_editor_tab.rs
@@ -13,7 +13,7 @@ pub struct ScheduleEditorTab {
 
 impl EditorTab for ScheduleEditorTab {
     fn ui(&mut self, ui: &mut egui::Ui, _: &mut Commands, world: &mut World) {
-        let inner_ui = ui.child_ui(ui.max_rect(), *ui.layout());
+        let inner_ui = ui.child_ui(ui.max_rect(), *ui.layout(), None);
         world.insert_non_send_resource(EditorUiRef(inner_ui));
 
         self.schedule.run(world);
diff --git a/crates/editor_tabs/src/start_layout.rs b/crates/editor_tabs/src/start_layout.rs
index a26b23d9..645d85e4 100644
--- a/crates/editor_tabs/src/start_layout.rs
+++ b/crates/editor_tabs/src/start_layout.rs
@@ -86,7 +86,7 @@ impl GroupLayoutExt for App {
         group: G,
         tab: N,
     ) -> &mut Self {
-        if let Some(mut layout) = self.world.get_resource_mut::<R>() {
+        if let Some(mut layout) = self.world_mut().get_resource_mut::<R>() {
             layout.push(group, tab)
         }
         self
@@ -97,7 +97,7 @@ impl GroupLayoutExt for App {
         group: G,
         tab: N,
     ) -> &mut Self {
-        if let Some(mut layout) = self.world.get_resource_mut::<R>() {
+        if let Some(mut layout) = self.world_mut().get_resource_mut::<R>() {
             layout.push_front(group, tab)
         }
         self
diff --git a/crates/editor_ui/src/camera_plugin.rs b/crates/editor_ui/src/camera_plugin.rs
index a6b9326b..95991935 100644
--- a/crates/editor_ui/src/camera_plugin.rs
+++ b/crates/editor_ui/src/camera_plugin.rs
@@ -152,9 +152,12 @@ pub fn draw_camera_gizmo(
     >,
 ) {
     for (transform, _projection) in cameras.iter() {
+        
+        let pink = Color::srgb(1.0, 0.41, 0.71);
+        
         let transform = transform.compute_transform();
         let cuboid_transform = transform.with_scale(Vec3::new(1.0, 1.0, 2.0));
-        gizmos.cuboid(cuboid_transform, Color::PINK);
+        gizmos.cuboid(cuboid_transform, pink);
 
         let scale = 1.5;
 
@@ -164,26 +167,26 @@ pub fn draw_camera_gizmo(
                 + transform.forward() * scale
                 + transform.up() * scale
                 + transform.right() * scale,
-            Color::PINK,
+            pink,
         );
         gizmos.line(
             transform.translation,
             transform.translation + transform.forward() * scale - transform.up() * scale
                 + transform.right() * scale,
-            Color::PINK,
+            pink,
         );
         gizmos.line(
             transform.translation,
             transform.translation + transform.forward() * scale + transform.up() * scale
                 - transform.right() * scale,
-            Color::PINK,
+            pink,
         );
         gizmos.line(
             transform.translation,
             transform.translation + transform.forward() * scale
                 - transform.up() * scale
                 - transform.right() * scale,
-            Color::PINK,
+            pink,
         );
 
         let rect_transform = Transform::from_xyz(0.0, 0.0, -scale);
@@ -193,7 +196,7 @@ pub fn draw_camera_gizmo(
             rect_transform.translation,
             rect_transform.rotation,
             Vec2::splat(scale * 2.0),
-            Color::PINK,
+            pink,
         );
     }
 }
diff --git a/crates/editor_ui/src/inspector/components_order.rs b/crates/editor_ui/src/inspector/components_order.rs
index 0f214963..22faf55b 100644
--- a/crates/editor_ui/src/inspector/components_order.rs
+++ b/crates/editor_ui/src/inspector/components_order.rs
@@ -20,10 +20,10 @@ impl ComponentsPriority for App {
         &mut self,
         priority: u8,
     ) -> &mut Self {
-        if !self.world.contains_resource::<ComponentsOrder>() {
+        if !self.world().contains_resource::<ComponentsOrder>() {
             self.insert_resource(ComponentsOrder::default());
         }
-        if let Some(mut order) = self.world.get_resource_mut::<ComponentsOrder>() {
+        if let Some(mut order) = self.world_mut().get_resource_mut::<ComponentsOrder>() {
             let component_name = pretty_type_name::pretty_type_name::<T>();
             order.components.insert(component_name, priority);
         } else {
@@ -47,7 +47,7 @@ mod test {
             .editor_component_priority::<Name>(0)
             .editor_component_priority::<Transform>(1);
 
-        let order = app.world.resource::<ComponentsOrder>();
+        let order = app.world().resource::<ComponentsOrder>();
 
         assert_eq!(order.components.get("Name"), Some(&0));
         assert_eq!(order.components.get("Transform"), Some(&1));
diff --git a/crates/editor_ui/src/inspector/mod.rs b/crates/editor_ui/src/inspector/mod.rs
index f32b0e14..e8effd16 100644
--- a/crates/editor_ui/src/inspector/mod.rs
+++ b/crates/editor_ui/src/inspector/mod.rs
@@ -7,7 +7,7 @@ pub mod runtime_assets;
 use std::any::TypeId;
 
 use bevy::{
-    ecs::{change_detection::MutUntyped, system::CommandQueue},
+    ecs::{change_detection::MutUntyped, world::CommandQueue},
     prelude::*,
     ptr::PtrMut,
     reflect::ReflectFromPtr,
diff --git a/crates/editor_ui/src/lib.rs b/crates/editor_ui/src/lib.rs
index f4eb4c6c..1e176438 100644
--- a/crates/editor_ui/src/lib.rs
+++ b/crates/editor_ui/src/lib.rs
@@ -242,7 +242,7 @@ impl Plugin for EditorGizmoConfigPlugin {
 
 fn editor_gizmos(mut gizmos_config: ResMut<GizmoConfigStore>) {
     gizmos_config.config_mut::<EditorGizmo>().0.render_layers =
-        RenderLayers::layer(LAST_RENDER_LAYER)
+        RenderLayers::layer(LAST_RENDER_LAYER.into())
 }
 
 fn game_gizmos(mut gizmos_config: ResMut<GizmoConfigStore>) {
@@ -334,17 +334,20 @@ pub fn simple_editor_setup(mut commands: Commands) {
     ));
 
     // grid
-    let grid_render_layer = RenderLayers::layer(LAST_RENDER_LAYER);
+    let grid_render_layer = RenderLayers::layer(LAST_RENDER_LAYER.into());
+    let silver = Color::srgb(0.75, 0.75, 0.75);
+    let grey = Color::srgb(0.5, 0.5, 0.5);
+
     commands.spawn((
         Grid {
             spacing: 10.0_f32,
             count: 16,
-            color: Color::SILVER.with_a(DEFAULT_GRID_ALPHA),
+            color: silver.with_alpha(DEFAULT_GRID_ALPHA),
             alpha_mode: AlphaMode::Blend,
         },
         SubGrid {
             count: 9,
-            color: Color::GRAY.with_a(DEFAULT_GRID_ALPHA),
+            color: grey.with_alpha(DEFAULT_GRID_ALPHA),
         },
         // Darker grid to make it easier to see entity gizmos when Transform (0, 0, 0)
         GridAxis {
diff --git a/crates/editor_ui/src/meshless_visualizer.rs b/crates/editor_ui/src/meshless_visualizer.rs
index c7e575c9..0dde4715 100644
--- a/crates/editor_ui/src/meshless_visualizer.rs
+++ b/crates/editor_ui/src/meshless_visualizer.rs
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use bevy::{
-    math::primitives as math_shapes, prelude::*, render::view::RenderLayers, utils::HashMap,
+    math::{primitives as math_shapes, Direction3d}, prelude::*, render::view::RenderLayers, utils::HashMap,
 };
 use bevy_asset_loader::{
     asset_collection::AssetCollection,
@@ -171,8 +171,7 @@ impl DynamicAsset for EditorIconAssetType {
         &self,
         world: &mut World,
     ) -> Result<bevy_asset_loader::dynamic_asset::DynamicAssetType, anyhow::Error> {
-        let cell = world.cell();
-        let asset_server = cell
+        let asset_server = world
             .get_resource::<AssetServer>()
             .ok_or_else(|| anyhow!("Failed to get the AssetServer"))?;
         match self {
@@ -181,7 +180,7 @@ impl DynamicAsset for EditorIconAssetType {
                 Ok(DynamicAssetType::Single(handle.untyped()))
             }
             Self::Quad { size } => {
-                let mut meshes = cell
+                let mut meshes = world
                     .get_resource_mut::<Assets<Mesh>>()
                     .ok_or_else(|| anyhow!("Failed to get Mesh Assets"))?;
                 let handle = meshes
@@ -192,7 +191,7 @@ impl DynamicAsset for EditorIconAssetType {
                 Ok(DynamicAssetType::Single(handle))
             }
             Self::Sphere { radius } => {
-                let mut meshes = cell
+                let mut meshes = world
                     .get_resource_mut::<Assets<Mesh>>()
                     .ok_or_else(|| anyhow!("Failed to get Mesh Assets"))?;
                 let handle = meshes
@@ -249,7 +248,7 @@ pub fn visualize_meshless(
                         texture: BillboardTextureHandle(image.clone()),
                         ..default()
                     },
-                    RenderLayers::layer(LAST_RENDER_LAYER),
+                    RenderLayers::layer(LAST_RENDER_LAYER.into()),
                     Name::from("Billboard Texture"),
                 ))
                 .with_children(|adult| {
@@ -280,7 +279,7 @@ pub fn visualize_meshless(
                         texture: BillboardTextureHandle(editor_icons.camera.clone()),
                         ..default()
                     },
-                    RenderLayers::layer(LAST_RENDER_LAYER),
+                    RenderLayers::layer(LAST_RENDER_LAYER.into()),
                     Name::from("Billboard Texture"),
                 ))
                 .with_children(|adult| {
@@ -333,7 +332,7 @@ pub fn visualize_custom_meshless(
                                 ..default()
                             },
                             Name::from("Billboard Texture"),
-                            RenderLayers::layer(LAST_RENDER_LAYER),
+                            RenderLayers::layer(LAST_RENDER_LAYER.into()),
                         ))
                         .with_children(|adult| {
                             adult.spawn((
@@ -361,7 +360,7 @@ pub fn visualize_custom_meshless(
                             ..default()
                         },
                         SelectParent { parent: entity },
-                        RenderLayers::layer(LAST_RENDER_LAYER),
+                        RenderLayers::layer(LAST_RENDER_LAYER.into()),
                         Name::from("Meshless Object"),
                     ))
                     .id(),
@@ -412,7 +411,7 @@ pub fn draw_light_gizmo(
                     gizmos.ray(
                         transform.translation,
                         dir * 3.5,
-                        directional.color.with_a(1.0),
+                        directional.color.with_alpha(1.0),
                     );
                     let dirs = vec![
                         (transform.up().normalize(), transform.down().normalize()),
@@ -425,13 +424,13 @@ pub fn draw_light_gizmo(
                         gizmos.ray(
                             transform.translation + dir * 3.5,
                             a,
-                            directional.color.with_a(1.0),
+                            directional.color.with_alpha(1.0),
                         );
                         // angle
                         gizmos.ray(
                             transform.translation + dir * 3.5 + a,
                             dir * 1.5 + b,
-                            directional.color.with_a(1.0),
+                            directional.color.with_alpha(1.0),
                         );
                     }
                 }
@@ -440,7 +439,7 @@ pub fn draw_light_gizmo(
                     let range = transform.forward().normalize() * spot.range;
 
                     // center of the light direction
-                    gizmos.ray(transform.translation, range, spot.color.with_a(1.0));
+                    gizmos.ray(transform.translation, range, spot.color.with_alpha(1.0));
 
                     let outer_rad = range.length() * spot.outer_angle.tan();
                     let inner_rad = range.length() * spot.inner_angle.tan();
@@ -450,13 +449,13 @@ pub fn draw_light_gizmo(
                         transform.translation + range,
                         Direction3d::new_unchecked(transform.back().normalize()),
                         outer_rad,
-                        spot.color.with_a(1.0),
+                        spot.color.with_alpha(1.0),
                     );
                     gizmos.circle(
                         transform.translation + range,
                         Direction3d::new_unchecked(transform.back().normalize()),
                         inner_rad,
-                        spot.color.with_a(1.0),
+                        spot.color.with_alpha(1.0),
                     );
 
                     // amount of lines to draw around the "cone" that the light creates
@@ -478,8 +477,8 @@ pub fn draw_light_gizmo(
                                 * (transform.right().normalize() * angle_inner.cos()
                                     + transform.up().normalize() * angle_inner.sin());
 
-                        gizmos.line(transform.translation, outer_point, spot.color.with_a(1.0));
-                        gizmos.line(transform.translation, inner_point, spot.color.with_a(1.0));
+                        gizmos.line(transform.translation, outer_point, spot.color.with_alpha(1.0));
+                        gizmos.line(transform.translation, inner_point, spot.color.with_alpha(1.0));
                     }
                 }
                 (_, _, Some(point)) => {
@@ -487,7 +486,7 @@ pub fn draw_light_gizmo(
                         transform.translation,
                         Quat::IDENTITY,
                         point.range,
-                        point.color.with_a(1.0),
+                        point.color.with_alpha(1.0),
                     );
                 }
                 _ => unreachable!(),
@@ -513,7 +512,7 @@ mod tests {
         app.add_systems(PreUpdate, register_assets);
         app.update();
 
-        let icons = app.world.get_resource::<EditorIconAssets>();
+        let icons = app.world().get_resource::<EditorIconAssets>();
 
         assert!(icons.is_some());
     }
@@ -530,8 +529,8 @@ mod tests {
         app.add_systems(Update, clean_meshless);
         app.update();
 
-        let mut query = app.world.query::<Entity>();
+        let mut query = app.world_mut().query::<Entity>();
 
-        assert_eq!(query.iter(&app.world).count(), 2);
+        assert_eq!(query.iter(&app.world()).count(), 2);
     }
 }
diff --git a/crates/editor_ui/src/selection.rs b/crates/editor_ui/src/selection.rs
index e541c95f..9f2c1630 100644
--- a/crates/editor_ui/src/selection.rs
+++ b/crates/editor_ui/src/selection.rs
@@ -9,7 +9,7 @@ impl Plugin for EditorPickingPlugin {
         app.add_plugins(bevy_mod_picking::DefaultPickingPlugins);
 
         if let Some(mut raycast_backend) =
-            app.world
+            app.world_mut()
                 .get_resource_mut::<bevy_mod_picking::backends::raycast::RaycastBackendSettings>()
         {
             raycast_backend.require_markers = true;
diff --git a/crates/editor_ui/src/settings.rs b/crates/editor_ui/src/settings.rs
index 24a8925e..5644c56c 100644
--- a/crates/editor_ui/src/settings.rs
+++ b/crates/editor_ui/src/settings.rs
@@ -135,7 +135,7 @@ impl RegisterSettingsBlockExt for App {
         name: &str,
         block: impl FnMut(&mut egui::Ui, &mut Commands, &mut World) + Send + Sync + 'static,
     ) {
-        self.world
+        self.world_mut()
             .get_resource_mut::<SettingsWindow>()
             .map(|mut settings| {
                 settings
diff --git a/crates/editor_ui/src/tool.rs b/crates/editor_ui/src/tool.rs
index 84691258..2c6d3451 100644
--- a/crates/editor_ui/src/tool.rs
+++ b/crates/editor_ui/src/tool.rs
@@ -38,7 +38,7 @@ impl ToolExt for App {
     where
         T: EditorTool + Send + Sync + 'static,
     {
-        if let Some(mut game_view) = self.world.get_resource_mut::<GameViewTab>() {
+        if let Some(mut game_view) = self.world_mut().get_resource_mut::<GameViewTab>() {
             game_view.tools.push(Box::new(tool));
         } else {
             error!("Game View tab not loaded");
diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs
index 2ced3551..3215f29b 100644
--- a/crates/editor_ui/src/tools/gizmo.rs
+++ b/crates/editor_ui/src/tools/gizmo.rs
@@ -4,6 +4,8 @@ use egui_gizmo::GizmoMode;
 use space_editor_core::prelude::*;
 use space_shared::*;
 
+
+
 use crate::EditorGizmo;
 use crate::{colors::*, sizing::Sizing};
 use crate::{
@@ -20,7 +22,7 @@ impl Plugin for GizmoToolPlugin {
     fn build(&self, app: &mut App) {
         app.editor_tool(GizmoTool::default());
 
-        if let Some(mut game_view_tab) = app.world.get_resource_mut::<GameViewTab>() {
+        if let Some(mut game_view_tab) = app.world_mut().get_resource_mut::<GameViewTab>() {
             game_view_tab.active_tool = Some(0);
         }
         app.init_resource::<MultipleCenter>();
@@ -222,7 +224,7 @@ impl EditorTool for GizmoTool {
             let mut gizmo_interacted = false;
 
             if let Some(result) = egui_gizmo::Gizmo::new("Selected gizmo mean global".to_string())
-                .projection_matrix(cam_proj.get_projection_matrix().to_cols_array_2d().into())
+                .projection_matrix(cam_proj.get_clip_from_view().to_cols_array_2d().into())
                 .view_matrix(view_matrix.to_cols_array_2d().into())
                 .model_matrix(mean_transform.compute_matrix().to_cols_array_2d().into())
                 .mode(self.gizmo_mode)
@@ -294,7 +296,7 @@ impl EditorTool for GizmoTool {
                                     egui_gizmo::Gizmo::new(format!("Selected gizmo {:?}", *e))
                                         .projection_matrix(
                                             cam_proj
-                                                .get_projection_matrix()
+                                                .get_clip_from_view()
                                                 .to_cols_array_2d()
                                                 .into(),
                                         )
@@ -341,7 +343,7 @@ impl EditorTool for GizmoTool {
                     }
                 }
                 if let Some(result) = egui_gizmo::Gizmo::new(format!("Selected gizmo {:?}", *e))
-                    .projection_matrix(cam_proj.get_projection_matrix().to_cols_array_2d().into())
+                    .projection_matrix(cam_proj.get_clip_from_view().to_cols_array_2d().into())
                     .view_matrix(view_matrix.to_cols_array_2d().into())
                     .model_matrix(transform.compute_matrix().to_cols_array_2d().into())
                     .mode(self.gizmo_mode)
diff --git a/crates/editor_ui/src/ui_registration.rs b/crates/editor_ui/src/ui_registration.rs
index 797c675c..dba2e448 100644
--- a/crates/editor_ui/src/ui_registration.rs
+++ b/crates/editor_ui/src/ui_registration.rs
@@ -66,11 +66,11 @@ pub trait EditorUiExt {
 
 impl EditorUiExt for App {
     fn editor_bundle<T: Bundle + Clone>(&mut self, category: &str, name: &str, bundle: T) {
-        let mut reg = if let Some(reg) = self.world.get_resource_mut::<BundleReg>() {
+        let mut reg = if let Some(reg) = self.world_mut().get_resource_mut::<BundleReg>() {
             reg
         } else {
             self.init_resource::<BundleReg>();
-            if let Some(reg) = self.world.get_resource_mut::<BundleReg>() {
+            if let Some(reg) = self.world_mut().get_resource_mut::<BundleReg>() {
                 reg
             } else {
                 return;
@@ -357,7 +357,7 @@ pub fn register_mesh_editor_bundles(app: &mut App) {
         (
             SpriteBundle {
                 sprite: Sprite {
-                    color: Color::BLUE,
+                    color: bevy::prelude::Color::Srgba(bevy::color::palettes::css::BLUE),
                     custom_size: Some(Vec2::new(100.0, 100.0)),
                     ..default()
                 },
diff --git a/crates/prefab/src/component/material.rs b/crates/prefab/src/component/material.rs
index 3336bbf1..4dc90c8c 100644
--- a/crates/prefab/src/component/material.rs
+++ b/crates/prefab/src/component/material.rs
@@ -75,7 +75,7 @@ impl MaterialPrefab {
         StandardMaterial {
             base_color: self.base_color,
             base_color_texture,
-            emissive: self.emissive,
+            emissive: self.emissive.into(),
             emissive_texture,
             perceptual_roughness: self.perceptual_roughness,
             metallic: self.metallic,
@@ -148,7 +148,7 @@ mod tests {
             ImagePlugin::default(),
         ));
 
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world().resource::<AssetServer>();
 
         assert!(try_image(&String::new(), server).is_none());
     }
@@ -163,7 +163,7 @@ mod tests {
         ));
 
         let path = "test_asset.png";
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world().resource::<AssetServer>();
 
         assert!(try_image(&String::from(path), server).is_some());
     }
@@ -178,7 +178,7 @@ mod tests {
         ));
 
         let path = "fake_asset.png";
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world().resource::<AssetServer>();
 
         assert!(try_image(&String::from(path), server).is_none());
     }
@@ -196,7 +196,7 @@ mod tests {
             AssetPlugin::default(),
             ImagePlugin::default(),
         ));
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world().resource::<AssetServer>();
 
         let color = prefab.to_material(server);
 
@@ -217,7 +217,7 @@ mod tests {
             AssetPlugin::default(),
             ImagePlugin::default(),
         ));
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world().resource::<AssetServer>();
 
         let color = prefab.to_material(server);
 
@@ -243,7 +243,7 @@ mod tests {
                 let material = query.single();
                 let material = material.to_material(&server);
                 assert_eq!(material.base_color, Color::rgb(1.0, 1.0, 1.0));
-                assert_eq!(material.emissive, Color::BLACK);
+                assert_eq!(material.emissive, Color::BLACK.into());
                 assert_eq!(material.emissive_texture, None);
                 assert_eq!(material.alpha_mode, AlphaMode::Opaque);
                 assert_eq!(material.perceptual_roughness, 0.5);
diff --git a/crates/prefab/src/component/shape.rs b/crates/prefab/src/component/shape.rs
index c516dfee..335cc645 100644
--- a/crates/prefab/src/component/shape.rs
+++ b/crates/prefab/src/component/shape.rs
@@ -355,6 +355,10 @@ impl Plane3dPrefab {
     pub fn to_mesh(&self) -> Mesh {
         let data = math_shapes::Plane3d {
             normal: self.normal,
+            half_size: Vec2 {
+                x: 0.5,
+                y: 0.5,
+            },
         };
         Mesh::from(data)
     }
@@ -362,6 +366,10 @@ impl Plane3dPrefab {
     pub const fn to_plane3d(&self) -> Plane3d {
         math_shapes::Plane3d {
             normal: self.normal,
+            half_size: Vec2 {
+                x: 0.5,
+                y: 0.5,
+            },
         }
     }
 }
@@ -549,14 +557,26 @@ mod tests {
     #[test]
     fn plane_3d_prefab_to_plane3d() {
         let prefab = Plane3dPrefab::default();
-        let plane3d = math_shapes::Plane3d::new(Vec3::Y);
+        let plane3d = math_shapes::Plane3d {
+            normal: Dir3::try_from(Vec3::Y).unwrap(),
+            half_size: Vec2 {
+                x: 0.5, 
+                y: 0.5,
+            },
+        };
         assert_eq!(prefab.to_plane3d(), plane3d);
     }
 
     #[test]
     fn plane_multipoint_prefab_to_plane3d() {
         let prefab = PlaneMultiPointPrefab::default();
-        let plane3d = math_shapes::Plane3d::new(Vec3::Y);
+        let plane3d = math_shapes::Plane3d {
+            normal: Dir3::try_from(Vec3::Y).unwrap(),
+            half_size: Vec2 {
+                x: 0.5, 
+                y: 0.5,
+            },
+        };
         assert_eq!(prefab.to_plane3d(), plane3d);
     }
 }
diff --git a/crates/prefab/src/component/sprite.rs b/crates/prefab/src/component/sprite.rs
index b086b4a5..e98f9713 100644
--- a/crates/prefab/src/component/sprite.rs
+++ b/crates/prefab/src/component/sprite.rs
@@ -142,11 +142,22 @@ impl TextureAtlasPrefab {
         self.texture = Some(texture_handle);
 
         let texture_layout = TextureAtlasLayout::from_grid(
-            self.tile_size,
-            self.columns,
-            self.rows,
-            self.padding,
-            self.offset,
+            //self.tile_size,
+            UVec2 {
+                x: self.tile_size.x.round() as u32,
+                y: self.tile_size.y.round() as u32,
+            },
+            self.columns as u32,
+            self.rows as u32,
+            Some(UVec2 {
+                x: self.padding.unwrap().x.round() as u32,
+                y: self.padding.unwrap().y.round() as u32,
+            }),
+            //self.offset,
+            Some(UVec2 {
+                x: self.offset.unwrap().x.round() as u32,
+                y: self.offset.unwrap().y.round() as u32,
+            })
         );
         Some(texture_layout_assets.add(texture_layout))
     }
@@ -194,7 +205,7 @@ mod tests {
             AssetPlugin::default(),
             ImagePlugin::default(),
         ));
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world().resource::<AssetServer>();
 
         let sprite = prefab.to_sprite(server);
 
@@ -215,7 +226,7 @@ mod tests {
             AssetPlugin::default(),
             ImagePlugin::default(),
         ));
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world().resource::<AssetServer>();
 
         let sprite = prefab.to_sprite(server);
 
@@ -234,7 +245,7 @@ mod tests {
             AssetPlugin::default(),
             ImagePlugin::default(),
         ));
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world().resource::<AssetServer>();
 
         let sprite = prefab.to_texture(server);
 
@@ -255,7 +266,7 @@ mod tests {
             AssetPlugin::default(),
             ImagePlugin::default(),
         ));
-        let server = app.world.resource::<AssetServer>();
+        let server = app.world().resource::<AssetServer>();
 
         let sprite = prefab.to_texture(server);
 
@@ -300,8 +311,8 @@ mod tests {
         ))
         .init_asset::<TextureAtlasLayout>();
 
-        let asset_server = app.world.resource::<AssetServer>().clone();
-        let mut texture_atlas = app.world.resource_mut::<Assets<TextureAtlasLayout>>();
+        let asset_server = app.world().resource::<AssetServer>().clone();
+        let mut texture_atlas = app.world_mut().resource_mut::<Assets<TextureAtlasLayout>>();
 
         let sprite = prefab.to_texture_atlas(&sprite_prefab, &mut texture_atlas, &asset_server);
 
@@ -335,9 +346,9 @@ mod tests {
             .add_systems(Update, animate_sprite);
 
         app.update();
-        let mut query = app.world.query::<&TextureAtlas>();
+        let mut query = app.world_mut().query::<&TextureAtlas>();
 
-        let atlas = query.single(&app.world);
+        let atlas = query.single(&app.world());
 
         assert_eq!(atlas.index, 0);
     }
diff --git a/crates/prefab/src/load.rs b/crates/prefab/src/load.rs
index 40feaa02..ab200fc2 100644
--- a/crates/prefab/src/load.rs
+++ b/crates/prefab/src/load.rs
@@ -166,11 +166,11 @@ mod test {
         app.update();
 
         let mut query = app
-            .world
+            .world_mut()
             .query_filtered::<Entity, (With<PrefabAutoChild>, With<PrefabMarker>)>();
-        assert_eq!(query.iter(&app.world).count(), 0);
+        assert_eq!(query.iter(&app.world()).count(), 0);
 
-        let mut query = app.world.query_filtered::<Entity, With<PrefabAutoChild>>();
-        assert_eq!(query.iter(&app.world).count(), 2);
+        let mut query = app.world_mut().query_filtered::<Entity, With<PrefabAutoChild>>();
+        assert_eq!(query.iter(&app.world()).count(), 2);
     }
 }
diff --git a/crates/prefab/src/spawn_system.rs b/crates/prefab/src/spawn_system.rs
index 382a7ebb..bb2467de 100644
--- a/crates/prefab/src/spawn_system.rs
+++ b/crates/prefab/src/spawn_system.rs
@@ -438,7 +438,7 @@ mod tests {
         let mut query = app
             .world_mut()
             .query::<(Entity, &PlayerStart, Option<&Children>)>();
-        let mut iter = query.iter(&app.world_mut());
+        let mut iter = query.iter(&app.world());
         assert!(iter.next().unwrap().2.is_some());
     }
 
@@ -542,7 +542,7 @@ mod tests {
             .world_mut()
             .query::<(&Handle<Scene>, &SceneAutoRoot, &Visibility, &Transform)>();
 
-        let s = query.single(&app.world_mut());
+        let s = query.single(&app.world());
 
         assert_eq!(
             s.0.path().unwrap().to_string(),
@@ -579,7 +579,7 @@ mod tests {
             .world_mut()
             .query::<(&Handle<Scene>, &Visibility, &Transform)>();
 
-        let s = query.single(&app.world_mut());
+        let s = query.single(&app.world());
 
         assert_eq!(s.1, Visibility::Hidden);
         assert_eq!(s.2, &Transform::IDENTITY);
diff --git a/crates/prefab/src/sub_scene/mod.rs b/crates/prefab/src/sub_scene/mod.rs
index 0b947e3a..fb4c30d9 100644
--- a/crates/prefab/src/sub_scene/mod.rs
+++ b/crates/prefab/src/sub_scene/mod.rs
@@ -1,8 +1,7 @@
 use std::any::TypeId;
 
 use bevy::{
-    ecs::world::unsafe_world_cell::UnsafeWorldCell, prelude::*, scene::serde::SceneDeserializer,
-    utils::HashSet,
+    ecs::world::unsafe_world_cell::UnsafeWorldCell, prelude::*, reflect::TypeRegistryArc, scene::serde::SceneDeserializer, utils::HashSet
 };
 use serde::de::DeserializeSeed;
 #[cfg(feature = "editor")]
@@ -101,10 +100,13 @@ pub fn prepare_auto_scene(world: &mut World) {
             dyn_scene = recursive_extract(&cell, dyn_scene, *root_entity);
 
             let scene = dyn_scene.build();
-            let Some(app_registry) = cell.world().get_resource::<AppTypeRegistry>() else {
-                continue;
-            };
-            let data = scene.serialize_ron(app_registry);
+            //let Some(app_registry) = cell.world().get_resource::<AppTypeRegistry>() else {
+            //    continue;
+            //};
+
+            let type_registry_arc: &TypeRegistryArc = &**cell.world().resource::<AppTypeRegistry>();
+            let type_registry = type_registry_arc.read();
+            let data = scene.serialize(&type_registry);
 
             if let Ok(data) = data {
                 info!("serialized sub scene: {:?}", data);
@@ -284,9 +286,9 @@ mod tests {
         app.update();
         app.update();
 
-        let mut query = app.world.query::<&CollapsedSubScene>();
+        let mut query = app.world_mut().query::<&CollapsedSubScene>();
 
-        assert_eq!(query.iter(&app.world).count(), 0);
+        assert_eq!(query.iter(&app.world()).count(), 0);
     }
 
     #[test]
@@ -313,7 +315,7 @@ mod tests {
         app.add_systems(Update, decompress_scene);
         app.update();
 
-        let events = app.world.resource::<Events<ToastMessage>>();
+        let events = app.world().resource::<Events<ToastMessage>>();
 
         let mut iter = events.get_reader();
         let iter = iter.read(events);
diff --git a/crates/shared/src/toast.rs b/crates/shared/src/toast.rs
index 52c6786d..3e7b26ac 100644
--- a/crates/shared/src/toast.rs
+++ b/crates/shared/src/toast.rs
@@ -26,6 +26,7 @@ impl From<&ToastMessage> for Toast {
                 .show_icon(true)
                 .duration_in_seconds(duration)
                 .show_progress(false),
+            style: default(),
         }
     }
 }

From cd2848316f094543550fbab262249ee89efa4b41 Mon Sep 17 00:00:00 2001
From: MiniMinerX <jessehrupe@gmail.com>
Date: Sat, 20 Jul 2024 15:27:45 -0700
Subject: [PATCH 06/17] gizmos almost there

gizmos are all thats left
---
 Cargo.lock                          | 148 ++++++++++++++++++----------
 Cargo.toml                          |   2 +-
 crates/editor_ui/Cargo.toml         |   2 +-
 crates/editor_ui/src/camera_view.rs |   2 +-
 crates/editor_ui/src/game_view.rs   |   6 +-
 crates/editor_ui/src/lib.rs         |  22 ++++-
 crates/editor_ui/src/tools/gizmo.rs |  51 +++++++---
 crates/editor_ui/src/ui_plugin.rs   |  24 ++++-
 8 files changed, 175 insertions(+), 82 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cd545e42..eb0635d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2089,6 +2089,40 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "darling"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.70",
+]
+
 [[package]]
 name = "dasp_sample"
 version = "0.11.0"
@@ -2166,12 +2200,6 @@ dependencies = [
  "proc-macro-error",
 ]
 
-[[package]]
-name = "ecolor"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03cfe80b1890e1a8cdbffc6044d6872e814aaf6011835a2a5e2db0e5c5c4ef4e"
-
 [[package]]
 name = "ecolor"
 version = "0.27.2"
@@ -2202,17 +2230,6 @@ dependencies = [
  "workspace-hakari",
 ]
 
-[[package]]
-name = "egui"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180f595432a5b615fc6b74afef3955249b86cfea72607b40740a4cd60d5297d0"
-dependencies = [
- "ahash",
- "epaint 0.26.2",
- "nohash-hasher",
-]
-
 [[package]]
 name = "egui"
 version = "0.27.2"
@@ -2240,17 +2257,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "egui-gizmo"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65371711037f6f256024371f21fd8f8c5fa2ce5221469a5fb1efc670f205f740"
-dependencies = [
- "egui 0.26.2",
- "glam 0.25.0",
- "mint",
-]
-
 [[package]]
 name = "egui-toast"
 version = "0.14.0"
@@ -2317,12 +2323,6 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
-[[package]]
-name = "emath"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6916301ecf80448f786cdf3eb51d9dbdd831538732229d49119e2d4312eaaf09"
-
 [[package]]
 name = "emath"
 version = "0.27.2"
@@ -2396,6 +2396,18 @@ dependencies = [
  "syn 2.0.70",
 ]
 
+[[package]]
+name = "enum_dispatch"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
+]
+
 [[package]]
 name = "enumn"
 version = "0.1.13"
@@ -2408,17 +2420,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "epaint"
-version = "0.26.2"
+name = "enumset"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77b9fdf617dd7f58b0c8e6e9e4a1281f730cde0831d40547da446b2bb76a47af"
+checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d"
 dependencies = [
- "ab_glyph",
- "ahash",
- "ecolor 0.26.2",
- "emath 0.26.2",
- "nohash-hasher",
- "parking_lot",
+ "enumset_derive",
+]
+
+[[package]]
+name = "enumset_derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.70",
 ]
 
 [[package]]
@@ -2768,15 +2787,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "glam"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
-dependencies = [
- "mint",
-]
-
 [[package]]
 name = "glam"
 version = "0.27.0"
@@ -3020,6 +3030,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -5007,7 +5023,6 @@ dependencies = [
  "bevy_mod_billboard",
  "bevy_mod_picking",
  "bevy_panorbit_camera",
- "egui-gizmo",
  "egui_dock",
  "pretty-type-name",
  "serde",
@@ -5017,6 +5032,7 @@ dependencies = [
  "space_prefab",
  "space_shared",
  "space_undo",
+ "transform-gizmo-egui",
  "workspace-hakari",
 ]
 
@@ -5410,6 +5426,32 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "transform-gizmo"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b43a029251c55e00d44930e24b78f5b471b3e75fa9c88c30ecb816db08646b93"
+dependencies = [
+ "ahash",
+ "ecolor 0.28.1",
+ "emath 0.28.1",
+ "enum_dispatch",
+ "enumset",
+ "epaint 0.28.1",
+ "glam 0.28.0",
+ "mint",
+]
+
+[[package]]
+name = "transform-gizmo-egui"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cfc506918b7eb43be700be7261d8878cc197bf572689c465efe60f5b3110ccc"
+dependencies = [
+ "egui 0.28.1",
+ "transform-gizmo",
+]
+
 [[package]]
 name = "ttf-parser"
 version = "0.24.0"
diff --git a/Cargo.toml b/Cargo.toml
index 283d5a68..c112cc99 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,7 +72,7 @@ convert_case = "0.6"
 egui_dock = "0.13"
 egui_extras = { version = "0.28.1", features = ["all_loaders"] }
 egui_file = "0.18"
-egui-gizmo = "0.16.1"
+transform-gizmo-egui = "0.3.0"
 egui-toast = "0.14.0"
 image = {version = "0.25.1", feature = ["png"] }
 pretty-type-name = "1"
diff --git a/crates/editor_ui/Cargo.toml b/crates/editor_ui/Cargo.toml
index eeb0da34..26c1fd01 100644
--- a/crates/editor_ui/Cargo.toml
+++ b/crates/editor_ui/Cargo.toml
@@ -26,7 +26,7 @@ space_editor_tabs.workspace = true
 serde.workspace = true
 pretty-type-name.workspace = true
 bevy_egui.workspace = true
-egui-gizmo.workspace = true
+transform-gizmo-egui.workspace = true
 egui_dock.workspace = true
 bevy_debug_grid.workspace = true
 bevy-inspector-egui.workspace = true
diff --git a/crates/editor_ui/src/camera_view.rs b/crates/editor_ui/src/camera_view.rs
index 6a8cb1fb..13c45f8a 100644
--- a/crates/editor_ui/src/camera_view.rs
+++ b/crates/editor_ui/src/camera_view.rs
@@ -359,7 +359,7 @@ fn set_camera_viewport(
 
     local.0 = Some(viewport_rect);
 
-    let Some(image_data) = images.get(target_handle) else {
+    let Some(image_data) = images.get(target_handle.id()) else {
         error!("Could not get image data");
         return;
     };
diff --git a/crates/editor_ui/src/game_view.rs b/crates/editor_ui/src/game_view.rs
index 33a6eccd..9630108e 100644
--- a/crates/editor_ui/src/game_view.rs
+++ b/crates/editor_ui/src/game_view.rs
@@ -1,6 +1,6 @@
 use bevy::{prelude::*, window::PrimaryWindow};
 use bevy_egui::egui::{self, RichText, Widget};
-use egui_gizmo::GizmoMode;
+use transform_gizmo_egui::GizmoMode;
 use space_undo::UndoRedo;
 
 use space_shared::*;
@@ -33,7 +33,7 @@ impl Default for GameViewTab {
     fn default() -> Self {
         Self {
             viewport_rect: None,
-            gizmo_mode: GizmoMode::Translate,
+            gizmo_mode: GizmoMode::TranslateView,
             smoothed_dt: 0.0,
             tools: vec![],
             active_tool: None,
@@ -208,7 +208,7 @@ mod tests {
         let default_tab = GameViewTab::default();
 
         assert_eq!(default_tab.viewport_rect, None);
-        assert_eq!(default_tab.gizmo_mode, GizmoMode::Translate);
+        assert_eq!(default_tab.gizmo_mode, GizmoMode::TranslateView);
         assert_eq!(default_tab.smoothed_dt, 0.0);
         assert_eq!(default_tab.tools.len(), 0);
         assert_eq!(default_tab.active_tool, None);
diff --git a/crates/editor_ui/src/lib.rs b/crates/editor_ui/src/lib.rs
index 1e176438..5f2e9bad 100644
--- a/crates/editor_ui/src/lib.rs
+++ b/crates/editor_ui/src/lib.rs
@@ -61,7 +61,9 @@ pub mod sizing;
 
 pub mod icons;
 
-use bevy_debug_grid::{Grid, GridAxis, SubGrid, TrackedGrid, DEFAULT_GRID_ALPHA};
+use std::char::MAX;
+
+use bevy_debug_grid::{Grid, GridAxis, SubGrid, TrackedGrid};
 use bevy_mod_picking::{
     backends::raycast::RaycastPickable,
     events::{Down, Pointer},
@@ -106,7 +108,17 @@ use ui_plugin::*;
 
 use self::{mouse_check::MouseCheck, tools::gizmo::GizmoToolPlugin};
 
-pub const LAST_RENDER_LAYER: u8 = RenderLayers::TOTAL_LAYERS as u8 - 1;
+pub const MAX_RENDER_LAYERS: u8 = 32; // Or however many layers you need
+
+pub const DEFAULT_GRID_ALPHA: f32 = 0.5_f32;
+
+pub fn all_render_layers() -> RenderLayers {
+    (0..MAX_RENDER_LAYERS).fold(RenderLayers::none(), |layers, layer| {
+        layers.with(layer.into())
+    })
+}
+
+pub const LAST_RENDER_LAYER: u8 = MAX_RENDER_LAYERS - 1;
 
 pub mod prelude {
     pub use super::{
@@ -377,7 +389,7 @@ pub fn simple_editor_setup(mut commands: Commands) {
         Name::from("Editor Camera"),
         PickableBundle::default(),
         RaycastPickable,
-        RenderLayers::all(),
+        all_render_layers(),
     ));
 }
 
@@ -408,7 +420,7 @@ pub fn game_mode_changed(
                 Name::from("Editor Camera"),
                 PickableBundle::default(),
                 RaycastPickable,
-                RenderLayers::all(),
+                all_render_layers(),
             ));
         } else {
             // 2D camera
@@ -424,7 +436,7 @@ pub fn game_mode_changed(
                 Name::from("Editor 2D Camera"),
                 PickableBundle::default(),
                 RaycastPickable,
-                RenderLayers::all(),
+                all_render_layers(),
             ));
         }
     }
diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs
index 3215f29b..38fb13d1 100644
--- a/crates/editor_ui/src/tools/gizmo.rs
+++ b/crates/editor_ui/src/tools/gizmo.rs
@@ -1,6 +1,6 @@
 use bevy::{prelude::*, render::camera::CameraProjection};
 use bevy_egui::egui::{self, Key};
-use egui_gizmo::GizmoMode;
+use transform_gizmo_egui::GizmoMode;
 use space_editor_core::prelude::*;
 use space_shared::*;
 
@@ -69,23 +69,23 @@ pub struct GizmoTool {
 impl Default for GizmoTool {
     fn default() -> Self {
         Self {
-            gizmo_mode: GizmoMode::Translate,
+            gizmo_mode: GizmoMode::TranslateView,
             is_move_cloned_entities: false,
         }
     }
 }
 
 const MODE_TO_NAME: [(GizmoMode, &str); 3] = [
-    (GizmoMode::Translate, "Translate"),
-    (GizmoMode::Rotate, "Rotate"),
-    (GizmoMode::Scale, "Scale"),
+    (GizmoMode::TranslateView, "Translate"),
+    (GizmoMode::RotateView, "Rotate"),
+    (GizmoMode::ScaleUniform, "Scale"),
 ];
 
 //hot keys. Blender keys prefer
 const MODE_TO_KEY: [(GizmoMode, GizmoHotkey); 3] = [
-    (GizmoMode::Translate, GizmoHotkey::Translate),
-    (GizmoMode::Rotate, GizmoHotkey::Rotate),
-    (GizmoMode::Scale, GizmoHotkey::Scale),
+    (GizmoMode::TranslateView, GizmoHotkey::Translate),
+    (GizmoMode::RotateView, GizmoHotkey::Rotate),
+    (GizmoMode::ScaleUniform, GizmoHotkey::Scale),
 ];
 
 impl EditorTool for GizmoTool {
@@ -180,7 +180,7 @@ impl EditorTool for GizmoTool {
             .iter(world)
             .collect::<Vec<_>>();
         let mut disable_pan_orbit = false;
-        let _gizmo_mode = GizmoMode::Translate;
+        let _gizmo_mode = GizmoMode::TranslateView;
 
         let cell = world.as_unsafe_world_cell();
 
@@ -223,9 +223,11 @@ impl EditorTool for GizmoTool {
 
             let mut gizmo_interacted = false;
 
-            if let Some(result) = egui_gizmo::Gizmo::new("Selected gizmo mean global".to_string())
-                .projection_matrix(cam_proj.get_clip_from_view().to_cols_array_2d().into())
-                .view_matrix(view_matrix.to_cols_array_2d().into())
+            if let Some(result) = transform_gizmo_egui::Gizmo::new(transform_gizmo_egui::GizmoConfig {
+                projection_matrix: cam_proj.get_clip_from_view().to_cols_array_2d().into(),
+                view_matrix: view_matrix.to_cols_array_2d().into(),
+                ..Default::default()
+            })
                 .model_matrix(mean_transform.compute_matrix().to_cols_array_2d().into())
                 .mode(self.gizmo_mode)
                 .interact(ui)
@@ -399,9 +401,26 @@ trait ToButton {
 impl ToButton for GizmoMode {
     fn to_button(&self, size: &Sizing) -> egui::Button {
         match self {
-            Self::Rotate => rotation_icon(size.gizmos.to_size(), ""),
-            Self::Translate => translate_icon(size.gizmos.to_size(), ""),
-            Self::Scale => scale_icon(size.gizmos.to_size(), ""),
+            Self::RotateView => rotation_icon(size.gizmos.to_size(), ""),
+            Self::TranslateView => translate_icon(size.gizmos.to_size(), ""),
+            Self::ScaleUniform => scale_icon(size.gizmos.to_size(), ""),
+            GizmoMode::RotateX => todo!(),
+            GizmoMode::RotateY => todo!(),
+            GizmoMode::RotateZ => todo!(),
+            GizmoMode::TranslateX => todo!(),
+            GizmoMode::TranslateY => todo!(),
+            GizmoMode::TranslateZ => todo!(),
+            GizmoMode::TranslateXY => todo!(),
+            GizmoMode::TranslateXZ => todo!(),
+            GizmoMode::TranslateYZ => todo!(),
+            GizmoMode::ScaleX => todo!(),
+            GizmoMode::ScaleY => todo!(),
+            GizmoMode::ScaleZ => todo!(),
+            GizmoMode::ScaleXY => todo!(),
+            GizmoMode::ScaleXZ => todo!(),
+            GizmoMode::ScaleYZ => todo!(),
+            GizmoMode::Arcball => todo!(),
+        
         }
     }
 }
@@ -426,7 +445,7 @@ mod tests {
     fn test_default_gizmo_tool() {
         let default_tool = GizmoTool::default();
 
-        assert_eq!(default_tool.gizmo_mode, GizmoMode::Translate);
+        assert_eq!(default_tool.gizmo_mode, GizmoMode::TranslateView);
         assert_eq!(default_tool.is_move_cloned_entities, false);
         assert_eq!(default_tool.name(), "Gizmo");
     }
diff --git a/crates/editor_ui/src/ui_plugin.rs b/crates/editor_ui/src/ui_plugin.rs
index fb713613..d6a49e75 100644
--- a/crates/editor_ui/src/ui_plugin.rs
+++ b/crates/editor_ui/src/ui_plugin.rs
@@ -1,5 +1,5 @@
 use crate::*;
-use bevy::prelude::*;
+use bevy::{ecs::schedule::ScheduleLabel, prelude::*};
 use meshless_visualizer::draw_light_gizmo;
 
 use self::{change_chain::ChangeChainViewPlugin, editor_tab_name::EditorTabName};
@@ -94,9 +94,15 @@ impl Default for EditorUiCore {
     }
 }
 
+#[derive(ScheduleLabel, Debug, Hash, PartialEq, Eq, Clone)]
+struct AfterStateTransition;
+
+
 impl Plugin for EditorUiCore {
     #[cfg(not(tarpaulin_include))]
     fn build(&self, app: &mut App) {
+        use bevy::app::MainScheduleOrder;
+
         app.init_state::<ShowEditorUi>();
         app.init_resource::<EditorUi>();
 
@@ -141,9 +147,23 @@ impl Plugin for EditorUiCore {
 
         app.insert_resource(EditorCameraEnabled(true));
 
+        //app.add_systems(
+        //    Startup,
+        //    (set_start_state, apply_state_transition::<EditorState>).chain(),
+        //);
+
+        // Create a new schedule for systems that need to run after state transition
+        let after_state_transition = Schedule::new(AfterStateTransition);
+        app.add_schedule(after_state_transition);
+
+        // Modify the schedule order to make this run after `StateTransition`
+        app.world_mut()
+            .resource_mut::<MainScheduleOrder>()
+            .insert_after(StateTransition, AfterStateTransition);
+
         app.add_systems(
             Startup,
-            (set_start_state, apply_state_transition::<EditorState>).chain(),
+            (set_start_state, apply_deferred).chain(),
         );
 
         //play systems

From 4c67591d35fa32e1ba4baaa8d9e45d3f7b1bd761 Mon Sep 17 00:00:00 2001
From: MiniMinerX <jessehrupe@gmail.com>
Date: Sat, 20 Jul 2024 16:36:05 -0700
Subject: [PATCH 07/17] no gizmos 4 now

I have most the code done for gizmos. The main issue is that the update is from egui_gizmos to either transform-gizmo-bevy or transform-gizmo-egui. Yall can decide what to do there, this version works, just without the transform gizmo.
---
 Cargo.lock                                    | 27 ++++++
 Cargo.toml                                    |  1 +
 crates/editor_ui/Cargo.toml                   |  1 +
 crates/editor_ui/src/lib.rs                   |  6 +-
 crates/editor_ui/src/tools/gizmo.rs           | 91 ++++++++-----------
 crates/editor_ui/src/ui_plugin.rs             |  2 +-
 modules/bevy_xpbd_plugin/src/collider.rs      | 12 ++-
 modules/bevy_xpbd_plugin/src/lib.rs           |  2 +-
 modules/bevy_xpbd_plugin/src/registry.rs      |  8 +-
 modules/bevy_xpbd_plugin/src/spatial_query.rs |  5 +-
 10 files changed, 84 insertions(+), 71 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eb0635d9..27aa4c65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2794,6 +2794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
 dependencies = [
  "bytemuck",
+ "mint",
  "rand",
  "serde",
 ]
@@ -5032,6 +5033,7 @@ dependencies = [
  "space_prefab",
  "space_shared",
  "space_undo",
+ "transform-gizmo-bevy",
  "transform-gizmo-egui",
  "workspace-hakari",
 ]
@@ -5442,6 +5444,31 @@ dependencies = [
  "mint",
 ]
 
+[[package]]
+name = "transform-gizmo-bevy"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e8240adbd84abd8b020fe5a5c8eb4f11771495f189cb080eb0344947ac18449"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "bytemuck",
+ "transform-gizmo",
+ "uuid",
+]
+
 [[package]]
 name = "transform-gizmo-egui"
 version = "0.3.0"
diff --git a/Cargo.toml b/Cargo.toml
index c112cc99..cf89204f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -73,6 +73,7 @@ egui_dock = "0.13"
 egui_extras = { version = "0.28.1", features = ["all_loaders"] }
 egui_file = "0.18"
 transform-gizmo-egui = "0.3.0"
+transform-gizmo-bevy = "0.3.0"
 egui-toast = "0.14.0"
 image = {version = "0.25.1", feature = ["png"] }
 pretty-type-name = "1"
diff --git a/crates/editor_ui/Cargo.toml b/crates/editor_ui/Cargo.toml
index 26c1fd01..8d66c5ce 100644
--- a/crates/editor_ui/Cargo.toml
+++ b/crates/editor_ui/Cargo.toml
@@ -27,6 +27,7 @@ serde.workspace = true
 pretty-type-name.workspace = true
 bevy_egui.workspace = true
 transform-gizmo-egui.workspace = true
+transform-gizmo-bevy.workspace = true
 egui_dock.workspace = true
 bevy_debug_grid.workspace = true
 bevy-inspector-egui.workspace = true
diff --git a/crates/editor_ui/src/lib.rs b/crates/editor_ui/src/lib.rs
index 5f2e9bad..a610a137 100644
--- a/crates/editor_ui/src/lib.rs
+++ b/crates/editor_ui/src/lib.rs
@@ -34,7 +34,7 @@ pub mod settings;
 pub mod tool;
 
 /// This module contains IMPLEMENTATIONS for existed tools (like Gizmo manipulation tool)
-pub mod tools;
+// pub mod tools;
 
 /// This module contains methods for bundle registration
 pub mod ui_registration;
@@ -106,7 +106,7 @@ use ui_registration::BundleReg;
 use camera_plugin::*;
 use ui_plugin::*;
 
-use self::{mouse_check::MouseCheck, tools::gizmo::GizmoToolPlugin};
+use self::{mouse_check::MouseCheck}; // , tools::gizmo::GizmoToolPlugin};
 
 pub const MAX_RENDER_LAYERS: u8 = 32; // Or however many layers you need
 
@@ -123,7 +123,7 @@ pub const LAST_RENDER_LAYER: u8 = MAX_RENDER_LAYERS - 1;
 pub mod prelude {
     pub use super::{
         asset_inspector::*, change_chain::*, debug_panels::*, game_view::*, hierarchy::*,
-        inspector::*, menu_toolbars::*, meshless_visualizer::*, settings::*, tool::*, tools::*,
+        inspector::*, menu_toolbars::*, meshless_visualizer::*, settings::*, tool::*, //tools::*,
         ui_registration::*,
     };
 
diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs
index 38fb13d1..7f6a71e3 100644
--- a/crates/editor_ui/src/tools/gizmo.rs
+++ b/crates/editor_ui/src/tools/gizmo.rs
@@ -1,6 +1,6 @@
 use bevy::{prelude::*, render::camera::CameraProjection};
 use bevy_egui::egui::{self, Key};
-use transform_gizmo_egui::GizmoMode;
+use transform_gizmo_egui::{Gizmo, GizmoMode};
 use space_editor_core::prelude::*;
 use space_shared::*;
 
@@ -94,14 +94,6 @@ impl EditorTool for GizmoTool {
     }
 
     fn ui(&mut self, ui: &mut egui::Ui, commands: &mut Commands, world: &mut World) {
-        // GIZMO DRAW
-        // Draw gizmo per entity to individual move
-        // If SHIFT pressed draw "mean" gizmo to move all selected entities together
-        // If ALT pressed, then entity will be cloned at interact
-        // If SHIFT+ALT pressed, then all selected entities will be cloned at interact
-        // All hotkeys can be changes in editor ui
-
-        // Not much we can do
         let sizing = world.resource::<Sizing>();
 
         ui.spacing();
@@ -180,7 +172,6 @@ impl EditorTool for GizmoTool {
             .iter(world)
             .collect::<Vec<_>>();
         let mut disable_pan_orbit = false;
-        let _gizmo_mode = GizmoMode::TranslateView;
 
         let cell = world.as_unsafe_world_cell();
 
@@ -203,7 +194,6 @@ impl EditorTool for GizmoTool {
 
             let mut global_mean = GlobalTransform::from(mean_transform);
 
-            //Set resource for draw lines from mean center to each entity
             unsafe {
                 cell.world_mut().insert_resource(MultipleCenter {
                     center: Some(global_mean.translation()),
@@ -223,20 +213,21 @@ impl EditorTool for GizmoTool {
 
             let mut gizmo_interacted = false;
 
-            if let Some(result) = transform_gizmo_egui::Gizmo::new(transform_gizmo_egui::GizmoConfig {
+            let gizmo_config = transform_gizmo_bevy::GizmoConfig {
                 projection_matrix: cam_proj.get_clip_from_view().to_cols_array_2d().into(),
                 view_matrix: view_matrix.to_cols_array_2d().into(),
+                modes: self.gizmo_mode.into(),
                 ..Default::default()
-            })
-                .model_matrix(mean_transform.compute_matrix().to_cols_array_2d().into())
-                .mode(self.gizmo_mode)
-                .interact(ui)
+            };
+
+            if let Some(result) = Gizmo::new(gizmo_config)
+                .interact(ui, &[mean_transform.into()])
             {
                 gizmo_interacted = true;
                 mean_transform = Transform {
-                    translation: Vec3::from(<[f32; 3]>::from(result.translation)),
-                    rotation: Quat::from_array(<[f32; 4]>::from(result.rotation)),
-                    scale: Vec3::from(<[f32; 3]>::from(result.scale)),
+                    translation: Vec3::from(result.translation),
+                    rotation: Quat::from_array(result.rotation),
+                    scale: Vec3::from(result.scale),
                 };
                 disable_pan_orbit = true;
             }
@@ -290,47 +281,37 @@ impl EditorTool for GizmoTool {
                 let Some(mut transform) = (unsafe { ecell.get_mut::<Transform>() }) else {
                     continue;
                 };
+
+                let gizmo_config = GizmoConfig {
+                    projection_matrix: cam_proj.get_clip_from_view().to_cols_array_2d().into(),
+                    view_matrix: view_matrix.to_cols_array_2d().into(),
+                    ..Default::default()
+                };
+
                 if let Some(parent) = unsafe { ecell.get::<Parent>() } {
                     if let Some(parent) = cell.get_entity(parent.get()) {
                         if let Some(parent_global) = unsafe { parent.get::<GlobalTransform>() } {
                             if let Some(global) = unsafe { ecell.get::<GlobalTransform>() } {
-                                if let Some(result) =
-                                    egui_gizmo::Gizmo::new(format!("Selected gizmo {:?}", *e))
-                                        .projection_matrix(
-                                            cam_proj
-                                                .get_clip_from_view()
-                                                .to_cols_array_2d()
-                                                .into(),
-                                        )
-                                        .view_matrix(view_matrix.to_cols_array_2d().into())
-                                        .model_matrix(
-                                            global.compute_matrix().to_cols_array_2d().into(),
-                                        )
-                                        .mode(self.gizmo_mode)
-                                        .interact(ui)
+                                if let Some(result) = Gizmo::new(gizmo_config)
+                                    .model_matrix(global.compute_matrix().to_cols_array_2d().into())
+                                    .mode(self.gizmo_mode)
+                                    .interact(ui, &[global.compute_transform().into()])
                                 {
                                     disable_pan_orbit = true;
                                     let new_transform = Transform {
-                                        translation: Vec3::from(<[f32; 3]>::from(
-                                            result.translation,
-                                        )),
-                                        rotation: Quat::from_array(<[f32; 4]>::from(
-                                            result.rotation,
-                                        )),
-                                        scale: Vec3::from(<[f32; 3]>::from(result.scale)),
+                                        translation: Vec3::from(result.translation),
+                                        rotation: Quat::from_array(result.rotation),
+                                        scale: Vec3::from(result.scale),
                                     };
 
                                     if clone_pressed {
                                         if self.is_move_cloned_entities {
-                                            let new_transform =
-                                                GlobalTransform::from(new_transform);
+                                            let new_transform = GlobalTransform::from(new_transform);
                                             *transform = new_transform.reparented_to(parent_global);
                                             transform.set_changed();
                                             disable_pan_orbit = true;
                                         } else {
-                                            unsafe {
-                                                cell.world_mut().send_event(CloneEvent { id: *e })
-                                            };
+                                            unsafe { cell.world_mut().send_event(CloneEvent { id: *e }) };
                                             self.is_move_cloned_entities = true;
                                         }
                                     } else {
@@ -344,19 +325,18 @@ impl EditorTool for GizmoTool {
                         }
                     }
                 }
-                if let Some(result) = egui_gizmo::Gizmo::new(format!("Selected gizmo {:?}", *e))
-                    .projection_matrix(cam_proj.get_clip_from_view().to_cols_array_2d().into())
-                    .view_matrix(view_matrix.to_cols_array_2d().into())
+
+                if let Some(result) = Gizmo::new(gizmo_config)
                     .model_matrix(transform.compute_matrix().to_cols_array_2d().into())
                     .mode(self.gizmo_mode)
-                    .interact(ui)
+                    .interact(ui, &[(*transform).into()])
                 {
                     if clone_pressed {
                         if self.is_move_cloned_entities {
                             *transform = Transform {
-                                translation: Vec3::from(<[f32; 3]>::from(result.translation)),
-                                rotation: Quat::from_array(<[f32; 4]>::from(result.rotation)),
-                                scale: Vec3::from(<[f32; 3]>::from(result.scale)),
+                                translation: Vec3::from(result.translation),
+                                rotation: Quat::from_array(result.rotation),
+                                scale: Vec3::from(result.scale),
                             };
                             transform.set_changed();
                         } else {
@@ -365,9 +345,9 @@ impl EditorTool for GizmoTool {
                         }
                     } else {
                         *transform = Transform {
-                            translation: Vec3::from(<[f32; 3]>::from(result.translation)),
-                            rotation: Quat::from_array(<[f32; 4]>::from(result.rotation)),
-                            scale: Vec3::from(<[f32; 3]>::from(result.scale)),
+                            translation: Vec3::from(result.translation),
+                            rotation: Quat::from_array(result.rotation),
+                            scale: Vec3::from(result.scale),
                         };
                         transform.set_changed();
                     }
@@ -375,6 +355,7 @@ impl EditorTool for GizmoTool {
                 }
             }
         }
+
         if ui.ctx().wants_pointer_input() {
             disable_pan_orbit = true;
         }
diff --git a/crates/editor_ui/src/ui_plugin.rs b/crates/editor_ui/src/ui_plugin.rs
index d6a49e75..be88a00d 100644
--- a/crates/editor_ui/src/ui_plugin.rs
+++ b/crates/editor_ui/src/ui_plugin.rs
@@ -45,7 +45,7 @@ impl FlatPluginList for EditorUiPlugin {
             .add(CameraViewTabPlugin)
             .add(SpaceHierarchyPlugin::default())
             .add(SpaceInspectorPlugin)
-            .add(GizmoToolPlugin)
+            //.add(GizmoToolPlugin)
             .add(ChangeChainViewPlugin)
             .add(settings::SettingsWindowPlugin);
 
diff --git a/modules/bevy_xpbd_plugin/src/collider.rs b/modules/bevy_xpbd_plugin/src/collider.rs
index b0544f11..5cd140ba 100644
--- a/modules/bevy_xpbd_plugin/src/collider.rs
+++ b/modules/bevy_xpbd_plugin/src/collider.rs
@@ -1,7 +1,11 @@
+use avian3d::*;
 use bevy::prelude::*;
-use bevy_xpbd_3d::math::*;
-use bevy_xpbd_3d::prelude::*;
+use bevy::reflect;
 
+use collision::Collider;
+use math::Quaternion;
+use math::Scalar;
+use math::Vector;
 use space_editor_ui::ext::bevy_inspector_egui::prelude::*;
 use space_editor_ui::prelude::MeshPrimitive3dPrefab;
 
@@ -92,10 +96,10 @@ impl ColliderPrimitive {
         match self {
             Self::Cuboid(bbox) => Collider::cuboid(bbox.x, bbox.y, bbox.z),
             Self::Capsule { height, radius } => Collider::capsule(*height, *radius),
-            Self::CapsuleEndpoints { a, b, radius } => Collider::capsule_endpoints(*a, *b, *radius),
+            Self::CapsuleEndpoints { a, b, radius } => Collider::capsule_endpoints(*radius,*a, *b),
             Self::Cone { height, radius } => Collider::cone(*height, *radius),
             Self::Cylinder { height, radius } => Collider::cylinder(*height, *radius),
-            Self::Halfspace { outward_normal } => Collider::halfspace(*outward_normal),
+            Self::Halfspace { outward_normal } => Collider::half_space(*outward_normal),
             Self::Triangle { a, b, c } => Collider::triangle(*a, *b, *c),
             Self::Ball(radius) => Collider::sphere(*radius),
             Self::Segment { a, b } => Collider::segment(*a, *b),
diff --git a/modules/bevy_xpbd_plugin/src/lib.rs b/modules/bevy_xpbd_plugin/src/lib.rs
index 6ddfe94b..fd6d3ad2 100644
--- a/modules/bevy_xpbd_plugin/src/lib.rs
+++ b/modules/bevy_xpbd_plugin/src/lib.rs
@@ -27,5 +27,5 @@ pub mod prelude {
     pub use crate::registry::*;
     pub use crate::spatial_query::*;
     pub use crate::XpbdPlugin;
-    pub use bevy_xpbd_3d;
+    //pub use bevy_xpbd_3d;
 }
diff --git a/modules/bevy_xpbd_plugin/src/registry.rs b/modules/bevy_xpbd_plugin/src/registry.rs
index 701b003d..27324f6f 100644
--- a/modules/bevy_xpbd_plugin/src/registry.rs
+++ b/modules/bevy_xpbd_plugin/src/registry.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_xpbd_3d::prelude::*;
+use avian3d::prelude::*;
 use collider::ColliderPrefab;
 use space_editor_ui::{
     prelude::{EditorRegistryExt, EditorState, PrefabSet},
@@ -11,8 +11,8 @@ use crate::{
     spatial_query::register_xpbd_spatial_types,
 };
 
-pub type Vector = bevy_xpbd_3d::math::Vector;
-pub type Scalar = bevy_xpbd_3d::math::Scalar;
+pub type Vector = avian3d::math::Vector;
+pub type Scalar = avian3d::math::Scalar;
 
 pub struct BevyXpbdPlugin;
 
@@ -20,7 +20,7 @@ impl Plugin for BevyXpbdPlugin {
     fn build(&self, app: &mut App) {
         println!("BevyXpbdPlugin::build");
         app.add_plugins(PhysicsPlugins::default());
-        app.add_plugins(bevy_xpbd_3d::plugins::PhysicsDebugPlugin::default());
+        app.add_plugins(avian3d::debug_render::PhysicsDebugPlugin::default());
 
         app.editor_registry::<collider::ColliderPrefab>()
             .editor_registry::<RigidBodyPrefab>()
diff --git a/modules/bevy_xpbd_plugin/src/spatial_query.rs b/modules/bevy_xpbd_plugin/src/spatial_query.rs
index 9e72d349..a8101416 100644
--- a/modules/bevy_xpbd_plugin/src/spatial_query.rs
+++ b/modules/bevy_xpbd_plugin/src/spatial_query.rs
@@ -1,6 +1,5 @@
-use bevy::prelude::*;
-use bevy_xpbd_3d::math::Vector;
-use bevy_xpbd_3d::{math::Quaternion, prelude::*};
+use avian3d::{math::{Quaternion, Vector}, spatial_query::{RayCaster, ShapeCaster}};
+use bevy::{math::Direction3d, prelude::*};
 use space_editor_ui::{ext::bevy_inspector_egui::prelude::*, prelude::*};
 
 use crate::collider::ColliderPrimitive;

From 23a533b826057547d855043f30494e964959d377 Mon Sep 17 00:00:00 2001
From: MiniMinerX <jessehrupe@gmail.com>
Date: Sat, 20 Jul 2024 16:41:27 -0700
Subject: [PATCH 08/17] naming

---
 modules/bevy_xpbd_plugin/src/spatial_query.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/bevy_xpbd_plugin/src/spatial_query.rs b/modules/bevy_xpbd_plugin/src/spatial_query.rs
index a8101416..ca81f309 100644
--- a/modules/bevy_xpbd_plugin/src/spatial_query.rs
+++ b/modules/bevy_xpbd_plugin/src/spatial_query.rs
@@ -1,5 +1,5 @@
 use avian3d::{math::{Quaternion, Vector}, spatial_query::{RayCaster, ShapeCaster}};
-use bevy::{math::Direction3d, prelude::*};
+use bevy::prelude::*;
 use space_editor_ui::{ext::bevy_inspector_egui::prelude::*, prelude::*};
 
 use crate::collider::ColliderPrimitive;
@@ -32,7 +32,7 @@ impl From<RayCasterPrefab> for RayCaster {
     fn from(val: RayCasterPrefab) -> Self {
         Self::new(
             val.origin,
-            Direction3d::new_unchecked(val.direction.normalize()),
+            Dir3::new_unchecked(val.direction.normalize()),
         )
     }
 }
@@ -53,7 +53,7 @@ impl From<ShapeCasterPrefab> for ShapeCaster {
             val.shape.to_collider(),
             val.origin,
             val.shape_rotation,
-            Direction3d::new_unchecked(val.direction.normalize()),
+            Dir3::new_unchecked(val.direction.normalize()),
         )
         .with_ignore_origin_penetration(true)
     }

From 83f30226c3ead53ba7a154e6de7e91773c5ed4ce Mon Sep 17 00:00:00 2001
From: MiniMinerX <jessehrupe@gmail.com>
Date: Sat, 20 Jul 2024 17:24:32 -0700
Subject: [PATCH 09/17] Update Cargo.lock

---
 Cargo.lock | 262 ++++++++++++++++++++++++++---------------------------
 1 file changed, 130 insertions(+), 132 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 27aa4c65..f6d2575a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -244,14 +244,14 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
 
 [[package]]
 name = "arrayvec"
@@ -298,9 +298,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -365,9 +365,9 @@ dependencies = [
 
 [[package]]
 name = "avian3d"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a8da53296a1bc166b84f99aa7c6b9d8c10c71f0c022bc4fc72dd1fc49323b29"
+checksum = "54325576b6efa46576db611624db749b553d0c66e439862bdc60c43e01f012f9"
 dependencies = [
  "avian_derive",
  "bevy",
@@ -389,7 +389,7 @@ checksum = "b4adeeecb6d4628d3ca11836ce9af8309f9552d4bd3e3f6e4368440d8163260c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -450,9 +450,9 @@ dependencies = [
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "094e2d697a9dcbbd62fc6ff133d1d95990f66b6c4d25cdfb528f4b102c6a3ed1"
+checksum = "f8d77dbe53c8840aa74b66ea19dac6675d0a1752c989610cbded909d03967bec"
 dependencies = [
  "bevy-inspector-egui-derive",
  "bevy_app",
@@ -489,7 +489,7 @@ checksum = "161d93f4b3a9246a87485e30ccf4cc927f204a14f26df42da977e383f0a0ec5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -612,7 +612,7 @@ checksum = "2b12bd14ec1f3e57760d01b239bd27ab5dd13547379e5a83c167c7162525f646"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -624,7 +624,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -717,7 +717,7 @@ checksum = "c8a8173bad3ed53fa158806b1beda147263337d6ef71a093780dd141b74386b1"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -766,7 +766,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -822,7 +822,7 @@ checksum = "3fc779559aa23b81da2b14fba90586755d225983c5b6d3154658e42fc088de7f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -872,7 +872,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -999,8 +999,8 @@ checksum = "c3ad860d35d74b35d4d6ae7f656d163b6f475aa2e64fc293ee86ac901977ddb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
- "toml_edit 0.22.15",
+ "syn 2.0.71",
+ "toml_edit 0.22.16",
 ]
 
 [[package]]
@@ -1038,7 +1038,7 @@ dependencies = [
 [[package]]
 name = "bevy_mod_outline"
 version = "0.8.0"
-source = "git+https://github.com/komadori/bevy_mod_outline.git#68c6329a81db27c128a9f158cd1ce376edd63efa"
+source = "git+https://github.com/komadori/bevy_mod_outline.git#391bf20cb9282def126182cf7eba3e91b8bddaf0"
 dependencies = [
  "bevy",
  "bitfield",
@@ -1247,7 +1247,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
  "uuid",
 ]
 
@@ -1308,7 +1308,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1380,7 +1380,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1500,7 +1500,7 @@ checksum = "ad9db261ab33a046e1f54b35f885a44f21fcc80aa2bc9050319466b88fe58fe3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1564,7 +1564,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1611,15 +1611,15 @@ dependencies = [
 
 [[package]]
 name = "bitstream-io"
-version = "2.2.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da"
+checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499"
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -1658,9 +1658,9 @@ dependencies = [
 
 [[package]]
 name = "built"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16"
+checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
 
 [[package]]
 name = "bumpalo"
@@ -1685,7 +1685,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -1702,15 +1702,15 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
 
 [[package]]
 name = "calloop"
-version = "0.12.4"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
+checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
  "bitflags 2.6.0",
  "log",
@@ -1722,9 +1722,9 @@ dependencies = [
 
 [[package]]
 name = "calloop-wayland-source"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
+checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
 dependencies = [
  "calloop",
  "rustix",
@@ -1734,13 +1734,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.0"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8"
+checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
 ]
 
 [[package]]
@@ -1794,7 +1793,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.8.4",
+ "libloading 0.8.5",
 ]
 
 [[package]]
@@ -2085,7 +2084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813"
 dependencies = [
  "bitflags 2.6.0",
- "libloading 0.8.4",
+ "libloading 0.8.5",
  "winapi",
 ]
 
@@ -2109,7 +2108,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2120,7 +2119,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2151,7 +2150,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2166,14 +2165,14 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.4",
+ "libloading 0.8.5",
 ]
 
 [[package]]
 name = "document-features"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95"
+checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
 dependencies = [
  "litrs",
 ]
@@ -2372,7 +2371,7 @@ checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2393,7 +2392,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2405,7 +2404,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2416,7 +2415,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2437,7 +2436,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2632,7 +2631,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2849,7 +2848,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -2982,7 +2981,7 @@ dependencies = [
  "bitflags 2.6.0",
  "com",
  "libc",
- "libloading 0.8.4",
+ "libloading 0.8.5",
  "thiserror",
  "widestring",
  "winapi",
@@ -3090,12 +3089,12 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d"
+checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
 dependencies = [
  "byteorder-lite",
- "thiserror",
+ "quick-error",
 ]
 
 [[package]]
@@ -3163,7 +3162,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3262,7 +3261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading 0.8.4",
+ "libloading 0.8.5",
  "pkg-config",
 ]
 
@@ -3348,9 +3347,9 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.6",
@@ -3611,7 +3610,7 @@ checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3747,11 +3746,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -3773,7 +3771,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -3824,7 +3822,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4134,7 +4132,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.2",
+ "redox_syscall 0.5.3",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -4214,7 +4212,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4353,7 +4351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
 dependencies = [
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4468,9 +4466,9 @@ dependencies = [
 
 [[package]]
 name = "ravif"
-version = "0.11.5"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234"
+checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12"
 dependencies = [
  "avif-serialize",
  "imgref",
@@ -4536,9 +4534,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -4609,9 +4607,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.44"
+version = "0.8.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9"
+checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523"
 dependencies = [
  "bytemuck",
 ]
@@ -4780,9 +4778,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086"
+checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"
 dependencies = [
  "ab_glyph",
  "log",
@@ -4820,7 +4818,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -4927,9 +4925,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "smithay-client-toolkit"
-version = "0.18.1"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
+checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
  "bitflags 2.6.0",
  "calloop",
@@ -5165,9 +5163,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.70"
+version = "2.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16"
+checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5216,9 +5214,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
 
 [[package]]
 name = "termcolor"
@@ -5231,22 +5229,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5313,14 +5311,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.15",
+ "toml_edit 0.22.16",
 ]
 
 [[package]]
@@ -5345,15 +5343,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.15"
+version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.13",
+ "winnow 0.6.14",
 ]
 
 [[package]]
@@ -5375,7 +5373,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -5714,7 +5712,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
  "wasm-bindgen-shared",
 ]
 
@@ -5748,7 +5746,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5761,9 +5759,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198"
+checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -5775,9 +5773,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.4"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982"
+checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
 dependencies = [
  "bitflags 2.6.0",
  "rustix",
@@ -5798,9 +5796,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.4"
+version = "0.31.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2"
+checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95"
 dependencies = [
  "rustix",
  "wayland-client",
@@ -5809,9 +5807,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.31.2"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
+checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
 dependencies = [
  "bitflags 2.6.0",
  "wayland-backend",
@@ -5821,9 +5819,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.2.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
+checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4"
 dependencies = [
  "bitflags 2.6.0",
  "wayland-backend",
@@ -5834,9 +5832,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.2.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
 dependencies = [
  "bitflags 2.6.0",
  "wayland-backend",
@@ -5847,9 +5845,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.3"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6"
+checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -5858,9 +5856,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.3"
+version = "0.31.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7"
+checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
 dependencies = [
  "dlib",
  "log",
@@ -5998,7 +5996,7 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.4",
+ "libloading 0.8.5",
  "log",
  "metal",
  "naga",
@@ -6149,7 +6147,7 @@ checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6160,7 +6158,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6171,7 +6169,7 @@ checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6182,7 +6180,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]
@@ -6420,9 +6418,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winit"
-version = "0.30.3"
+version = "0.30.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004"
+checksum = "4225ddd8ab67b8b59a2fee4b34889ebf13c0460c1c3fa297c58e21eb87801b33"
 dependencies = [
  "ahash",
  "android-activity",
@@ -6481,9 +6479,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f"
 dependencies = [
  "memchr",
 ]
@@ -6511,7 +6509,7 @@ dependencies = [
  "num-traits",
  "serde",
  "syn 1.0.109",
- "syn 2.0.70",
+ "syn 2.0.71",
  "uuid",
  "winit",
 ]
@@ -6536,7 +6534,7 @@ dependencies = [
  "as-raw-xcb-connection",
  "gethostname",
  "libc",
- "libloading 0.8.4",
+ "libloading 0.8.5",
  "once_cell",
  "rustix",
  "x11rb-protocol",
@@ -6550,9 +6548,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
 
 [[package]]
 name = "xcursor"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
+checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7"
 
 [[package]]
 name = "xi-unicode"
@@ -6608,7 +6606,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.70",
+ "syn 2.0.71",
 ]
 
 [[package]]

From 6a21583ebb47691b7f9dd3e4cbd0b965bc5299ad Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Sun, 21 Jul 2024 11:12:54 +0300
Subject: [PATCH 10/17] fix entity naming

---
 crates/editor_ui/src/hierarchy.rs     | 4 ++--
 crates/editor_ui/src/inspector/mod.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/editor_ui/src/hierarchy.rs b/crates/editor_ui/src/hierarchy.rs
index 679daea8..03c329a1 100644
--- a/crates/editor_ui/src/hierarchy.rs
+++ b/crates/editor_ui/src/hierarchy.rs
@@ -152,8 +152,8 @@ fn draw_entity<F: QueryFilter>(
     };
 
     let entity_name = name.map_or_else(
-        || format!("Entity ({:?})", entity),
-        |name| format!("{} ({:?})", name.as_str(), entity),
+        || format!("Entity ({})", entity),
+        |name| format!("{} ({})", name.as_str(), entity),
     );
 
     let is_selected = selected.contains(entity);
diff --git a/crates/editor_ui/src/inspector/mod.rs b/crates/editor_ui/src/inspector/mod.rs
index e8effd16..e23cb58d 100644
--- a/crates/editor_ui/src/inspector/mod.rs
+++ b/crates/editor_ui/src/inspector/mod.rs
@@ -164,10 +164,10 @@ impl EditorTab for InspectorTab {
                 if let Some(name_struct) = unsafe { e.get::<Name>() } {
                     name = name_struct.as_str().to_string();
                     if name.is_empty() {
-                        name = format!("{:?} (empty name)", e.id());
+                        name = format!("{} (empty name)", e.id());
                     }
                 } else {
-                    name = format!("{:?}", e.id());
+                    name = format!("{}", e.id());
                 }
                 ui.heading(&name);
                 let mut state = unsafe { cell.get_resource_mut::<FilterComponentState>().unwrap() };

From f7cb0362d1ff84fb0caab8006b9bc6f88becc526 Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Sun, 11 Aug 2024 20:41:01 +0300
Subject: [PATCH 11/17] fix toast

---
 Cargo.lock                      | 499 ++++++++++++++++----------------
 crates/editor_core/src/toast.rs |  11 +-
 2 files changed, 260 insertions(+), 250 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f6d2575a..c77923ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -226,7 +226,7 @@ checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
 dependencies = [
  "clipboard-win",
  "core-graphics",
- "image 0.25.1",
+ "image 0.25.2",
  "log",
  "objc2",
  "objc2-app-kit",
@@ -244,7 +244,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -365,9 +365,9 @@ dependencies = [
 
 [[package]]
 name = "avian3d"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54325576b6efa46576db611624db749b553d0c66e439862bdc60c43e01f012f9"
+checksum = "263f406c08c5ec296039ba06d7aa50e54f9ecd996f682aaa63eae25709e8935b"
 dependencies = [
  "avian_derive",
  "bevy",
@@ -389,7 +389,7 @@ checksum = "b4adeeecb6d4628d3ca11836ce9af8309f9552d4bd3e3f6e4368440d8163260c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -441,18 +441,18 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bevy"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e938630e9f472b1899c78ef84aa907081b23bad8333140e2295c620485b6ee7"
+checksum = "c8ece0d8dde51890fb52dcba5b04fd1c657617a4022908c327b2d6e83d173a32"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.25.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8d77dbe53c8840aa74b66ea19dac6675d0a1752c989610cbded909d03967bec"
+checksum = "8b66b51a66c0be92604c13cd490509d77676c05406f4f4b046672aaffdcc925f"
 dependencies = [
  "bevy-inspector-egui-derive",
  "bevy_app",
@@ -483,13 +483,13 @@ dependencies = [
 
 [[package]]
 name = "bevy-inspector-egui-derive"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161d93f4b3a9246a87485e30ccf4cc927f204a14f26df42da977e383f0a0ec5d"
+checksum = "791acfac11e3d5a750952c5201dc0d414b88431260118b46949bf6b159c5a19c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -502,9 +502,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_a11y"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e613f0e7d5a92637e59744f7185e374c9a59654ecc6d7575adcec9581db1363"
+checksum = "82d84e0ae7155afa21c4926fb8b89ebe0cbd66239ac817fdb834025327c4089b"
 dependencies = [
  "accesskit 0.14.0",
  "bevy_app",
@@ -514,9 +514,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_animation"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23aa4141df149b743e69c90244261c6372bafb70d9f115885de48a75fc28fd9b"
+checksum = "abec61c2d9d19329d8d9f0d7f1ce0188f6ed2c6d74d90412b238efc38c7d7794"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -544,9 +544,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f548e9dab7d10c5f99e3b504c758c4bf87aa67df9bcb9cc8b317a0271770e72"
+checksum = "0af99549f5de61cc91c8c23303b13aa07f97b73fbace39695dee0a0a32cec9d4"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -562,9 +562,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d198e4c3419215de2ad981d4e734bbfab46469b7575e3b7150c912b9ec5175"
+checksum = "6533d17f13b44ea4fb5177f83b0900269ed13c0fd45772ccffd19a69980647ec"
 dependencies = [
  "async-broadcast",
  "async-fs",
@@ -612,26 +612,26 @@ checksum = "2b12bd14ec1f3e57760d01b239bd27ab5dd13547379e5a83c167c7162525f646"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11b2cbeba287a4b44e116c33dbaf37dce80a9d84477b2bb35ff459999d6c9e1b"
+checksum = "74b0e132a89e254c0f5c8bc8deebb0f2490f5662f4aa2215a6996701446d6a7b"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "bevy_audio"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e41ecf15d0aae31bdb6d2b5cc590f966451e9736ddfee634c8f1ca5af1ac4342"
+checksum = "e3050cb7244560313800b284e4b5eafcf91e833464e44d8407b20ec6c65974fc"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -648,9 +648,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_color"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a933306f5c7dc9568209180f482b28b5f40d2f8d5b361bc1b270c0a588752c0"
+checksum = "82c031f121b8d72e7637c94ef139097613bd32935784d36728f83e77cfdf26f4"
 dependencies = [
  "bevy_math",
  "bevy_reflect",
@@ -663,9 +663,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ddeed5ebf2fa75a4d4f32e2da9c60f11037e36252695059a151c6685cd3d72b"
+checksum = "8ccc7118a2865267136afb5e6a2c0aed30994e522f298b2ba0b088878e6ddf59"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -677,9 +677,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b978220b5edc98f2c5cbbd14c118c74b3ec7216e5416d3c187c1097279b009b"
+checksum = "559ad1dc48c3fa6bbace503df2fe44a7de38c8dfe11bee911ec0ffaf93e3e57d"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -711,20 +711,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8a8173bad3ed53fa158806b1beda147263337d6ef71a093780dd141b74386b1"
+checksum = "8675f337f374b2b8ae90539982b947d171f9adb302d00c032b823bd5231f8978"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7f82011fd70048be282526a99756d54bf00e874edafa9664ba0dc247678f03"
+checksum = "fdcc1d7ba5797e4285a7867227134d4cabaaf8cabfb7cdc42eb697d3b3db0460"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -738,9 +738,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c77fdc3a7230eff2fcebe4bd17c155bd238c660a0089d0f98c39ba0d461b923"
+checksum = "7a3eed7f144811946ebfa1c740da9e3bcd6dd2dd4da844eda085249d29bc9fef"
 dependencies = [
  "arrayvec",
  "bevy_ecs_macros",
@@ -759,14 +759,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272b511958525306cd141726d3ca59740f79fc0707c439b55a007bcc3497308"
+checksum = "d523630f2eb9fde6727e6c5ea48fa708079c5345da21ffeb1a4bd8ca761830da"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -793,9 +793,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0452d8254c8bfae4bff6caca2a8be3b0c1b2e1a72b93e9b9f6a21c8dff807e0"
+checksum = "7a20ec101b103f430481112591e280a8fc3f2db6741579f885595372073b749b"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -822,14 +822,14 @@ checksum = "3fc779559aa23b81da2b14fba90586755d225983c5b6d3154658e42fc088de7f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbad8e59470c3d5cf25aa8c48462c4cf6f0c6314538c68ab2f5cf393146f0fc2"
+checksum = "a64d84c2cbc6a027ba2c293752f9508e6777607acb1d98d03c25eb2a80d55372"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -842,9 +842,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdbb0556f0c6e45f4a17aef9c708c06ebf15ae1bed4533d7eddb493409f9f025"
+checksum = "248324352331d719071b0d1545a43e3d63470f4730e75312edee575f210d3a77"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -865,21 +865,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos_macros"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ef351a4b6498c197d1317c62f46ba84b69fbde3dbeb57beb2e744bbe5b7c3e0"
+checksum = "cbe1708bb0e45a1d0fe0f32e998557689231dfe7bdae62083326e8008e97de23"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfd7abeaf3f28afd1f8999c2169aa17b40a37ad11253cf7dd05017024b65adc6"
+checksum = "cb57239cb4209e52354268062cd1973892af3a2077ccbdb4d19259cbbc2d2c2d"
 dependencies = [
  "base64 0.22.1",
  "bevy_animation",
@@ -908,9 +908,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "802eca6f341d19ade790ccfaba7044be4d823b708087eb5ac4c1f74e4ea0916a"
+checksum = "bb332d2789442ca1577c765977bafefea1dcd4db29479713ec8c6932dfb82cdb"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -922,9 +922,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d050f1433f48ca23f1ea078734ebff119a3f76eb7d221725ab0f1fd9f81230b"
+checksum = "a9ce5f27a8729b473205b01927cd6a5c4898a004cb8fcffa7c896e19ba999d98"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -937,9 +937,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ddd2b23e44d3a1f8ae547cbee5b6661f8135cc456c5de206e8648789944e7a1"
+checksum = "c2463102e46d7d67440dbfe3bc97d34bf529c93191c4f4bb41395f4982062ff3"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -978,9 +978,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab641fd0de254915ab746165a07677465b2d89b72f5b49367d73b9197548a35"
+checksum = "52f2c0c374af59007396793a51f747f6b10d74ca4acfb080ce0ade267118827b"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -993,34 +993,35 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ad860d35d74b35d4d6ae7f656d163b6f475aa2e64fc293ee86ac901977ddb7"
+checksum = "7ec4a585ec2a6dedd4f4143c07219d120ae142121929f0d83e68d82a452cdc9b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
- "toml_edit 0.22.16",
+ "syn 2.0.74",
+ "toml_edit 0.22.20",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bd6ce2174d3237d30e0ab5b2508480cc7593ca4d96ffb3a3095f9fc6bbc34c"
+checksum = "40253578fe83a5ffe5f4fcb4dfa196b7d9c50f36dc8efaa231a53344bf4b3e57"
 dependencies = [
  "bevy_reflect",
  "glam 0.27.0",
  "rand",
+ "serde",
  "smallvec",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ce4266293629a2d10459cc112dffe3b3e9229a4f2b8a4d20061b8dd53316d0"
+checksum = "24a1ad15685c6035e01bdc9d5ea082558ef1438e9d40d69fc552857dd7e83e71"
 dependencies = [
  "glam 0.27.0",
 ]
@@ -1037,8 +1038,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_mod_outline"
-version = "0.8.0"
-source = "git+https://github.com/komadori/bevy_mod_outline.git#391bf20cb9282def126182cf7eba3e91b8bddaf0"
+version = "0.8.2"
+source = "git+https://github.com/komadori/bevy_mod_outline.git#01a62da6a1b4139d1b33e22cec33aa3342b8502f"
 dependencies = [
  "bevy",
  "bitfield",
@@ -1103,9 +1104,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_pbr"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3effe8ff28899f14d250d0649ca9868dbe68b389d0f2b7af086759b8e16c6e3d"
+checksum = "588998ba295db4a14dec54e571f272490f2885e5aaac59191fb4fa32a25835d0"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1214,15 +1215,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c115c97a5c8a263bd0aa7001b999772c744ac5ba797d07c86f25734ce381ea69"
+checksum = "7ed72afbb6249a6803a3ed7bd2f68ff080d9392f550475e050b34c1e1c1e3e8f"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406ea0fce267169c2320c7302d97d09f605105686346762562c5f65960b5ca2f"
+checksum = "fb37e8fc3c61d04da480c95cc8c303aa7781afed6be01dae333b336af493c38e"
 dependencies = [
  "bevy_ptr",
  "bevy_reflect_derive",
@@ -1240,22 +1241,22 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0427fdb4425fc72cc96d45e550df83ace6347f0503840de116c76a40843ba751"
+checksum = "8fc00d5086f5bf534b4c2dbeba549a6b8d3223515f3cb5ba4fdaabe953ec6cea"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c48acf1ff4267c231def4cbf573248d42ac60c9952108822d505019460bf36d"
+checksum = "1f570f36154296ae5377587d5ef19e1feb4c5734923785c571f55a9fff091701"
 dependencies = [
  "async-channel",
  "bevy_app",
@@ -1283,7 +1284,7 @@ dependencies = [
  "encase",
  "futures-lite",
  "hexasphere",
- "image 0.25.1",
+ "image 0.25.2",
  "js-sys",
  "ktx2",
  "naga",
@@ -1301,21 +1302,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ddf4a96d71519c8eca3d74dabcb89a9c0d50ab5d9230638cb004145f46e9ed"
+checksum = "fe2d5008c7b4a8a516ef7b58452b8e40e4c2317068fc7505398bedf34e8d45f7"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "bevy_scene"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a9f0388612a116f02ab6187aeab66e52c9e91abbc21f919b8b50230c4d83e7"
+checksum = "3910087f6fc45e7833fb62e4de282c36a7012ff381c0584eb2cc84dede02e72f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1333,9 +1334,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d837e33ed27b9f2e5212eca4bdd5655a9ee64c52914112e6189c043cb25dd1ec"
+checksum = "fffdfb9a18968c8606286b6be83c9323ff9008b5cc043a23a3ecc95ff72fb20c"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1359,9 +1360,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_state"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0959984092d56885fd3b320ea84fb816821bad6bfa3040b9d4ee850d3273233d"
+checksum = "21066e7bb8014d1b1dd4f611f28c0f4ea9c7738cec2325281e4260a65072d509"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1373,21 +1374,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_state_macros"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887a98bfa268258377cd073f5bb839518d3a1cd6b96ed81418145485b69378e6"
+checksum = "a8a449823c420d1cc1fa6cf3d484570b08358e5eeedc1b86de1efcf9c10399b5"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "bevy_tasks"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a8bfb8d484bdb1e9bec3789c75202adc5e608c4244347152e50fb31668a54f9"
+checksum = "84f5414c3f49c96e02ceccf5fa12fb6cfbf8b271d2a820902d6f622e9c2fa681"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -1398,9 +1399,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_text"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "454fd29b7828244356b2e0ce782e6d0a6f26b47f521456accde3a7191b121727"
+checksum = "f3e77dd86def15f5380e6e7c178ec54e5e356b3f464e2ad35794a08d5ecb82e4"
 dependencies = [
  "ab_glyph",
  "bevy_app",
@@ -1421,9 +1422,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6c3d3d14ee8b0dbe4819fd516cc75509b61946134d78e0ee89ad3d1835ffe6c"
+checksum = "b3fb18cfac62098e07786e422e84b4f45f469f27ccb5b572b409500bef465f33"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1435,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97e8aa6b16be573277c6ceda30aebf1d78af7c6ede19b448dcb052fb8601d815"
+checksum = "4ff09cea0dd0d4e6a3ed5f7dcbd4fbbcec07e518ceb64a4c8a75dedbe294ab60"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1449,9 +1450,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d9f864c646f3742ff77f67bcd89a13a7ab024b68ca2f1bfbab8245bcb1c06c"
+checksum = "50684629a03b7d4891b5953e84dd971c7a8bbd290751bab5ce06e119b692220b"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1479,9 +1480,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fab364910e8f5839578aba9cfda00a8388e9ebe352ceb8491a742ce6af9ec6e"
+checksum = "f6efbe5a621b56cc4ffa41074929eca84107e242302496b9bb7550675e6bf2e7"
 dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
@@ -1494,20 +1495,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad9db261ab33a046e1f54b35f885a44f21fcc80aa2bc9050319466b88fe58fe3"
+checksum = "36a1e91b4294cad2d08620ac062509395d4f65247b636946d6497eaeccf4dbfd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9ea5777f933bf7ecaeb3af1a30845720ec730e007972ca7d4aba2d3512abe24"
+checksum = "8ba11880f05a3b267ecfa4149fe789b0c046c35fd8418dd8899fad3a4359c986"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1521,9 +1522,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_winit"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c2213bbf14debe819ec8ad4913f233c596002d087bc6f1f20d533e2ebaf8c6"
+checksum = "d5aeb4b2e3b1ece189fcf37ea2de625ceab93e6ac2a14d4b15b0393351e4c18b"
 dependencies = [
  "accesskit_winit",
  "approx",
@@ -1564,7 +1565,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1670,9 +1671,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.1"
+version = "1.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -1685,7 +1686,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -1702,9 +1703,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.6.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "calloop"
@@ -1734,9 +1735,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.6"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
+checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292"
 dependencies = [
  "jobserver",
  "libc",
@@ -1951,9 +1952,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core-graphics"
@@ -2108,7 +2109,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -2119,7 +2120,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -2150,7 +2151,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -2286,7 +2287,7 @@ dependencies = [
  "egui 0.28.1",
  "ehttp",
  "enum-map",
- "image 0.25.1",
+ "image 0.25.2",
  "log",
  "mime_guess2",
  "resvg",
@@ -2371,7 +2372,7 @@ checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -2392,7 +2393,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -2404,39 +2405,39 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "enumn"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "enumset"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d"
+checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293"
 dependencies = [
  "enumset_derive",
 ]
 
 [[package]]
 name = "enumset_derive"
-version = "0.8.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
+checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -2584,9 +2585,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2631,7 +2632,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -2737,9 +2738,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f226b8f4d9bc7da93de8efd8747c6b1086409ca3f4b6d51e9a7f5461a9183fe"
+checksum = "dfb8c78963a8856a5b10015c9349176ff5edbc8095384d52aada467a848bc03a"
 dependencies = [
  "fnv",
  "gilrs-core",
@@ -2848,7 +2849,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3066,12 +3067,12 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
 dependencies = [
  "bytemuck",
- "byteorder",
+ "byteorder-lite",
  "color_quant",
  "exr",
  "gif",
@@ -3120,9 +3121,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -3162,7 +3163,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3229,9 +3230,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
@@ -3448,9 +3449,9 @@ dependencies = [
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
+checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
 dependencies = [
  "autocfg",
  "rawpointer",
@@ -3463,7 +3464,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
 dependencies = [
  "cfg-if",
- "rayon",
 ]
 
 [[package]]
@@ -3610,7 +3610,7 @@ checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3771,7 +3771,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -3806,23 +3806,23 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -4039,9 +4039,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.1"
+version = "0.36.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
+checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
 dependencies = [
  "memchr",
 ]
@@ -4212,7 +4212,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -4223,9 +4223,9 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "piper"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
 dependencies = [
  "atomic-waker",
  "fastrand",
@@ -4253,9 +4253,9 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.7.2"
+version = "3.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
@@ -4263,7 +4263,7 @@ dependencies = [
  "pin-project-lite",
  "rustix",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4277,9 +4277,12 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "presser"
@@ -4351,7 +4354,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
 dependencies = [
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -4466,16 +4469,15 @@ dependencies = [
 
 [[package]]
 name = "ravif"
-version = "0.11.8"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12"
+checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd"
 dependencies = [
  "avif-serialize",
  "imgref",
  "loop9",
  "quick-error",
  "rav1e",
- "rayon",
  "rgb",
 ]
 
@@ -4543,9 +4545,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4607,9 +4609,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.45"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523"
+checksum = "0f86ae463694029097b846d8f99fd5536740602ae00022c0c50c5600720b2f71"
 dependencies = [
  "bytemuck",
 ]
@@ -4700,9 +4702,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.11"
+version = "0.23.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
 dependencies = [
  "log",
  "once_cell",
@@ -4715,15 +4717,15 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.5"
+version = "0.102.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4803,40 +4805,41 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.206"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.206"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
@@ -5070,7 +5073,7 @@ dependencies = [
  "bevy-inspector-egui",
  "egui-toast",
  "egui_file",
- "image 0.25.1",
+ "image 0.25.2",
  "workspace-hakari",
 ]
 
@@ -5085,9 +5088,9 @@ dependencies = [
 
 [[package]]
 name = "spade"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f4ec45f91925e2c9ab3b6a857ee9ed36916990df76a1c475d783a328e247cc8"
+checksum = "766195f983f4098dc3bf37fb66bd609f6e6258c4b8db684d05252b2c694cdbcd"
 dependencies = [
  "hashbrown",
  "num-traits",
@@ -5163,9 +5166,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.71"
+version = "2.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
+checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5214,9 +5217,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.15"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "termcolor"
@@ -5244,7 +5247,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -5311,21 +5314,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.15"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.16",
+ "toml_edit 0.22.20",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
@@ -5343,15 +5346,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.16"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.14",
+ "winnow 0.6.18",
 ]
 
 [[package]]
@@ -5373,7 +5376,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -5479,9 +5482,9 @@ dependencies = [
 
 [[package]]
 name = "ttf-parser"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a"
+checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
 
 [[package]]
 name = "twox-hash"
@@ -5561,9 +5564,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea"
+checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
 dependencies = [
  "base64 0.22.1",
  "flate2",
@@ -5671,9 +5674,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "walkdir"
@@ -5712,7 +5715,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
  "wasm-bindgen-shared",
 ]
 
@@ -5746,7 +5749,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6030,9 +6033,9 @@ dependencies = [
 
 [[package]]
 name = "wide"
-version = "0.7.25"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2caba658a80831539b30698ae9862a72db6697dfdd7151e46920f5f2755c3ce2"
+checksum = "901e8597c777fa042e9e245bd56c0dc4418c5db3f845b6ff94fbac732c6a0692"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -6062,11 +6065,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6147,7 +6150,7 @@ checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -6158,7 +6161,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -6169,7 +6172,7 @@ checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -6180,7 +6183,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -6238,6 +6241,15 @@ dependencies = [
  "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]]
 name = "windows-targets"
 version = "0.42.2"
@@ -6418,9 +6430,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winit"
-version = "0.30.4"
+version = "0.30.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4225ddd8ab67b8b59a2fee4b34889ebf13c0460c1c3fa297c58e21eb87801b33"
+checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67"
 dependencies = [
  "ahash",
  "android-activity",
@@ -6479,9 +6491,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.14"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
@@ -6509,7 +6521,7 @@ dependencies = [
  "num-traits",
  "serde",
  "syn 1.0.109",
- "syn 2.0.71",
+ "syn 2.0.74",
  "uuid",
  "winit",
 ]
@@ -6548,9 +6560,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
 
 [[package]]
 name = "xcursor"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7"
+checksum = "f513f231f0810b04d988f0df4fb16ef0b6b25d23248f2c4b56b074e6b1b0ffe4"
 
 [[package]]
 name = "xi-unicode"
@@ -6579,9 +6591,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
+checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
 
 [[package]]
 name = "xmlwriter"
@@ -6595,6 +6607,7 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
@@ -6606,7 +6619,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.74",
 ]
 
 [[package]]
@@ -6632,9 +6645,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
+checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
 dependencies = [
  "zune-core",
 ]
diff --git a/crates/editor_core/src/toast.rs b/crates/editor_core/src/toast.rs
index 16ea4299..01dbeb62 100644
--- a/crates/editor_core/src/toast.rs
+++ b/crates/editor_core/src/toast.rs
@@ -1,5 +1,5 @@
 use bevy::{prelude::*, window::PrimaryWindow};
-use bevy_egui::EguiContext;
+use bevy_egui::{EguiContext, EguiContexts};
 use egui_dock::egui::{self, Align2};
 use space_shared::toast::ToastMessage;
 
@@ -9,7 +9,7 @@ pub struct ToastUiPlugin;
 impl Plugin for ToastUiPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins(ToastBasePlugin)
-            .add_systems(PostUpdate, show_toast);
+            .add_systems(Update, show_toast);
     }
 }
 
@@ -129,12 +129,9 @@ fn clear_toasts(mut events: EventReader<ClearToastMessage>, mut storage: ResMut<
 
 fn show_toast(
     mut storage: ResMut<ToastStorage>,
-    mut ctxs: Query<&mut EguiContext, With<PrimaryWindow>>,
+    mut ctxs: EguiContexts,
 ) {
-    let Ok(mut ctx) = ctxs.get_single_mut() else {
-        return;
-    };
-    storage.toasts.show(ctx.get_mut());
+    storage.toasts.show(ctxs.ctx_mut());
 }
 
 #[cfg(test)]

From 5ea4b7db4540a239175bda23569e6213748b002b Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Sun, 11 Aug 2024 21:35:07 +0300
Subject: [PATCH 12/17] enable gizmo

---
 Cargo.lock                          | 27 ---------------------------
 crates/editor_ui/Cargo.toml         |  1 -
 crates/editor_ui/src/lib.rs         |  2 +-
 crates/editor_ui/src/tools/gizmo.rs |  8 ++++----
 crates/editor_ui/src/ui_plugin.rs   |  3 ++-
 examples/platformer.rs              |  5 ++---
 6 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c77923ef..6135de10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2794,7 +2794,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
 dependencies = [
  "bytemuck",
- "mint",
  "rand",
  "serde",
 ]
@@ -5034,7 +5033,6 @@ dependencies = [
  "space_prefab",
  "space_shared",
  "space_undo",
- "transform-gizmo-bevy",
  "transform-gizmo-egui",
  "workspace-hakari",
 ]
@@ -5445,31 +5443,6 @@ dependencies = [
  "mint",
 ]
 
-[[package]]
-name = "transform-gizmo-bevy"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8240adbd84abd8b020fe5a5c8eb4f11771495f189cb080eb0344947ac18449"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_ecs",
- "bevy_input",
- "bevy_log",
- "bevy_math",
- "bevy_pbr",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "bytemuck",
- "transform-gizmo",
- "uuid",
-]
-
 [[package]]
 name = "transform-gizmo-egui"
 version = "0.3.0"
diff --git a/crates/editor_ui/Cargo.toml b/crates/editor_ui/Cargo.toml
index 8d66c5ce..26c1fd01 100644
--- a/crates/editor_ui/Cargo.toml
+++ b/crates/editor_ui/Cargo.toml
@@ -27,7 +27,6 @@ serde.workspace = true
 pretty-type-name.workspace = true
 bevy_egui.workspace = true
 transform-gizmo-egui.workspace = true
-transform-gizmo-bevy.workspace = true
 egui_dock.workspace = true
 bevy_debug_grid.workspace = true
 bevy-inspector-egui.workspace = true
diff --git a/crates/editor_ui/src/lib.rs b/crates/editor_ui/src/lib.rs
index a610a137..0071f00a 100644
--- a/crates/editor_ui/src/lib.rs
+++ b/crates/editor_ui/src/lib.rs
@@ -34,7 +34,7 @@ pub mod settings;
 pub mod tool;
 
 /// This module contains IMPLEMENTATIONS for existed tools (like Gizmo manipulation tool)
-// pub mod tools;
+pub mod tools;
 
 /// This module contains methods for bundle registration
 pub mod ui_registration;
diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs
index 7f6a71e3..5fd7b70d 100644
--- a/crates/editor_ui/src/tools/gizmo.rs
+++ b/crates/editor_ui/src/tools/gizmo.rs
@@ -1,6 +1,6 @@
 use bevy::{prelude::*, render::camera::CameraProjection};
 use bevy_egui::egui::{self, Key};
-use transform_gizmo_egui::{Gizmo, GizmoMode};
+use transform_gizmo_egui::{Gizmo, GizmoExt, GizmoMode};
 use space_editor_core::prelude::*;
 use space_shared::*;
 
@@ -213,9 +213,9 @@ impl EditorTool for GizmoTool {
 
             let mut gizmo_interacted = false;
 
-            let gizmo_config = transform_gizmo_bevy::GizmoConfig {
-                projection_matrix: cam_proj.get_clip_from_view().to_cols_array_2d().into(),
-                view_matrix: view_matrix.to_cols_array_2d().into(),
+            let gizmo_config = transform_gizmo_egui::GizmoConfig {
+                projection_matrix: cam_proj.get_clip_from_view().into(),
+                view_matrix: view_matrix.into(),
                 modes: self.gizmo_mode.into(),
                 ..Default::default()
             };
diff --git a/crates/editor_ui/src/ui_plugin.rs b/crates/editor_ui/src/ui_plugin.rs
index be88a00d..ae71dfda 100644
--- a/crates/editor_ui/src/ui_plugin.rs
+++ b/crates/editor_ui/src/ui_plugin.rs
@@ -1,6 +1,7 @@
 use crate::*;
 use bevy::{ecs::schedule::ScheduleLabel, prelude::*};
 use meshless_visualizer::draw_light_gizmo;
+use crate::tools::gizmo::*;
 
 use self::{change_chain::ChangeChainViewPlugin, editor_tab_name::EditorTabName};
 
@@ -45,7 +46,7 @@ impl FlatPluginList for EditorUiPlugin {
             .add(CameraViewTabPlugin)
             .add(SpaceHierarchyPlugin::default())
             .add(SpaceInspectorPlugin)
-            //.add(GizmoToolPlugin)
+            .add(GizmoToolPlugin)
             .add(ChangeChainViewPlugin)
             .add(settings::SettingsWindowPlugin);
 
diff --git a/examples/platformer.rs b/examples/platformer.rs
index f5f7a82f..8ee40981 100644
--- a/examples/platformer.rs
+++ b/examples/platformer.rs
@@ -5,7 +5,6 @@ use bevy::{
     ecs::{entity::MapEntities, reflect::ReflectMapEntities},
     prelude::*,
 };
-use space_editor::prelude::bevy_xpbd_3d::prelude::*;
 use space_editor::prelude::*;
 
 fn main() {
@@ -19,8 +18,8 @@ fn main() {
         .editor_relation::<PlayerController, RayCasterPrefab>()
         .editor_registry::<FollowCamera>()
         .editor_relation::<FollowCamera, Camera3d>()
-        .add_systems(Update, move_player.run_if(in_state(EditorState::Game)))
-        .add_systems(Update, camera_follow.run_if(in_state(EditorState::Game)))
+        // .add_systems(Update, move_player.run_if(in_state(EditorState::Game)))
+        // .add_systems(Update, camera_follow.run_if(in_state(EditorState::Game)))
         .run();
 }
 

From 26abb498a4c84b86bda9b6c778d850a4a3097ce9 Mon Sep 17 00:00:00 2001
From: "a.yamaev" <a.yamaev@smartengines.com>
Date: Wed, 14 Aug 2024 16:50:51 +0300
Subject: [PATCH 13/17] gizmo start showing

---
 Cargo.lock                          |  66 +++++------
 crates/editor_ui/src/tools/gizmo.rs | 172 +++++++++++++++++-----------
 examples/platformer.rs              |   1 +
 3 files changed, 140 insertions(+), 99 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6135de10..31319f52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1735,12 +1735,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.10"
+version = "1.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292"
+checksum = "5fb8dd288a69fc53a1996d7ecfbf4a20d59065bff137ce7e56bbd620de191189"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -3120,9 +3121,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -3247,9 +3248,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -4804,18 +4805,18 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.206"
+version = "1.0.207"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284"
+checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.206"
+version = "1.0.207"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97"
+checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4824,9 +4825,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.122"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
+checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d"
 dependencies = [
  "itoa",
  "memchr",
@@ -5086,9 +5087,9 @@ dependencies = [
 
 [[package]]
 name = "spade"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "766195f983f4098dc3bf37fb66bd609f6e6258c4b8db684d05252b2c694cdbcd"
+checksum = "9bd14cf9e23b5241e1b1289ed3b9afc7746c95ead8df52d9254f5ed2d40c561b"
 dependencies = [
  "hashbrown",
  "num-traits",
@@ -5669,19 +5670,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -5694,9 +5696,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5706,9 +5708,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5716,9 +5718,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5729,9 +5731,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wayland-backend"
@@ -5844,9 +5846,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6006,9 +6008,9 @@ dependencies = [
 
 [[package]]
 name = "wide"
-version = "0.7.26"
+version = "0.7.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901e8597c777fa042e9e245bd56c0dc4418c5db3f845b6ff94fbac732c6a0692"
+checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -6533,9 +6535,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
 
 [[package]]
 name = "xcursor"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f513f231f0810b04d988f0df4fb16ef0b6b25d23248f2c4b56b074e6b1b0ffe4"
+checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
 
 [[package]]
 name = "xi-unicode"
diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs
index 5fd7b70d..4f7efd03 100644
--- a/crates/editor_ui/src/tools/gizmo.rs
+++ b/crates/editor_ui/src/tools/gizmo.rs
@@ -1,6 +1,7 @@
 use bevy::{prelude::*, render::camera::CameraProjection};
 use bevy_egui::egui::{self, Key};
-use transform_gizmo_egui::{Gizmo, GizmoExt, GizmoMode};
+use transform_gizmo_egui::mint::RowMatrix4;
+use transform_gizmo_egui::{EnumSet, Gizmo, GizmoExt, GizmoMode};
 use space_editor_core::prelude::*;
 use space_shared::*;
 
@@ -62,32 +63,69 @@ impl Hotkey for GizmoHotkey {
 }
 
 pub struct GizmoTool {
-    pub gizmo_mode: GizmoMode,
+    pub gizmo_mode: EnumSet<GizmoMode>,
     pub is_move_cloned_entities: bool,
 }
 
 impl Default for GizmoTool {
     fn default() -> Self {
         Self {
-            gizmo_mode: GizmoMode::TranslateView,
+            gizmo_mode: GizmoMode::all_translate(),
             is_move_cloned_entities: false,
         }
     }
 }
 
-const MODE_TO_NAME: [(GizmoMode, &str); 3] = [
-    (GizmoMode::TranslateView, "Translate"),
-    (GizmoMode::RotateView, "Rotate"),
-    (GizmoMode::ScaleUniform, "Scale"),
+const MODE_TO_NAME: [(EnumSet<GizmoMode>, &str); 3] = [
+    (GizmoMode::all_translate(), "Translate"),
+    (GizmoMode::all_rotate(), "Rotate"),
+    (GizmoMode::all_scale(), "Scale"),
 ];
 
 //hot keys. Blender keys prefer
-const MODE_TO_KEY: [(GizmoMode, GizmoHotkey); 3] = [
-    (GizmoMode::TranslateView, GizmoHotkey::Translate),
-    (GizmoMode::RotateView, GizmoHotkey::Rotate),
-    (GizmoMode::ScaleUniform, GizmoHotkey::Scale),
+const MODE_TO_KEY: [(EnumSet<GizmoMode>, GizmoHotkey); 3] = [
+    (GizmoMode::all_translate(), GizmoHotkey::Translate),
+    (GizmoMode::all_rotate(), GizmoHotkey::Rotate),
+    (GizmoMode::all_scale(), GizmoHotkey::Scale),
 ];
 
+fn bevy_to_gizmo_transform(transform: &Transform) -> transform_gizmo_egui::math::Transform {
+    transform_gizmo_egui::math::Transform {
+        scale: transform_gizmo_egui::mint::Vector3::<f64>::from_slice(&transform.scale.as_dvec3().to_array()),
+        rotation: transform_gizmo_egui::mint::Quaternion::<f64> {
+            v: transform_gizmo_egui::mint::Vector3::<f64> {
+                x : transform.rotation.x as f64,
+                y : transform.rotation.y as f64,
+                z : transform.rotation.z as f64,
+            },
+            s: transform.rotation.w as f64,
+        },
+        translation: transform_gizmo_egui::mint::Vector3::<f64>::from_slice(&transform.translation.as_dvec3().to_array()),
+    }
+}
+
+fn gizmo_to_bevy_transform(transform: &transform_gizmo_egui::math::Transform) -> Transform {
+    Transform {
+        scale: Vec3::new(
+            transform.scale.x as f32,
+            transform.scale.y as f32,
+            transform.scale.z as f32,
+        ),
+        translation: Vec3::new(
+            transform.translation.x as f32,
+            transform.translation.y as f32,
+            transform.translation.z as f32,
+        ),
+        rotation: Quat::from_xyzw(
+            transform.rotation.v.x as f32,
+            transform.rotation.v.y as f32,
+            transform.rotation.v.z as f32,
+            transform.rotation.s as f32,
+        ),
+        ..Default::default()
+    }
+}
+
 impl EditorTool for GizmoTool {
     fn name(&self) -> &str {
         "Gizmo"
@@ -213,22 +251,33 @@ impl EditorTool for GizmoTool {
 
             let mut gizmo_interacted = false;
 
+            let proj_mat = cam_proj.get_clip_from_view();
+            let proj_mat = transform_gizmo_egui::math::DMat4 {
+                x_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.x_axis.as_dvec4().to_array()),
+                y_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.y_axis.as_dvec4().to_array()),
+                z_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.z_axis.as_dvec4().to_array()),
+                w_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.w_axis.as_dvec4().to_array()),
+            };
+
+            let view_matrix = transform_gizmo_egui::math::DMat4 {
+                x_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.x_axis.as_dvec4().to_array()),
+                y_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.y_axis.as_dvec4().to_array()),
+                z_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.z_axis.as_dvec4().to_array()),
+                w_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.w_axis.as_dvec4().to_array()),
+            };
+
             let gizmo_config = transform_gizmo_egui::GizmoConfig {
-                projection_matrix: cam_proj.get_clip_from_view().into(),
+                projection_matrix: proj_mat.into(),
                 view_matrix: view_matrix.into(),
                 modes: self.gizmo_mode.into(),
                 ..Default::default()
             };
 
-            if let Some(result) = Gizmo::new(gizmo_config)
-                .interact(ui, &[mean_transform.into()])
+            if let Some((result, transforms)) = Gizmo::new(gizmo_config)
+                .interact(ui, &[bevy_to_gizmo_transform(&mean_transform)])
             {
                 gizmo_interacted = true;
-                mean_transform = Transform {
-                    translation: Vec3::from(result.translation),
-                    rotation: Quat::from_array(result.rotation),
-                    scale: Vec3::from(result.scale),
-                };
+                mean_transform = gizmo_to_bevy_transform(&transforms[0]);
                 disable_pan_orbit = true;
             }
 
@@ -282,9 +331,26 @@ impl EditorTool for GizmoTool {
                     continue;
                 };
 
-                let gizmo_config = GizmoConfig {
-                    projection_matrix: cam_proj.get_clip_from_view().to_cols_array_2d().into(),
-                    view_matrix: view_matrix.to_cols_array_2d().into(),
+                let proj_mat = cam_proj.get_clip_from_view();
+                let proj_mat = transform_gizmo_egui::math::DMat4 {
+                    x_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.x_axis.as_dvec4().to_array()),
+                    y_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.y_axis.as_dvec4().to_array()),
+                    z_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.z_axis.as_dvec4().to_array()),
+                    w_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.w_axis.as_dvec4().to_array()),
+                };
+
+                let view_matrix = transform_gizmo_egui::math::DMat4 {
+                    x_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.x_axis.as_dvec4().to_array()),
+                    y_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.y_axis.as_dvec4().to_array()),
+                    z_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.z_axis.as_dvec4().to_array()),
+                    w_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.w_axis.as_dvec4().to_array()),
+                };
+
+                let gizmo_config = transform_gizmo_egui::GizmoConfig {
+                    projection_matrix: proj_mat.into(),
+                    view_matrix: view_matrix.into(),
+                    modes: self.gizmo_mode.into(),
+                    viewport: ui.clip_rect(),
                     ..Default::default()
                 };
 
@@ -292,17 +358,11 @@ impl EditorTool for GizmoTool {
                     if let Some(parent) = cell.get_entity(parent.get()) {
                         if let Some(parent_global) = unsafe { parent.get::<GlobalTransform>() } {
                             if let Some(global) = unsafe { ecell.get::<GlobalTransform>() } {
-                                if let Some(result) = Gizmo::new(gizmo_config)
-                                    .model_matrix(global.compute_matrix().to_cols_array_2d().into())
-                                    .mode(self.gizmo_mode)
-                                    .interact(ui, &[global.compute_transform().into()])
+                                if let Some((result, transforms)) = Gizmo::new(gizmo_config)
+                                    .interact(ui, &[bevy_to_gizmo_transform(&global.compute_transform())])
                                 {
                                     disable_pan_orbit = true;
-                                    let new_transform = Transform {
-                                        translation: Vec3::from(result.translation),
-                                        rotation: Quat::from_array(result.rotation),
-                                        scale: Vec3::from(result.scale),
-                                    };
+                                    let new_transform = gizmo_to_bevy_transform(&transforms[0]);
 
                                     if clone_pressed {
                                         if self.is_move_cloned_entities {
@@ -326,29 +386,19 @@ impl EditorTool for GizmoTool {
                     }
                 }
 
-                if let Some(result) = Gizmo::new(gizmo_config)
-                    .model_matrix(transform.compute_matrix().to_cols_array_2d().into())
-                    .mode(self.gizmo_mode)
-                    .interact(ui, &[(*transform).into()])
+                if let Some((result, transforms)) = Gizmo::new(gizmo_config)
+                    .interact(ui, &[bevy_to_gizmo_transform(&transform)])
                 {
                     if clone_pressed {
                         if self.is_move_cloned_entities {
-                            *transform = Transform {
-                                translation: Vec3::from(result.translation),
-                                rotation: Quat::from_array(result.rotation),
-                                scale: Vec3::from(result.scale),
-                            };
+                            *transform = gizmo_to_bevy_transform(&transforms[0]);
                             transform.set_changed();
                         } else {
                             unsafe { cell.world_mut().send_event(CloneEvent { id: *e }) };
                             self.is_move_cloned_entities = true;
                         }
                     } else {
-                        *transform = Transform {
-                            translation: Vec3::from(result.translation),
-                            rotation: Quat::from_array(result.rotation),
-                            scale: Vec3::from(result.scale),
-                        };
+                        *transform = gizmo_to_bevy_transform(&transforms[0]);
                         transform.set_changed();
                     }
                     disable_pan_orbit = true;
@@ -379,30 +429,18 @@ trait ToButton {
     fn to_button(&self, size: &Sizing) -> egui::Button;
 }
 
-impl ToButton for GizmoMode {
+impl ToButton for EnumSet<GizmoMode> {
     fn to_button(&self, size: &Sizing) -> egui::Button {
-        match self {
-            Self::RotateView => rotation_icon(size.gizmos.to_size(), ""),
-            Self::TranslateView => translate_icon(size.gizmos.to_size(), ""),
-            Self::ScaleUniform => scale_icon(size.gizmos.to_size(), ""),
-            GizmoMode::RotateX => todo!(),
-            GizmoMode::RotateY => todo!(),
-            GizmoMode::RotateZ => todo!(),
-            GizmoMode::TranslateX => todo!(),
-            GizmoMode::TranslateY => todo!(),
-            GizmoMode::TranslateZ => todo!(),
-            GizmoMode::TranslateXY => todo!(),
-            GizmoMode::TranslateXZ => todo!(),
-            GizmoMode::TranslateYZ => todo!(),
-            GizmoMode::ScaleX => todo!(),
-            GizmoMode::ScaleY => todo!(),
-            GizmoMode::ScaleZ => todo!(),
-            GizmoMode::ScaleXY => todo!(),
-            GizmoMode::ScaleXZ => todo!(),
-            GizmoMode::ScaleYZ => todo!(),
-            GizmoMode::Arcball => todo!(),
-        
+
+        if *self == GizmoMode::all_translate() {
+            return translate_icon(size.gizmos.to_size(), "");
+        } else if *self == GizmoMode::all_scale() {
+            return scale_icon(size.gizmos.to_size(), "");
+        } else if *self == GizmoMode::all_rotate() {
+            return rotation_icon(size.gizmos.to_size(), "");
         }
+
+        return translate_icon(size.gizmos.to_size(), "");
     }
 }
 
diff --git a/examples/platformer.rs b/examples/platformer.rs
index 8ee40981..2d0a2811 100644
--- a/examples/platformer.rs
+++ b/examples/platformer.rs
@@ -6,6 +6,7 @@ use bevy::{
     prelude::*,
 };
 use space_editor::prelude::*;
+use avian3d::prelude::*;
 
 fn main() {
     App::default()

From 39f0954b3175a5a8d60f949c72e99df7e5034f99 Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Sat, 14 Sep 2024 07:38:22 +0300
Subject: [PATCH 14/17] single gizmo fix

---
 crates/editor_ui/src/tools/gizmo.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs
index 4f7efd03..2492f871 100644
--- a/crates/editor_ui/src/tools/gizmo.rs
+++ b/crates/editor_ui/src/tools/gizmo.rs
@@ -65,6 +65,7 @@ impl Hotkey for GizmoHotkey {
 pub struct GizmoTool {
     pub gizmo_mode: EnumSet<GizmoMode>,
     pub is_move_cloned_entities: bool,
+    pub gizmo: Gizmo
 }
 
 impl Default for GizmoTool {
@@ -72,6 +73,7 @@ impl Default for GizmoTool {
         Self {
             gizmo_mode: GizmoMode::all_translate(),
             is_move_cloned_entities: false,
+            gizmo: Gizmo::default(),
         }
     }
 }
@@ -273,7 +275,9 @@ impl EditorTool for GizmoTool {
                 ..Default::default()
             };
 
-            if let Some((result, transforms)) = Gizmo::new(gizmo_config)
+            self.gizmo.update_config(gizmo_config);
+
+            if let Some((result, transforms)) = self.gizmo
                 .interact(ui, &[bevy_to_gizmo_transform(&mean_transform)])
             {
                 gizmo_interacted = true;
@@ -386,9 +390,12 @@ impl EditorTool for GizmoTool {
                     }
                 }
 
-                if let Some((result, transforms)) = Gizmo::new(gizmo_config)
+                self.gizmo.update_config(gizmo_config);
+
+                if let Some((result, transforms)) = self.gizmo
                     .interact(ui, &[bevy_to_gizmo_transform(&transform)])
                 {
+                    info!("interact");
                     if clone_pressed {
                         if self.is_move_cloned_entities {
                             *transform = gizmo_to_bevy_transform(&transforms[0]);

From 5cb2b0c44d58fa9fed033cb6f1b74c32991e448b Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Sat, 14 Sep 2024 07:52:27 +0300
Subject: [PATCH 15/17] Update gizmo.rs

---
 crates/editor_ui/src/tools/gizmo.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs
index 2492f871..2d361561 100644
--- a/crates/editor_ui/src/tools/gizmo.rs
+++ b/crates/editor_ui/src/tools/gizmo.rs
@@ -272,11 +272,14 @@ impl EditorTool for GizmoTool {
                 projection_matrix: proj_mat.into(),
                 view_matrix: view_matrix.into(),
                 modes: self.gizmo_mode.into(),
+                viewport: ui.clip_rect(),
                 ..Default::default()
             };
 
             self.gizmo.update_config(gizmo_config);
 
+            info!("{:?}", &mean_transform);
+
             if let Some((result, transforms)) = self.gizmo
                 .interact(ui, &[bevy_to_gizmo_transform(&mean_transform)])
             {
@@ -395,7 +398,6 @@ impl EditorTool for GizmoTool {
                 if let Some((result, transforms)) = self.gizmo
                     .interact(ui, &[bevy_to_gizmo_transform(&transform)])
                 {
-                    info!("interact");
                     if clone_pressed {
                         if self.is_move_cloned_entities {
                             *transform = gizmo_to_bevy_transform(&transforms[0]);

From 2bc1a35b0fe8d41cd829c79a55392f9bcc2f87cb Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Sat, 14 Sep 2024 07:54:43 +0300
Subject: [PATCH 16/17] fmt

---
 crates/editor_core/src/task_storage.rs        |  12 +-
 crates/editor_core/src/toast.rs               |   5 +-
 crates/editor_ui/src/camera_plugin.rs         |   3 +-
 crates/editor_ui/src/game_view.rs             |   2 +-
 crates/editor_ui/src/lib.rs                   |  14 ++-
 crates/editor_ui/src/meshless_visualizer.rs   |  17 ++-
 crates/editor_ui/src/tools/gizmo.rs           | 105 ++++++++++++------
 crates/editor_ui/src/ui_plugin.rs             |   8 +-
 crates/prefab/src/component/shape.rs          |  20 +---
 crates/prefab/src/component/sprite.rs         |   2 +-
 crates/prefab/src/editor_registry/mod.rs      |   6 +-
 crates/prefab/src/load.rs                     |   4 +-
 crates/prefab/src/plugins.rs                  |   8 +-
 crates/prefab/src/save.rs                     |  12 +-
 crates/prefab/src/spawn_system.rs             |  32 ++++--
 crates/prefab/src/sub_scene/mod.rs            |   3 +-
 crates/undo/src/lib.rs                        |   6 +-
 crates/undo/src/tests.rs                      |  45 ++++++--
 examples/platformer.rs                        |   2 +-
 modules/bevy_xpbd_plugin/src/collider.rs      |   2 +-
 modules/bevy_xpbd_plugin/src/registry.rs      |   2 +-
 modules/bevy_xpbd_plugin/src/spatial_query.rs |  10 +-
 22 files changed, 213 insertions(+), 107 deletions(-)

diff --git a/crates/editor_core/src/task_storage.rs b/crates/editor_core/src/task_storage.rs
index 1d653af4..84234b2a 100644
--- a/crates/editor_core/src/task_storage.rs
+++ b/crates/editor_core/src/task_storage.rs
@@ -30,7 +30,7 @@ fn update_storage(mut storage: ResMut<BackgroundTaskStorage>, assets: Res<AssetS
                 if load_state == Some(LoadState::Loaded)
                     || load_state.is_none()
                     || matches!(load_state, Some(LoadState::Failed(_)))
-                    {
+                {
                     need_remove_task = true;
                 }
             }
@@ -64,9 +64,15 @@ mod tests {
             ))
             .add_systems(Update, update_storage);
 
-        assert_eq!(app.world().resource::<BackgroundTaskStorage>().tasks.len(), 1);
+        assert_eq!(
+            app.world().resource::<BackgroundTaskStorage>().tasks.len(),
+            1
+        );
         app.update();
 
-        assert_eq!(app.world().resource::<BackgroundTaskStorage>().tasks.len(), 0);
+        assert_eq!(
+            app.world().resource::<BackgroundTaskStorage>().tasks.len(),
+            0
+        );
     }
 }
diff --git a/crates/editor_core/src/toast.rs b/crates/editor_core/src/toast.rs
index 01dbeb62..90e6e267 100644
--- a/crates/editor_core/src/toast.rs
+++ b/crates/editor_core/src/toast.rs
@@ -127,10 +127,7 @@ fn clear_toasts(mut events: EventReader<ClearToastMessage>, mut storage: ResMut<
     events.clear();
 }
 
-fn show_toast(
-    mut storage: ResMut<ToastStorage>,
-    mut ctxs: EguiContexts,
-) {
+fn show_toast(mut storage: ResMut<ToastStorage>, mut ctxs: EguiContexts) {
     storage.toasts.show(ctxs.ctx_mut());
 }
 
diff --git a/crates/editor_ui/src/camera_plugin.rs b/crates/editor_ui/src/camera_plugin.rs
index 95991935..a383e737 100644
--- a/crates/editor_ui/src/camera_plugin.rs
+++ b/crates/editor_ui/src/camera_plugin.rs
@@ -152,9 +152,8 @@ pub fn draw_camera_gizmo(
     >,
 ) {
     for (transform, _projection) in cameras.iter() {
-        
         let pink = Color::srgb(1.0, 0.41, 0.71);
-        
+
         let transform = transform.compute_transform();
         let cuboid_transform = transform.with_scale(Vec3::new(1.0, 1.0, 2.0));
         gizmos.cuboid(cuboid_transform, pink);
diff --git a/crates/editor_ui/src/game_view.rs b/crates/editor_ui/src/game_view.rs
index 9630108e..d94f6049 100644
--- a/crates/editor_ui/src/game_view.rs
+++ b/crates/editor_ui/src/game_view.rs
@@ -1,7 +1,7 @@
 use bevy::{prelude::*, window::PrimaryWindow};
 use bevy_egui::egui::{self, RichText, Widget};
-use transform_gizmo_egui::GizmoMode;
 use space_undo::UndoRedo;
+use transform_gizmo_egui::GizmoMode;
 
 use space_shared::*;
 
diff --git a/crates/editor_ui/src/lib.rs b/crates/editor_ui/src/lib.rs
index 0071f00a..4e17ea3c 100644
--- a/crates/editor_ui/src/lib.rs
+++ b/crates/editor_ui/src/lib.rs
@@ -106,7 +106,7 @@ use ui_registration::BundleReg;
 use camera_plugin::*;
 use ui_plugin::*;
 
-use self::{mouse_check::MouseCheck}; // , tools::gizmo::GizmoToolPlugin};
+use self::mouse_check::MouseCheck; // , tools::gizmo::GizmoToolPlugin};
 
 pub const MAX_RENDER_LAYERS: u8 = 32; // Or however many layers you need
 
@@ -122,8 +122,16 @@ pub const LAST_RENDER_LAYER: u8 = MAX_RENDER_LAYERS - 1;
 
 pub mod prelude {
     pub use super::{
-        asset_inspector::*, change_chain::*, debug_panels::*, game_view::*, hierarchy::*,
-        inspector::*, menu_toolbars::*, meshless_visualizer::*, settings::*, tool::*, //tools::*,
+        asset_inspector::*,
+        change_chain::*,
+        debug_panels::*,
+        game_view::*,
+        hierarchy::*,
+        inspector::*,
+        menu_toolbars::*,
+        meshless_visualizer::*,
+        settings::*,
+        tool::*, //tools::*,
         ui_registration::*,
     };
 
diff --git a/crates/editor_ui/src/meshless_visualizer.rs b/crates/editor_ui/src/meshless_visualizer.rs
index 0dde4715..36f70141 100644
--- a/crates/editor_ui/src/meshless_visualizer.rs
+++ b/crates/editor_ui/src/meshless_visualizer.rs
@@ -1,6 +1,9 @@
 use anyhow::anyhow;
 use bevy::{
-    math::{primitives as math_shapes, Direction3d}, prelude::*, render::view::RenderLayers, utils::HashMap,
+    math::{primitives as math_shapes, Direction3d},
+    prelude::*,
+    render::view::RenderLayers,
+    utils::HashMap,
 };
 use bevy_asset_loader::{
     asset_collection::AssetCollection,
@@ -477,8 +480,16 @@ pub fn draw_light_gizmo(
                                 * (transform.right().normalize() * angle_inner.cos()
                                     + transform.up().normalize() * angle_inner.sin());
 
-                        gizmos.line(transform.translation, outer_point, spot.color.with_alpha(1.0));
-                        gizmos.line(transform.translation, inner_point, spot.color.with_alpha(1.0));
+                        gizmos.line(
+                            transform.translation,
+                            outer_point,
+                            spot.color.with_alpha(1.0),
+                        );
+                        gizmos.line(
+                            transform.translation,
+                            inner_point,
+                            spot.color.with_alpha(1.0),
+                        );
                     }
                 }
                 (_, _, Some(point)) => {
diff --git a/crates/editor_ui/src/tools/gizmo.rs b/crates/editor_ui/src/tools/gizmo.rs
index 2d361561..12f3abaa 100644
--- a/crates/editor_ui/src/tools/gizmo.rs
+++ b/crates/editor_ui/src/tools/gizmo.rs
@@ -1,11 +1,9 @@
 use bevy::{prelude::*, render::camera::CameraProjection};
 use bevy_egui::egui::{self, Key};
-use transform_gizmo_egui::mint::RowMatrix4;
-use transform_gizmo_egui::{EnumSet, Gizmo, GizmoExt, GizmoMode};
 use space_editor_core::prelude::*;
 use space_shared::*;
-
-
+use transform_gizmo_egui::mint::RowMatrix4;
+use transform_gizmo_egui::{EnumSet, Gizmo, GizmoExt, GizmoMode};
 
 use crate::EditorGizmo;
 use crate::{colors::*, sizing::Sizing};
@@ -65,7 +63,7 @@ impl Hotkey for GizmoHotkey {
 pub struct GizmoTool {
     pub gizmo_mode: EnumSet<GizmoMode>,
     pub is_move_cloned_entities: bool,
-    pub gizmo: Gizmo
+    pub gizmo: Gizmo,
 }
 
 impl Default for GizmoTool {
@@ -93,16 +91,20 @@ const MODE_TO_KEY: [(EnumSet<GizmoMode>, GizmoHotkey); 3] = [
 
 fn bevy_to_gizmo_transform(transform: &Transform) -> transform_gizmo_egui::math::Transform {
     transform_gizmo_egui::math::Transform {
-        scale: transform_gizmo_egui::mint::Vector3::<f64>::from_slice(&transform.scale.as_dvec3().to_array()),
+        scale: transform_gizmo_egui::mint::Vector3::<f64>::from_slice(
+            &transform.scale.as_dvec3().to_array(),
+        ),
         rotation: transform_gizmo_egui::mint::Quaternion::<f64> {
             v: transform_gizmo_egui::mint::Vector3::<f64> {
-                x : transform.rotation.x as f64,
-                y : transform.rotation.y as f64,
-                z : transform.rotation.z as f64,
+                x: transform.rotation.x as f64,
+                y: transform.rotation.y as f64,
+                z: transform.rotation.z as f64,
             },
             s: transform.rotation.w as f64,
         },
-        translation: transform_gizmo_egui::mint::Vector3::<f64>::from_slice(&transform.translation.as_dvec3().to_array()),
+        translation: transform_gizmo_egui::mint::Vector3::<f64>::from_slice(
+            &transform.translation.as_dvec3().to_array(),
+        ),
     }
 }
 
@@ -255,17 +257,33 @@ impl EditorTool for GizmoTool {
 
             let proj_mat = cam_proj.get_clip_from_view();
             let proj_mat = transform_gizmo_egui::math::DMat4 {
-                x_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.x_axis.as_dvec4().to_array()),
-                y_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.y_axis.as_dvec4().to_array()),
-                z_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.z_axis.as_dvec4().to_array()),
-                w_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.w_axis.as_dvec4().to_array()),
+                x_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    proj_mat.x_axis.as_dvec4().to_array(),
+                ),
+                y_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    proj_mat.y_axis.as_dvec4().to_array(),
+                ),
+                z_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    proj_mat.z_axis.as_dvec4().to_array(),
+                ),
+                w_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    proj_mat.w_axis.as_dvec4().to_array(),
+                ),
             };
 
             let view_matrix = transform_gizmo_egui::math::DMat4 {
-                x_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.x_axis.as_dvec4().to_array()),
-                y_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.y_axis.as_dvec4().to_array()),
-                z_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.z_axis.as_dvec4().to_array()),
-                w_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.w_axis.as_dvec4().to_array()),
+                x_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    view_matrix.x_axis.as_dvec4().to_array(),
+                ),
+                y_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    view_matrix.y_axis.as_dvec4().to_array(),
+                ),
+                z_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    view_matrix.z_axis.as_dvec4().to_array(),
+                ),
+                w_axis: transform_gizmo_egui::math::DVec4::from_array(
+                    view_matrix.w_axis.as_dvec4().to_array(),
+                ),
             };
 
             let gizmo_config = transform_gizmo_egui::GizmoConfig {
@@ -280,7 +298,8 @@ impl EditorTool for GizmoTool {
 
             info!("{:?}", &mean_transform);
 
-            if let Some((result, transforms)) = self.gizmo
+            if let Some((result, transforms)) = self
+                .gizmo
                 .interact(ui, &[bevy_to_gizmo_transform(&mean_transform)])
             {
                 gizmo_interacted = true;
@@ -340,17 +359,33 @@ impl EditorTool for GizmoTool {
 
                 let proj_mat = cam_proj.get_clip_from_view();
                 let proj_mat = transform_gizmo_egui::math::DMat4 {
-                    x_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.x_axis.as_dvec4().to_array()),
-                    y_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.y_axis.as_dvec4().to_array()),
-                    z_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.z_axis.as_dvec4().to_array()),
-                    w_axis: transform_gizmo_egui::math::DVec4::from_array(proj_mat.w_axis.as_dvec4().to_array()),
+                    x_axis: transform_gizmo_egui::math::DVec4::from_array(
+                        proj_mat.x_axis.as_dvec4().to_array(),
+                    ),
+                    y_axis: transform_gizmo_egui::math::DVec4::from_array(
+                        proj_mat.y_axis.as_dvec4().to_array(),
+                    ),
+                    z_axis: transform_gizmo_egui::math::DVec4::from_array(
+                        proj_mat.z_axis.as_dvec4().to_array(),
+                    ),
+                    w_axis: transform_gizmo_egui::math::DVec4::from_array(
+                        proj_mat.w_axis.as_dvec4().to_array(),
+                    ),
                 };
 
                 let view_matrix = transform_gizmo_egui::math::DMat4 {
-                    x_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.x_axis.as_dvec4().to_array()),
-                    y_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.y_axis.as_dvec4().to_array()),
-                    z_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.z_axis.as_dvec4().to_array()),
-                    w_axis: transform_gizmo_egui::math::DVec4::from_array(view_matrix.w_axis.as_dvec4().to_array()),
+                    x_axis: transform_gizmo_egui::math::DVec4::from_array(
+                        view_matrix.x_axis.as_dvec4().to_array(),
+                    ),
+                    y_axis: transform_gizmo_egui::math::DVec4::from_array(
+                        view_matrix.y_axis.as_dvec4().to_array(),
+                    ),
+                    z_axis: transform_gizmo_egui::math::DVec4::from_array(
+                        view_matrix.z_axis.as_dvec4().to_array(),
+                    ),
+                    w_axis: transform_gizmo_egui::math::DVec4::from_array(
+                        view_matrix.w_axis.as_dvec4().to_array(),
+                    ),
                 };
 
                 let gizmo_config = transform_gizmo_egui::GizmoConfig {
@@ -366,19 +401,25 @@ impl EditorTool for GizmoTool {
                         if let Some(parent_global) = unsafe { parent.get::<GlobalTransform>() } {
                             if let Some(global) = unsafe { ecell.get::<GlobalTransform>() } {
                                 if let Some((result, transforms)) = Gizmo::new(gizmo_config)
-                                    .interact(ui, &[bevy_to_gizmo_transform(&global.compute_transform())])
+                                    .interact(
+                                        ui,
+                                        &[bevy_to_gizmo_transform(&global.compute_transform())],
+                                    )
                                 {
                                     disable_pan_orbit = true;
                                     let new_transform = gizmo_to_bevy_transform(&transforms[0]);
 
                                     if clone_pressed {
                                         if self.is_move_cloned_entities {
-                                            let new_transform = GlobalTransform::from(new_transform);
+                                            let new_transform =
+                                                GlobalTransform::from(new_transform);
                                             *transform = new_transform.reparented_to(parent_global);
                                             transform.set_changed();
                                             disable_pan_orbit = true;
                                         } else {
-                                            unsafe { cell.world_mut().send_event(CloneEvent { id: *e }) };
+                                            unsafe {
+                                                cell.world_mut().send_event(CloneEvent { id: *e })
+                                            };
                                             self.is_move_cloned_entities = true;
                                         }
                                     } else {
@@ -395,7 +436,8 @@ impl EditorTool for GizmoTool {
 
                 self.gizmo.update_config(gizmo_config);
 
-                if let Some((result, transforms)) = self.gizmo
+                if let Some((result, transforms)) = self
+                    .gizmo
                     .interact(ui, &[bevy_to_gizmo_transform(&transform)])
                 {
                     if clone_pressed {
@@ -440,7 +482,6 @@ trait ToButton {
 
 impl ToButton for EnumSet<GizmoMode> {
     fn to_button(&self, size: &Sizing) -> egui::Button {
-
         if *self == GizmoMode::all_translate() {
             return translate_icon(size.gizmos.to_size(), "");
         } else if *self == GizmoMode::all_scale() {
diff --git a/crates/editor_ui/src/ui_plugin.rs b/crates/editor_ui/src/ui_plugin.rs
index ae71dfda..6df0a74b 100644
--- a/crates/editor_ui/src/ui_plugin.rs
+++ b/crates/editor_ui/src/ui_plugin.rs
@@ -1,7 +1,7 @@
+use crate::tools::gizmo::*;
 use crate::*;
 use bevy::{ecs::schedule::ScheduleLabel, prelude::*};
 use meshless_visualizer::draw_light_gizmo;
-use crate::tools::gizmo::*;
 
 use self::{change_chain::ChangeChainViewPlugin, editor_tab_name::EditorTabName};
 
@@ -98,7 +98,6 @@ impl Default for EditorUiCore {
 #[derive(ScheduleLabel, Debug, Hash, PartialEq, Eq, Clone)]
 struct AfterStateTransition;
 
-
 impl Plugin for EditorUiCore {
     #[cfg(not(tarpaulin_include))]
     fn build(&self, app: &mut App) {
@@ -162,10 +161,7 @@ impl Plugin for EditorUiCore {
             .resource_mut::<MainScheduleOrder>()
             .insert_after(StateTransition, AfterStateTransition);
 
-        app.add_systems(
-            Startup,
-            (set_start_state, apply_deferred).chain(),
-        );
+        app.add_systems(Startup, (set_start_state, apply_deferred).chain());
 
         //play systems
         app.add_systems(OnEnter(EditorState::GamePrepare), save_prefab_before_play);
diff --git a/crates/prefab/src/component/shape.rs b/crates/prefab/src/component/shape.rs
index 335cc645..7016aa58 100644
--- a/crates/prefab/src/component/shape.rs
+++ b/crates/prefab/src/component/shape.rs
@@ -355,10 +355,7 @@ impl Plane3dPrefab {
     pub fn to_mesh(&self) -> Mesh {
         let data = math_shapes::Plane3d {
             normal: self.normal,
-            half_size: Vec2 {
-                x: 0.5,
-                y: 0.5,
-            },
+            half_size: Vec2 { x: 0.5, y: 0.5 },
         };
         Mesh::from(data)
     }
@@ -366,10 +363,7 @@ impl Plane3dPrefab {
     pub const fn to_plane3d(&self) -> Plane3d {
         math_shapes::Plane3d {
             normal: self.normal,
-            half_size: Vec2 {
-                x: 0.5,
-                y: 0.5,
-            },
+            half_size: Vec2 { x: 0.5, y: 0.5 },
         }
     }
 }
@@ -559,10 +553,7 @@ mod tests {
         let prefab = Plane3dPrefab::default();
         let plane3d = math_shapes::Plane3d {
             normal: Dir3::try_from(Vec3::Y).unwrap(),
-            half_size: Vec2 {
-                x: 0.5, 
-                y: 0.5,
-            },
+            half_size: Vec2 { x: 0.5, y: 0.5 },
         };
         assert_eq!(prefab.to_plane3d(), plane3d);
     }
@@ -572,10 +563,7 @@ mod tests {
         let prefab = PlaneMultiPointPrefab::default();
         let plane3d = math_shapes::Plane3d {
             normal: Dir3::try_from(Vec3::Y).unwrap(),
-            half_size: Vec2 {
-                x: 0.5, 
-                y: 0.5,
-            },
+            half_size: Vec2 { x: 0.5, y: 0.5 },
         };
         assert_eq!(prefab.to_plane3d(), plane3d);
     }
diff --git a/crates/prefab/src/component/sprite.rs b/crates/prefab/src/component/sprite.rs
index e98f9713..65553d7c 100644
--- a/crates/prefab/src/component/sprite.rs
+++ b/crates/prefab/src/component/sprite.rs
@@ -157,7 +157,7 @@ impl TextureAtlasPrefab {
             Some(UVec2 {
                 x: self.offset.unwrap().x.round() as u32,
                 y: self.offset.unwrap().y.round() as u32,
-            })
+            }),
         );
         Some(texture_layout_assets.add(texture_layout))
     }
diff --git a/crates/prefab/src/editor_registry/mod.rs b/crates/prefab/src/editor_registry/mod.rs
index 24e8a4d1..731c1bf2 100644
--- a/crates/prefab/src/editor_registry/mod.rs
+++ b/crates/prefab/src/editor_registry/mod.rs
@@ -485,7 +485,11 @@ mod tests {
         }
 
         assert_eq!(
-            app.world_mut().entity(new_e_id).get::<Name>().unwrap().as_str(),
+            app.world_mut()
+                .entity(new_e_id)
+                .get::<Name>()
+                .unwrap()
+                .as_str(),
             name
         );
     }
diff --git a/crates/prefab/src/load.rs b/crates/prefab/src/load.rs
index ab200fc2..eb167cf1 100644
--- a/crates/prefab/src/load.rs
+++ b/crates/prefab/src/load.rs
@@ -170,7 +170,9 @@ mod test {
             .query_filtered::<Entity, (With<PrefabAutoChild>, With<PrefabMarker>)>();
         assert_eq!(query.iter(&app.world()).count(), 0);
 
-        let mut query = app.world_mut().query_filtered::<Entity, With<PrefabAutoChild>>();
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<PrefabAutoChild>>();
         assert_eq!(query.iter(&app.world()).count(), 2);
     }
 }
diff --git a/crates/prefab/src/plugins.rs b/crates/prefab/src/plugins.rs
index a979b246..21747c60 100644
--- a/crates/prefab/src/plugins.rs
+++ b/crates/prefab/src/plugins.rs
@@ -407,7 +407,9 @@ mod test {
 
         app.update();
 
-        let mut query = app.world_mut().query_filtered::<Entity, With<ViewVisibility>>();
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<ViewVisibility>>();
         assert_eq!(query.iter(&app.world_mut()).count(), 3);
 
         let mut query = app.world_mut().query::<&InheritedVisibility>();
@@ -433,7 +435,9 @@ mod test {
 
         app.update();
 
-        let mut query = app.world_mut().query_filtered::<Entity, With<ViewVisibility>>();
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<ViewVisibility>>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
diff --git a/crates/prefab/src/save.rs b/crates/prefab/src/save.rs
index 012e910f..d5a84b4b 100644
--- a/crates/prefab/src/save.rs
+++ b/crates/prefab/src/save.rs
@@ -299,7 +299,9 @@ mod tests {
         .add_systems(Update, prepare_children);
         app.update();
 
-        let mut query = app.world_mut().query_filtered::<Entity, With<ChildrenPrefab>>();
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<ChildrenPrefab>>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
@@ -320,7 +322,9 @@ mod tests {
         .add_systems(Update, delete_prepared_children);
         app.update();
 
-        let mut query = app.world_mut().query_filtered::<Entity, With<ChildrenPrefab>>();
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<ChildrenPrefab>>();
         assert_eq!(query.iter(&app.world_mut()).count(), 0);
     }
 
@@ -384,7 +388,9 @@ mod tests {
         .add_systems(Update, prepare_children);
         app.update();
 
-        let mut query = app.world_mut().query_filtered::<Entity, With<ChildrenPrefab>>();
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<ChildrenPrefab>>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 }
diff --git a/crates/prefab/src/spawn_system.rs b/crates/prefab/src/spawn_system.rs
index bb2467de..9a498372 100644
--- a/crates/prefab/src/spawn_system.rs
+++ b/crates/prefab/src/spawn_system.rs
@@ -265,7 +265,9 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world_mut().query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
+        let mut query = app
+            .world_mut()
+            .query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
@@ -300,7 +302,9 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world_mut().query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
+        let mut query = app
+            .world_mut()
+            .query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
     }
 
@@ -338,7 +342,9 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world_mut().query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
+        let mut query = app
+            .world_mut()
+            .query::<(&MeshPrimitive2dPrefab, &Mesh2dHandle)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
 
         let mut query = app
@@ -350,7 +356,9 @@ mod tests {
             .remove::<MeshPrimitive2dPrefab>();
 
         app.update();
-        let mut query = app.world_mut().query_filtered::<Entity, With<Mesh2dHandle>>();
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<Mesh2dHandle>>();
         assert_eq!(query.iter(&app.world_mut()).count(), 0);
     }
 
@@ -367,7 +375,9 @@ mod tests {
 
         app.update();
 
-        let mut query = app.world_mut().query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
+        let mut query = app
+            .world_mut()
+            .query::<(&MeshPrimitive3dPrefab, &Handle<Mesh>)>();
         assert_eq!(query.iter(&app.world_mut()).count(), 1);
 
         let mut query = app
@@ -379,7 +389,9 @@ mod tests {
             .remove::<MeshPrimitive3dPrefab>();
 
         app.update();
-        let mut query = app.world_mut().query_filtered::<Entity, With<Handle<Mesh>>>();
+        let mut query = app
+            .world_mut()
+            .query_filtered::<Entity, With<Handle<Mesh>>>();
         assert_eq!(query.iter(&app.world_mut()).count(), 0);
     }
 
@@ -473,9 +485,11 @@ mod tests {
 
         app.update();
 
-        let mut parent_query = app
-            .world_mut()
-            .query_filtered::<Entity, (Without<WantChildPath>, Without<Parent>, With<Children>)>();
+        let mut parent_query = app.world_mut().query_filtered::<Entity, (
+            Without<WantChildPath>,
+            Without<Parent>,
+            With<Children>,
+        )>();
         assert_eq!(parent_query.iter(&app.world_mut()).count(), 1);
 
         let possibilities = vec![vec![0], vec![1], vec![0, 0], vec![1, 0], vec![]];
diff --git a/crates/prefab/src/sub_scene/mod.rs b/crates/prefab/src/sub_scene/mod.rs
index fb4c30d9..fd9d49e8 100644
--- a/crates/prefab/src/sub_scene/mod.rs
+++ b/crates/prefab/src/sub_scene/mod.rs
@@ -1,7 +1,8 @@
 use std::any::TypeId;
 
 use bevy::{
-    ecs::world::unsafe_world_cell::UnsafeWorldCell, prelude::*, reflect::TypeRegistryArc, scene::serde::SceneDeserializer, utils::HashSet
+    ecs::world::unsafe_world_cell::UnsafeWorldCell, prelude::*, reflect::TypeRegistryArc,
+    scene::serde::SceneDeserializer, utils::HashSet,
 };
 use serde::de::DeserializeSeed;
 #[cfg(feature = "editor")]
diff --git a/crates/undo/src/lib.rs b/crates/undo/src/lib.rs
index a6d2d89f..bba589d3 100644
--- a/crates/undo/src/lib.rs
+++ b/crates/undo/src/lib.rs
@@ -690,7 +690,8 @@ impl AppAutoUndo for App {
             return self;
         }
 
-        self.world_mut().insert_resource(AutoUndoStorage::<T>::default());
+        self.world_mut()
+            .insert_resource(AutoUndoStorage::<T>::default());
         self.add_event::<UndoRedoApplied<T>>();
 
         self.add_systems(
@@ -715,7 +716,8 @@ impl AppAutoUndo for App {
             return self;
         }
 
-        self.world_mut().insert_resource(AutoUndoStorage::<T>::default());
+        self.world_mut()
+            .insert_resource(AutoUndoStorage::<T>::default());
         self.add_event::<UndoRedoApplied<T>>();
 
         self.add_systems(
diff --git a/crates/undo/src/tests.rs b/crates/undo/src/tests.rs
index ecd2faf0..504264b8 100644
--- a/crates/undo/src/tests.rs
+++ b/crates/undo/src/tests.rs
@@ -32,21 +32,33 @@ fn test_undo() {
         .entity_mut(test_id)
         .insert(Name::default())
         .insert(UndoMarker);
-    app.world_mut().get_mut::<Name>(test_id).unwrap().set_changed();
+    app.world_mut()
+        .get_mut::<Name>(test_id)
+        .unwrap()
+        .set_changed();
     repeat_update(&mut app, 10);
     assert!(app.world_mut().get_entity(test_id).is_some());
 
     app.world_mut().get_mut::<Name>(test_id).unwrap().set("foo");
     repeat_update(&mut app, 10);
-    assert_eq!(app.world_mut().get::<Name>(test_id).unwrap().to_string(), "foo");
+    assert_eq!(
+        app.world_mut().get::<Name>(test_id).unwrap().to_string(),
+        "foo"
+    );
 
     app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
-    assert_eq!(app.world_mut().get::<Name>(test_id).unwrap().to_string(), "");
+    assert_eq!(
+        app.world_mut().get::<Name>(test_id).unwrap().to_string(),
+        ""
+    );
 
     app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 4);
-    assert_eq!(app.world_mut().get::<Name>(test_id).unwrap().to_string(), "foo");
+    assert_eq!(
+        app.world_mut().get::<Name>(test_id).unwrap().to_string(),
+        "foo"
+    );
     app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
 
@@ -90,14 +102,20 @@ fn test_reflected_undo() {
     repeat_update(&mut app, 10);
     assert!(app.world_mut().get_entity(test_id).is_some());
 
-    app.world_mut().get_mut::<Transform>(test_id).unwrap().translation = Vec3::X;
+    app.world_mut()
+        .get_mut::<Transform>(test_id)
+        .unwrap()
+        .translation = Vec3::X;
     app.world_mut()
         .get_mut::<Transform>(test_id)
         .unwrap()
         .set_changed();
     repeat_update(&mut app, 10);
     assert_eq!(
-        app.world_mut().get::<Transform>(test_id).unwrap().translation,
+        app.world_mut()
+            .get::<Transform>(test_id)
+            .unwrap()
+            .translation,
         Vec3::X
     );
     assert_eq!(app.world_mut().resource::<ChangeChain>().changes.len(), 3);
@@ -105,14 +123,20 @@ fn test_reflected_undo() {
     app.world_mut().send_event(UndoRedo::Undo);
     repeat_update(&mut app, 2);
     assert_eq!(
-        app.world_mut().get::<Transform>(test_id).unwrap().translation,
+        app.world_mut()
+            .get::<Transform>(test_id)
+            .unwrap()
+            .translation,
         Vec3::ZERO
     );
 
     app.world_mut().send_event(UndoRedo::Redo);
     repeat_update(&mut app, 4);
     assert_eq!(
-        app.world_mut().get::<Transform>(test_id).unwrap().translation,
+        app.world_mut()
+            .get::<Transform>(test_id)
+            .unwrap()
+            .translation,
         Vec3::X
     );
     app.world_mut().send_event(UndoRedo::Undo);
@@ -190,7 +214,10 @@ fn test_redo() {
         .entity_mut(test_id)
         .insert(Name::default())
         .insert(UndoMarker);
-    app.world_mut().get_mut::<Name>(test_id).unwrap().set_changed();
+    app.world_mut()
+        .get_mut::<Name>(test_id)
+        .unwrap()
+        .set_changed();
     repeat_update(&mut app, 10);
     assert!(app.world_mut().get_entity(test_id).is_some());
 
diff --git a/examples/platformer.rs b/examples/platformer.rs
index 2d0a2811..a6be00aa 100644
--- a/examples/platformer.rs
+++ b/examples/platformer.rs
@@ -1,3 +1,4 @@
+use avian3d::prelude::*;
 /// Simple platformer example
 /// Run command:
 /// cargo run --example platformer --features bevy_xpbd_3d
@@ -6,7 +7,6 @@ use bevy::{
     prelude::*,
 };
 use space_editor::prelude::*;
-use avian3d::prelude::*;
 
 fn main() {
     App::default()
diff --git a/modules/bevy_xpbd_plugin/src/collider.rs b/modules/bevy_xpbd_plugin/src/collider.rs
index 5cd140ba..0c509528 100644
--- a/modules/bevy_xpbd_plugin/src/collider.rs
+++ b/modules/bevy_xpbd_plugin/src/collider.rs
@@ -96,7 +96,7 @@ impl ColliderPrimitive {
         match self {
             Self::Cuboid(bbox) => Collider::cuboid(bbox.x, bbox.y, bbox.z),
             Self::Capsule { height, radius } => Collider::capsule(*height, *radius),
-            Self::CapsuleEndpoints { a, b, radius } => Collider::capsule_endpoints(*radius,*a, *b),
+            Self::CapsuleEndpoints { a, b, radius } => Collider::capsule_endpoints(*radius, *a, *b),
             Self::Cone { height, radius } => Collider::cone(*height, *radius),
             Self::Cylinder { height, radius } => Collider::cylinder(*height, *radius),
             Self::Halfspace { outward_normal } => Collider::half_space(*outward_normal),
diff --git a/modules/bevy_xpbd_plugin/src/registry.rs b/modules/bevy_xpbd_plugin/src/registry.rs
index 27324f6f..625bfef9 100644
--- a/modules/bevy_xpbd_plugin/src/registry.rs
+++ b/modules/bevy_xpbd_plugin/src/registry.rs
@@ -1,5 +1,5 @@
-use bevy::prelude::*;
 use avian3d::prelude::*;
+use bevy::prelude::*;
 use collider::ColliderPrefab;
 use space_editor_ui::{
     prelude::{EditorRegistryExt, EditorState, PrefabSet},
diff --git a/modules/bevy_xpbd_plugin/src/spatial_query.rs b/modules/bevy_xpbd_plugin/src/spatial_query.rs
index ca81f309..3b9eb085 100644
--- a/modules/bevy_xpbd_plugin/src/spatial_query.rs
+++ b/modules/bevy_xpbd_plugin/src/spatial_query.rs
@@ -1,4 +1,7 @@
-use avian3d::{math::{Quaternion, Vector}, spatial_query::{RayCaster, ShapeCaster}};
+use avian3d::{
+    math::{Quaternion, Vector},
+    spatial_query::{RayCaster, ShapeCaster},
+};
 use bevy::prelude::*;
 use space_editor_ui::{ext::bevy_inspector_egui::prelude::*, prelude::*};
 
@@ -30,10 +33,7 @@ impl Default for RayCasterPrefab {
 
 impl From<RayCasterPrefab> for RayCaster {
     fn from(val: RayCasterPrefab) -> Self {
-        Self::new(
-            val.origin,
-            Dir3::new_unchecked(val.direction.normalize()),
-        )
+        Self::new(val.origin, Dir3::new_unchecked(val.direction.normalize()))
     }
 }
 

From 4f17daac08c9db7aea56f88e7a1eb314f7bba236 Mon Sep 17 00:00:00 2001
From: rewin <rewin1996@gmail.com>
Date: Sat, 14 Sep 2024 08:01:20 +0300
Subject: [PATCH 17/17] Remove platformer (its need for full redo)

---
 Cargo.toml                    |   4 -
 examples/custom_editor_tab.rs |   4 +-
 examples/platformer.rs        | 153 ----------------------------------
 3 files changed, 2 insertions(+), 159 deletions(-)
 delete mode 100644 examples/platformer.rs

diff --git a/Cargo.toml b/Cargo.toml
index cf89204f..faacc280 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -160,10 +160,6 @@ default = [
     "space_prefab/editor", 
 ]
 
-[[example]]
-name = "platformer"
-required-features = ["bevy_xpbd_3d"]
-
 
 [[example]]
 name = "spawn_prefab_with_physics"
diff --git a/examples/custom_editor_tab.rs b/examples/custom_editor_tab.rs
index 183868fd..d58c7113 100644
--- a/examples/custom_editor_tab.rs
+++ b/examples/custom_editor_tab.rs
@@ -42,8 +42,8 @@ impl TabName for CustomTabName {
     /// Return title of the tab
     fn title(&self) -> String {
         match self {
-            CustomTabName::TraitBased => String::from("Trait Based"),
-            CustomTabName::SystemBased => String::from("System Based"),
+            Self::TraitBased => String::from("Trait Based"),
+            Self::SystemBased => String::from("System Based"),
         }
     }
 }
diff --git a/examples/platformer.rs b/examples/platformer.rs
deleted file mode 100644
index a6be00aa..00000000
--- a/examples/platformer.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use avian3d::prelude::*;
-/// Simple platformer example
-/// Run command:
-/// cargo run --example platformer --features bevy_xpbd_3d
-use bevy::{
-    ecs::{entity::MapEntities, reflect::ReflectMapEntities},
-    prelude::*,
-};
-use space_editor::prelude::*;
-
-fn main() {
-    App::default()
-        .add_plugins(DefaultPlugins)
-        .add_plugins(SpaceEditorPlugin)
-        .add_systems(Startup, simple_editor_setup)
-        .add_systems(Startup, configure_editor)
-        .editor_registry::<PlayerController>()
-        .editor_relation::<PlayerController, RigidBodyPrefab>()
-        .editor_relation::<PlayerController, RayCasterPrefab>()
-        .editor_registry::<FollowCamera>()
-        .editor_relation::<FollowCamera, Camera3d>()
-        // .add_systems(Update, move_player.run_if(in_state(EditorState::Game)))
-        // .add_systems(Update, camera_follow.run_if(in_state(EditorState::Game)))
-        .run();
-}
-
-fn configure_editor(mut load_event: EventWriter<EditorEvent>) {
-    load_event.send(EditorEvent::Load(EditorPrefabPath::File(
-        "scenes/platformer.scn.ron".to_string(),
-    )));
-}
-
-#[derive(Component, Reflect, Clone)]
-#[reflect(Component, Default)]
-struct PlayerController {
-    pub speed: f32,
-    pub jump_speed: f32,
-    jumped: bool,
-}
-
-impl Default for PlayerController {
-    fn default() -> Self {
-        Self {
-            speed: 10.0,
-            jump_speed: 100.0,
-            jumped: false,
-        }
-    }
-}
-
-#[derive(Component, Reflect, Clone)]
-#[reflect(Component, Default, MapEntities)]
-struct FollowCamera {
-    pub dist: f32,
-    pub target: EntityLink,
-    pub speed: f32,
-}
-
-impl Default for FollowCamera {
-    fn default() -> Self {
-        Self {
-            dist: 10.0,
-            target: EntityLink::default(),
-            speed: 10.0,
-        }
-    }
-}
-
-impl MapEntities for FollowCamera {
-    fn map_entities<M: EntityMapper>(&mut self, entity_mapper: &mut M) {
-        self.target.entity = entity_mapper.map_entity(self.target.entity);
-    }
-}
-
-fn move_player(
-    keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut query: Query<(
-        Entity,
-        &mut LinearVelocity,
-        &mut AngularVelocity,
-        &mut PlayerController,
-        &RayHits,
-        &mut Transform,
-    )>,
-    time: Res<Time>,
-) {
-    for (_e, mut vel, mut rot, mut controller, hits, transform) in query.iter_mut() {
-        //take 1th hit, because 0th hit is self hit
-        if let Some(hit) = hits.iter_sorted().next() {
-            if hit.time_of_impact > 0.7 {
-                continue;
-            }
-            info!("time of impact: {:?} {:?}", hit.entity, hit.time_of_impact);
-            let frw = transform.forward();
-            // let up = transform.up();
-            let right = transform.right();
-
-            let mut target_vel = Vector::new(0.0, 0.0, 0.0);
-            if keyboard_input.pressed(KeyCode::KeyW) {
-                target_vel += Vec3::from(frw);
-            }
-            if keyboard_input.pressed(KeyCode::KeyS) {
-                target_vel -= Vec3::from(frw);
-            }
-            //rotate
-            if keyboard_input.pressed(KeyCode::KeyA) {
-                rot.y = 2.0;
-            }
-            if keyboard_input.pressed(KeyCode::KeyD) {
-                rot.y = -2.0;
-            }
-            if !keyboard_input.pressed(KeyCode::KeyA) && !keyboard_input.pressed(KeyCode::KeyD) {
-                rot.y -= 10.0 * rot.y * time.delta_seconds();
-            }
-
-            target_vel *= controller.speed;
-
-            info!("target_vel: {:?}", target_vel);
-
-            //smooth change vel
-            let mut cur_vel = vel.0;
-            cur_vel = vel.0 + (target_vel - cur_vel) * 10.0 * time.delta_seconds();
-
-            if keyboard_input.just_pressed(KeyCode::Space) && !controller.jumped {
-                cur_vel += right * controller.jump_speed / 12.0;
-                controller.jumped = true;
-            }
-            if !keyboard_input.just_pressed(KeyCode::Space) {
-                controller.jumped = false;
-            }
-
-            vel.0 = cur_vel;
-        } else {
-            info!("no hits");
-        }
-    }
-}
-
-fn camera_follow(
-    targets: Query<&Position, Without<FollowCamera>>,
-    mut cameras: Query<(&mut Transform, &FollowCamera)>,
-    time: Res<Time>,
-) {
-    for (mut cam_transform, cam) in cameras.iter_mut() {
-        if cam.target.entity != Entity::PLACEHOLDER {
-            if let Ok(target_transform) = targets.get(cam.target.entity) {
-                let look_pos = cam_transform.translation + cam_transform.forward() * cam.dist;
-                let dp = target_transform.0 - look_pos;
-                cam_transform.translation += dp * time.delta_seconds() * cam.speed;
-            }
-        }
-    }
-}