From 0cbe258fec6362e6c26ae2173f01e9a049cd5eb1 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Mon, 13 Mar 2023 22:35:41 +0100
Subject: [PATCH 01/13] Start moving to Bevy 0.10: Port deps

---
 Cargo.lock                                   | 1473 +++++++++---------
 Cargo.toml                                   |   75 +-
 src/bevy_config.rs                           |   19 +-
 src/file_system_interaction/asset_loading.rs |    6 +-
 src/ingame_menu.rs                           |    6 +-
 src/level_instantiation/grass.rs             |   14 +-
 src/level_instantiation/map.rs               |   10 +-
 src/menu.rs                                  |    9 +-
 src/movement/navigation.rs                   |   52 +-
 src/particles/init.rs                        |    2 +-
 src/player_control/camera.rs                 |    7 +-
 src/world_interaction/dialog.rs              |    6 +-
 src/world_interaction/interactions_ui.rs     |   13 +-
 13 files changed, 813 insertions(+), 879 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2c7ce018..cc7b6f11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,16 +19,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "accesskit"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38"
 
 [[package]]
-name = "adler32"
-version = "1.2.0"
+name = "accesskit_consumer"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9"
+dependencies = [
+ "accesskit",
+]
+
+[[package]]
+name = "accesskit_macos"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc50af17818440f580a894536c4c5a95ff9e4bad59f19ee68757ca959d001813"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "objc2",
+ "once_cell",
+]
+
+[[package]]
+name = "accesskit_windows"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "arrayvec",
+ "once_cell",
+ "paste",
+ "windows 0.44.0",
+]
+
+[[package]]
+name = "accesskit_winit"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eb880d83a5502edd311bdb3af1cf7113b250c9c2d92fbdd05342c7b9f38bf51"
+dependencies = [
+ "accesskit",
+ "accesskit_macos",
+ "accesskit_windows",
+ "winit",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
@@ -84,23 +140,35 @@ dependencies = [
 ]
 
 [[package]]
-name = "android_log-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
-
-[[package]]
-name = "android_logger"
-version = "0.11.3"
+name = "android-activity"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a"
+checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6"
 dependencies = [
- "android_log-sys",
- "env_logger",
+ "android-properties",
+ "bitflags",
+ "cc",
+ "jni-sys",
+ "libc",
  "log",
- "once_cell",
+ "ndk 0.7.0",
+ "ndk-context",
+ "ndk-sys 0.4.1+23.1.7779620",
+ "num_enum",
 ]
 
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
+[[package]]
+name = "android_log-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -125,25 +193,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "arboard"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc120354d1b5ec6d7aaf4876b602def75595937b5e15d356eb554ab5177e08bb"
-dependencies = [
- "clipboard-win",
- "core-graphics",
- "image 0.23.14",
- "log",
- "objc",
- "objc-foundation",
- "objc_id",
- "parking_lot",
- "thiserror",
- "winapi",
- "x11rb 0.9.0",
-]
-
 [[package]]
 name = "arboard"
 version = "3.2.0"
@@ -152,7 +201,7 @@ checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854"
 dependencies = [
  "clipboard-win",
  "core-graphics",
- "image 0.24.5",
+ "image",
  "log",
  "objc",
  "objc-foundation",
@@ -161,7 +210,7 @@ dependencies = [
  "parking_lot",
  "thiserror",
  "winapi",
- "x11rb 0.10.1",
+ "x11rb",
 ]
 
 [[package]]
@@ -185,7 +234,7 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
 dependencies = [
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
  "event-listener",
  "futures-core",
 ]
@@ -198,7 +247,7 @@ checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
 dependencies = [
  "async-lock",
  "async-task",
- "concurrent-queue 2.1.0",
+ "concurrent-queue",
  "fastrand",
  "futures-lite",
  "slab",
@@ -238,6 +287,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "base-x"
 version = "0.2.11"
@@ -252,9 +316,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "bevy"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dae99b246505811f5bc19d2de1e406ec5d2816b421d58fa223779eb576f472c9"
+checksum = "cc88fece4660d68690585668f1a4e18e6dcbab160b08f337b498a96ccde91cfe"
 dependencies = [
  "bevy_dylib",
  "bevy_internal",
@@ -262,9 +326,9 @@ dependencies = [
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.17.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be4f9fa859e4840e7cbcc0ddf2c8a1441ff8f663c317769c5ccc70cdf13bcf2"
+checksum = "94f7ebaedaa0083df7c3679094e25eccebbaa9c4c60c3a5e74337f6402af2291"
 dependencies = [
  "bevy-inspector-egui-derive",
  "bevy_app",
@@ -272,7 +336,7 @@ dependencies = [
  "bevy_core",
  "bevy_core_pipeline",
  "bevy_ecs",
- "bevy_egui 0.19.0",
+ "bevy_egui",
  "bevy_hierarchy",
  "bevy_log",
  "bevy_math",
@@ -280,8 +344,9 @@ dependencies = [
  "bevy_reflect",
  "bevy_render",
  "bevy_utils",
+ "bevy_window",
  "egui",
- "image 0.24.5",
+ "image",
  "once_cell",
  "pretty-type-name",
  "smallvec",
@@ -289,20 +354,32 @@ dependencies = [
 
 [[package]]
 name = "bevy-inspector-egui-derive"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97826e6225a5b56e77683e7b99418171f7531d48682b8531252dc6b8ef3e8113"
+checksum = "fc47dfcdcb52182af97741c1582cc9b3bb4e82f0adacf4c3e78909d438cbfc8b"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "bevy_a11y"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a10b25cf04971b9d68271aa54e4601c673509db6edaf1f5359dd91fb3e84cc27"
+dependencies = [
+ "accesskit",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+]
+
 [[package]]
 name = "bevy_animation"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d43b8073f299eb60ce9e1d60fa293b348590dd57aca8321d6859d9e7aa57d2da"
+checksum = "1aabb803571785797c84e106ed63427eaf2cb12832a591923707896ee000bde8"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -318,9 +395,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "536e4d0018347478545ed8b6cb6e57b9279ee984868e81b7c0e78e0fb3222e42"
+checksum = "960c6e444dc6a25dd51a2196f04872ae9e2e876802b66c391104849ec9225e38"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -333,9 +410,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db1bb550168304df69c867c09125e1aae7ff51cf21575396e1598bf293442c4"
+checksum = "adea538a3d166c8609621994972c31be591c96f931f160f96e74697d8c24ba45"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -345,11 +422,11 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
+ "bevy_winit",
  "crossbeam-channel",
  "downcast-rs",
  "fastrand",
  "js-sys",
- "ndk-glue",
  "notify",
  "parking_lot",
  "serde",
@@ -361,8 +438,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_loader"
-version = "0.14.1"
-source = "git+https://github.com/NiklasEi/bevy_asset_loader.git?rev=be7f9005db76224912a06742ed521557262b50fe#be7f9005db76224912a06742ed521557262b50fe"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "118490c65031cecd6586e6b2cbd16f05bc161438dd0d30c42e307638eab7daba"
 dependencies = [
  "anyhow",
  "bevy",
@@ -372,48 +450,33 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_loader_derive"
-version = "0.14.0"
-source = "git+https://github.com/NiklasEi/bevy_asset_loader.git?rev=be7f9005db76224912a06742ed521557262b50fe#be7f9005db76224912a06742ed521557262b50fe"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac452d5861a4f9e69625b9a6d63a846dc9ee0e3c5ee32fe2d9c5b8cd59b916ba"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "bevy_audio"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29a05efc6c23bef37520e44029943c65b7e8a4fe4f5e54cb3f96e63ce0b3d361"
-dependencies = [
- "anyhow",
- "bevy_app",
- "bevy_asset",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_utils",
- "parking_lot",
- "rodio",
-]
-
 [[package]]
 name = "bevy_common_assets"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f6b7df078908d118a55440470962f4393ac6a4ce89b13a3cd5bff49d4a06f29"
+checksum = "2c519e2a6c2a4be9212d13e1881a6ab1c05a26107654b6ce7c8d7237642886dd"
 dependencies = [
  "anyhow",
  "bevy",
- "ron 0.7.1",
+ "ron",
  "serde",
- "toml",
+ "toml 0.7.3",
 ]
 
 [[package]]
 name = "bevy_core"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96299aceb3c8362cb4aa39ff81c7ef758a5f4e768d16b5046a91628eff114ac0"
+checksum = "ed29797fa386c6969fa1e4ef9e194a27f89ddb2fa78751fe46838495d374f90f"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -427,9 +490,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc128a9860aadf16fb343ae427f2768986fd91dce64d945455acda9759c48014"
+checksum = "3129d308df70dee3c46b6bb64e54d2552e7106fd3185d75732ad5e739a830fee"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -447,9 +510,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7baf73c58d41c353c6fd08e6764a2e7420c9f19e8227b391c50981db6d0282a6"
+checksum = "cdf11701c01bf4dc7a3fac9f4547f3643d3db4cc1682af40c8c86e2f8734b617"
 dependencies = [
  "bevy_macro_utils",
  "quote",
@@ -458,9 +521,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63bf96ec7980fa25b77ff6c72dfafada477936c0dab76c1edf6c028c0e5fe0e4"
+checksum = "576508ffe7ad5124781edd352b79bdc79ffbb6e2f26bad6f722774f7c9fd16c9"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -468,22 +531,23 @@ dependencies = [
  "bevy_log",
  "bevy_time",
  "bevy_utils",
+ "sysinfo",
 ]
 
 [[package]]
 name = "bevy_dylib"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d193c3d56e3bdd106596327d15dd67ddfd862f8b5aa8260677efefe3ddef736"
+checksum = "229dc91373e965800b834a7c036db95621d44f28d1f0bdff273f0589d1607401"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy_ecs"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c071d7c6bc9801253485e05d0c257284150de755391902746837ba21c0cf74"
+checksum = "fdc5b19451128091e8507c9247888359ca0bfa895e7f6ca749ccc55c5463bef6"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -494,16 +558,16 @@ dependencies = [
  "downcast-rs",
  "event-listener",
  "fixedbitset",
- "fxhash",
+ "rustc-hash",
  "serde",
  "thread_local",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c15bd45438eeb681ad74f2d205bb07a5699f98f9524462a30ec764afab2742ce"
+checksum = "b1e79757319533bde006a4f30c268223ec6426371297182925932075ccfdae30"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -513,20 +577,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_editor_pls"
-version = "0.2.0"
-source = "git+https://github.com/jakobhellermann/bevy_editor_pls?rev=6062b860aea87034081399369fd7ef5715f13256#6062b860aea87034081399369fd7ef5715f13256"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50fce7b60c891f752e108b7404030d2181d6425d11a76a6ac0a00b1a6bba78b9"
 dependencies = [
  "bevy",
  "bevy_editor_pls_core",
  "bevy_editor_pls_default_windows",
- "bevy_framepace",
  "egui",
 ]
 
 [[package]]
 name = "bevy_editor_pls_core"
-version = "0.2.0"
-source = "git+https://github.com/jakobhellermann/bevy_editor_pls?rev=6062b860aea87034081399369fd7ef5715f13256#6062b860aea87034081399369fd7ef5715f13256"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ebb1dbcb7a8191dac023bc4d49468cba65b1ecf3374ce48e416e59e8e977119"
 dependencies = [
  "bevy",
  "bevy-inspector-egui",
@@ -536,14 +601,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_editor_pls_default_windows"
-version = "0.2.0"
-source = "git+https://github.com/jakobhellermann/bevy_editor_pls?rev=6062b860aea87034081399369fd7ef5715f13256#6062b860aea87034081399369fd7ef5715f13256"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec5f9259a1293f82d1a8038b8d7490d3930b05d1a3b66c7a33905fdecc96192"
 dependencies = [
  "bevy",
  "bevy-inspector-egui",
  "bevy_editor_pls_core",
  "bevy_mod_debugdump",
- "bevy_mod_picking",
  "indexmap",
  "opener",
  "pretty-type-name",
@@ -551,24 +616,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_egui"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93fab81b00d664b7fd09c74eadcc8ab4a608649af1fb355647cd43f95f38ec6"
-dependencies = [
- "arboard 2.1.1",
- "bevy",
- "egui",
- "thread_local",
- "webbrowser",
-]
-
-[[package]]
-name = "bevy_egui"
-version = "0.19.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb8036050af170243e803eb68e0b5d34f549828a8de92479619fb6dac842f85"
+checksum = "1ae1391dc1820f8bb3f8f489f2348cfa5f5bd0970a4c6bcb0c1a011f65ae1b4d"
 dependencies = [
- "arboard 3.2.0",
+ "arboard",
  "bevy",
  "egui",
  "thread_local",
@@ -577,29 +629,19 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "962b6bb0d30e92ec2e6c29837acce9e55b920733a634e7c3c5fd5a514bea7a24"
+checksum = "723d4838d1f88955f348294c0a9d067307f2437725400b0776e9677154914f14"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
 ]
 
-[[package]]
-name = "bevy_framepace"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97caa0b25d627df47f7cfba0b2a9612f4b4ca9d0f53d897a3d70e02fcffea833"
-dependencies = [
- "bevy",
- "spin_sleep",
-]
-
 [[package]]
 name = "bevy_gilrs"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4af552dad82f854b2fae24f36a389fd8ee99d65fe86ae876e854e70d53ff16d9"
+checksum = "905e547d213e368f997d08f140f4e893923c7dce4760bf0fb63401232262fa79"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -610,9 +652,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gltf"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e853e346ba412354e02292c7aa5b9a9dccdfa748e273b1b7ebf8f6a172f89712"
+checksum = "bb2994d7e47c36bfe36710c4a26d3f36dd8641bfaa2c5d4d0581e001942aab6f"
 dependencies = [
  "anyhow",
  "base64",
@@ -639,9 +681,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_hanabi"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b8326f9c2e55c82f9561341cea6202b37cb71a949daf106dc496d4db85770fb"
+checksum = "a9b06096274575d6fd6099780cadeab7d72315253c30cb7a5d75706fc0f82f2b"
 dependencies = [
  "anyhow",
  "bevy",
@@ -650,15 +692,16 @@ dependencies = [
  "copyless",
  "rand",
  "rand_pcg",
- "ron 0.7.1",
+ "ron",
  "serde",
+ "typetag",
 ]
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd6d50c48c6e1bcb5e08a768b765323292bb3bf3a439b992754c57ffb85b23a"
+checksum = "ccd246c862fcaeef3a769f47c6297139f971db0c8fdd6188fe9419ee8873b7e8"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -671,9 +714,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3378b5171284f4c4c0e8307081718a9fe458f846444616bd82d69110dcabca51"
+checksum = "6c809b3df62e1fcbdc6744233ae6c95a67d2cc7e518db43ab81f417d5875ba3b"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -686,14 +729,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c46014b7e885b1311de06b6039e448454a4db55b8d35464798ba88faa186e11"
+checksum = "0a065c7ac81cd7cf3f1b8f15c4a93db5f07274ddaaec145ba7d0393be0c9c413"
 dependencies = [
+ "bevy_a11y",
  "bevy_animation",
  "bevy_app",
  "bevy_asset",
- "bevy_audio",
  "bevy_core",
  "bevy_core_pipeline",
  "bevy_derive",
@@ -719,14 +762,13 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "bevy_winit",
- "ndk-glue",
 ]
 
 [[package]]
 name = "bevy_kira_audio"
-version = "0.13.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b310ffe1c870e6ca5f0db228953f68af5a861302ec759edae43450f5835a0ece"
+checksum = "468257f6c7980d847aba0e9b6c9e4ff4045598510637d6e484b5f290c00a1f92"
 dependencies = [
  "anyhow",
  "bevy",
@@ -737,9 +779,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c480bac54cf4ae76edc3ae9ae3fa7c5e1b385e7f2111ef5ec3fd00cf3a7998b"
+checksum = "47dcb09ec71145c80d88a84181cc1449d30f23c571bdd58c59c10eece82dfaa5"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -755,20 +797,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022bb69196deeea691b6997414af85bbd7f2b34a8914c4aa7a7ff4dfa44f7677"
+checksum = "f24ca3363292f1435641fbafd5c24ce362137dd7d69bee56dcaaa2bc1d512ffe"
 dependencies = [
  "quote",
  "syn",
- "toml",
+ "toml_edit 0.19.6",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434c77ab766c806ed9062ef8a7285b3b02b47df51f188d4496199c3ac062eaf"
+checksum = "5e45e46c2ac0a92db3ae622f2ed690928fe2612e7c9470a46d0ed4c2c77e2e95"
 dependencies = [
  "glam",
  "serde",
@@ -776,54 +818,33 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbfb5908d33fd613069be516180b8f138aaaf6e41c36b1fd98c6c29c00c24a13"
+checksum = "aaa0358a79823e6f0069b910d90b615d02dad08279b5856d3d1e401472b6379a"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_mod_debugdump"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab7bd2b3324588ed47c8514081866e5d9a9d5d3aede8062f922502c4d6133ecf"
+checksum = "a1e89dfbe148a165d3506eab7e7c0b5339ccc7f238a475def713026bc9e8c706"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_render",
+ "bevy_utils",
+ "once_cell",
+ "petgraph",
  "pretty-type-name",
 ]
 
-[[package]]
-name = "bevy_mod_picking"
-version = "0.11.0"
-source = "git+https://github.com/aevyrie/bevy_mod_picking?rev=73a71c24814bbe78fb564277c8246decbabe60df#73a71c24814bbe78fb564277c8246decbabe60df"
-dependencies = [
- "bevy",
- "bevy_egui 0.18.0",
- "bevy_picking_core",
- "bevy_picking_egui",
- "bevy_picking_input",
- "bevy_picking_raycast",
- "bevy_picking_sprite",
- "bevy_picking_ui",
-]
-
-[[package]]
-name = "bevy_mod_raycast"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a5813c0224e31350919e5fbf5a2099c3be4c7b8c04e8584ee4dba4e87795a19"
-dependencies = [
- "bevy",
-]
-
 [[package]]
 name = "bevy_pbr"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310b1f260a475d81445623e138e1b7245759a42310bc1f84b550a3f4ff8763bf"
+checksum = "90230c526ee7257229c1db0fc4aafaa947ea806bb4b0674785930ea59d0cc7f8"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -841,81 +862,26 @@ dependencies = [
  "radsort",
 ]
 
-[[package]]
-name = "bevy_picking_core"
-version = "0.1.0"
-source = "git+https://github.com/aevyrie/bevy_mod_picking?rev=73a71c24814bbe78fb564277c8246decbabe60df#73a71c24814bbe78fb564277c8246decbabe60df"
-dependencies = [
- "bevy",
-]
-
-[[package]]
-name = "bevy_picking_egui"
-version = "0.1.0"
-source = "git+https://github.com/aevyrie/bevy_mod_picking?rev=73a71c24814bbe78fb564277c8246decbabe60df#73a71c24814bbe78fb564277c8246decbabe60df"
-dependencies = [
- "bevy",
- "bevy_egui 0.19.0",
- "bevy_picking_core",
-]
-
-[[package]]
-name = "bevy_picking_input"
-version = "0.1.0"
-source = "git+https://github.com/aevyrie/bevy_mod_picking?rev=73a71c24814bbe78fb564277c8246decbabe60df#73a71c24814bbe78fb564277c8246decbabe60df"
-dependencies = [
- "bevy",
- "bevy_picking_core",
-]
-
-[[package]]
-name = "bevy_picking_raycast"
-version = "0.1.0"
-source = "git+https://github.com/aevyrie/bevy_mod_picking?rev=73a71c24814bbe78fb564277c8246decbabe60df#73a71c24814bbe78fb564277c8246decbabe60df"
-dependencies = [
- "bevy",
- "bevy_mod_raycast",
- "bevy_picking_core",
-]
-
-[[package]]
-name = "bevy_picking_sprite"
-version = "0.1.0"
-source = "git+https://github.com/aevyrie/bevy_mod_picking?rev=73a71c24814bbe78fb564277c8246decbabe60df#73a71c24814bbe78fb564277c8246decbabe60df"
-dependencies = [
- "bevy",
- "bevy_picking_core",
-]
-
-[[package]]
-name = "bevy_picking_ui"
-version = "0.1.0"
-source = "git+https://github.com/aevyrie/bevy_mod_picking?rev=73a71c24814bbe78fb564277c8246decbabe60df#73a71c24814bbe78fb564277c8246decbabe60df"
-dependencies = [
- "bevy",
- "bevy_picking_core",
-]
-
 [[package]]
 name = "bevy_prototype_debug_lines"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9e933f5bf971fbc7e83b447db6758ed3b091faf4cd8e524a9406ae7acca096"
+checksum = "d8407986cbcabb473b8dc6bd92a5b0879eee065cecc72857f34391951f1dcfd2"
 dependencies = [
  "bevy",
 ]
 
 [[package]]
 name = "bevy_ptr"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec44f7655039546bc5d34d98de877083473f3e9b2b81d560c528d6d74d3eff4"
+checksum = "a96c24da064370917b92c2a84527e6a73b620c50ac5ef8b1af8c04ccf5256a7c"
 
 [[package]]
 name = "bevy_rapier3d"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77057d7ecde9cff3ad7f36faa362dd540c25a6316e160550e49915f3a765fc53"
+checksum = "b4bce8074f19467fd55ab172ae6c11fca3ca28f66804590ab10c930bd5e9cd24"
 dependencies = [
  "bevy",
  "bitflags",
@@ -927,9 +893,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6deae303a7f69dc243b2fa35b5e193cc920229f448942080c8eb2dbd9de6d37a"
+checksum = "ab880e0eed9df5c99ce1a2f89edc11cdef1bc78413719b29e9ad7e3bc27f4c20"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
@@ -947,9 +913,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bf4cb9cd5acb4193f890f36cb63679f1502e2de025e66a63b194b8b133d018"
+checksum = "3b361b8671bdffe93978270dd770b03b48560c3127fdf9003f98111fb806bb11"
 dependencies = [
  "bevy_macro_utils",
  "bit-set",
@@ -961,11 +927,12 @@ dependencies = [
 
 [[package]]
 name = "bevy_render"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e3282a8f8779d2aced93207fbed73f740937c6c2bd27bd84f0799b081c7fca5"
+checksum = "52e352868ab1a9ad9fbaa6ff025505e685781ad1790377b2d038afeb9df18214"
 dependencies = [
  "anyhow",
+ "async-channel",
  "bevy_app",
  "bevy_asset",
  "bevy_core",
@@ -978,6 +945,7 @@ dependencies = [
  "bevy_mikktspace",
  "bevy_reflect",
  "bevy_render_macros",
+ "bevy_tasks",
  "bevy_time",
  "bevy_transform",
  "bevy_utils",
@@ -987,26 +955,28 @@ dependencies = [
  "downcast-rs",
  "encase",
  "futures-lite",
- "hex",
  "hexasphere",
- "image 0.24.5",
+ "image",
+ "ktx2",
  "naga",
  "once_cell",
  "parking_lot",
  "profiling",
  "regex",
+ "ruzstd",
  "serde",
  "smallvec",
  "thiserror",
  "thread_local",
  "wgpu",
+ "wgpu-hal",
 ]
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7acae697776ac05bea523e1725cf2660c91c53abe72c66782ea1e1b9eedb572"
+checksum = "570b1d0f38439c5ac8ab75572804c9979b9caa372c49bd00803f60a22a3e1328"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -1016,9 +986,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_scene"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9c66a628c833d53bae54fe94cbc0d3f12c29e9d2e6c3f2356d45ad57db0c8c"
+checksum = "3995f756e482e964e0244a5d388e757f272d1dcdc02136730b1c45f4d5eeb516"
 dependencies = [
  "anyhow",
  "bevy_app",
@@ -1030,7 +1000,7 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
- "ron 0.8.0",
+ "ron",
  "serde",
  "thiserror",
  "uuid",
@@ -1038,9 +1008,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ec01c7db7f698d95bcb70708527c3ae6bcdc78fc247abe74f935cae8f0a1145"
+checksum = "14aa41c9480b76d7b3c3f1ed89f95c9d6e2a39d3c3367ca82c122d853ac0463e"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1063,14 +1033,14 @@ dependencies = [
 
 [[package]]
 name = "bevy_tasks"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "680b16b53df9c9f24681dd95f4d772d83760bd19adf8bca00f358a3aad997853"
+checksum = "3e368e4177fe70d695d5cb67fb7480fa262de79948d9b883a21788b9abf5a85a"
 dependencies = [
  "async-channel",
  "async-executor",
  "async-task",
- "concurrent-queue 1.2.4",
+ "concurrent-queue",
  "futures-lite",
  "once_cell",
  "wasm-bindgen-futures",
@@ -1078,9 +1048,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_text"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60c74c1bdaabde7db28f6728aa13bc7b1d744a2201b2bbfd83d2224404c57f5c"
+checksum = "33fc934d7cbadbb6dac11547dfb805d3e6b3f0b40f6e66e437fe4b3c7581cc5c"
 dependencies = [
  "ab_glyph",
  "anyhow",
@@ -1101,9 +1071,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c38a6d3ea929c7f81e6adf5a6c62cf7e8c40f5106c2174d6057e9d8ea624d"
+checksum = "d2f2863cfc08fa38909e047a1bbc2dd71d0836057ed0840c69ace9dff3e0c298"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1111,13 +1081,14 @@ dependencies = [
  "bevy_utils",
  "crossbeam-channel",
  "serde",
+ "thiserror",
 ]
 
 [[package]]
 name = "bevy_transform"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba13c57a040b89767191a6f6d720a635b7792793628bfa41a9e38b7026484aec"
+checksum = "de9cda3df545ac889b4f6b702109e51d29d7b4b6f402f2bb9b4d1d9f9c382b63"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1129,10 +1100,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e82ace6156f11fcdf2319102ff8fb8367b82d1e32b7d05d387a1963602f965"
+checksum = "dc341d652ba20fac0170a46eff8310829a862f4e52db06164dc6200706768934"
 dependencies = [
+ "bevy_a11y",
  "bevy_app",
  "bevy_asset",
  "bevy_core_pipeline",
@@ -1158,23 +1130,37 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16750aae52cd35bd7b60eb61cee883420b250e11b4a290b8d44b2b2941795739"
+checksum = "04d90ce493910ad9af3b4220ea6864c7d1472761086a98230ecac59c8d547e95"
 dependencies = [
  "ahash 0.7.6",
+ "bevy_utils_proc_macros",
  "getrandom",
  "hashbrown",
  "instant",
+ "petgraph",
+ "thiserror",
  "tracing",
  "uuid",
 ]
 
+[[package]]
+name = "bevy_utils_proc_macros"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62a42e465c446800c57a5bf65b64f4fa1c1f3a74efc2a64a2a001e4a4f548a2e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "bevy_window"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a44d3f3bd54a2261f4f57f614bf7bccc8d2832761493c0cd7dab81d98cc151e"
+checksum = "da8a2c523302ad64768991a7474c6010c76b9eb78323309ef3911521887fd108"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1182,25 +1168,30 @@ dependencies = [
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "serde",
 ]
 
 [[package]]
 name = "bevy_winit"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7b7e647ecd0b3577468da37767dcdd7c26ca9f80da0060b2ec4c77336b6d2e1"
+checksum = "8eb6eb9b9790c1ad925d900a3f315abf15b11fb56c6464747a96560e559e1a9c"
 dependencies = [
+ "accesskit_winit",
  "approx",
+ "bevy_a11y",
  "bevy_app",
+ "bevy_derive",
  "bevy_ecs",
+ "bevy_hierarchy",
  "bevy_input",
  "bevy_math",
  "bevy_utils",
  "bevy_window",
  "crossbeam-channel",
- "raw-window-handle 0.5.0",
+ "once_cell",
+ "raw-window-handle",
  "wasm-bindgen",
  "web-sys",
  "winit",
@@ -1256,6 +1247,25 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
+[[package]]
+name = "block-sys"
+version = "0.1.0-beta.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
+dependencies = [
+ "objc-sys",
+]
+
+[[package]]
+name = "block2"
+version = "0.2.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
+dependencies = [
+ "block-sys",
+ "objc2-encode",
+]
+
 [[package]]
 name = "bstr"
 version = "1.3.0"
@@ -1306,12 +1316,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
 [[package]]
 name = "cc"
 version = "1.0.79"
@@ -1385,37 +1389,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "cocoa"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
-dependencies = [
- "bitflags",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
-dependencies = [
- "bitflags",
- "block",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
- "libc",
- "objc",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -1432,6 +1405,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "com-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+
 [[package]]
 name = "combine"
 version = "4.6.6"
@@ -1439,16 +1418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
 dependencies = [
  "bytes",
- "memchr",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
-dependencies = [
- "cache-padded",
+ "memchr",
 ]
 
 [[package]]
@@ -1643,6 +1613,16 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "cty"
 version = "0.2.2"
@@ -1695,60 +1675,15 @@ dependencies = [
 
 [[package]]
 name = "d3d12"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
+checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
 dependencies = [
  "bitflags",
  "libloading",
  "winapi",
 ]
 
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "deflate"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -1800,18 +1735,18 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "ecolor"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b601108bca3af7650440ace4ca55b2daf52c36f2635be3587d77b16efd8d0691"
+checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
 name = "egui"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65a5e883a316e53866977450eecfbcac9c48109c2ab3394af29feb83fcde4ea9"
+checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe"
 dependencies = [
  "ahash 0.8.3",
  "epaint",
@@ -1820,9 +1755,9 @@ dependencies = [
 
 [[package]]
 name = "egui_dock"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77bb3bc3ce46356c466e04fea06d8110bf2d78b0ca7f98c4c404b2c7b502f392"
+checksum = "6f86bdfe987f753ffcdf896932f09babfc63580b21e1899c304166f0befc85c8"
 dependencies = [
  "egui",
 ]
@@ -1835,9 +1770,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "emath"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5277249c8c3430e7127e4f2c40a77485e7baf11ae132ce9b3253a8ed710df0a0"
+checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e"
 dependencies = [
  "bytemuck",
 ]
@@ -1850,16 +1785,16 @@ checksum = "e62abb876c07e4754fae5c14cafa77937841f01740637e17d78dc04352f32a5e"
 dependencies = [
  "cc",
  "rustc_version 0.4.0",
- "toml",
+ "toml 0.5.11",
  "vswhom",
  "winreg",
 ]
 
 [[package]]
 name = "encase"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ec50086547d597b5c871a78399ec04a14828a6a5c445a61ed4687c540edec6"
+checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b"
 dependencies = [
  "const_panic",
  "encase_derive",
@@ -1869,18 +1804,18 @@ dependencies = [
 
 [[package]]
 name = "encase_derive"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda93e9714c7683c474f49a461a2ae329471d2bda43c4302d41c6d8339579e92"
+checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec27b639e942eb0297513b81cc6d87c50f6c77dc8c37af00a39ed5db3b9657ee"
+checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1896,21 +1831,11 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "log",
- "regex",
-]
-
 [[package]]
 name = "epaint"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de14b65fe5e423e0058f77a8beb2c863b056d0566d6c4ce0d097aa5814cb705a"
+checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95"
 dependencies = [
  "ab_glyph",
  "ahash 0.8.3",
@@ -1973,7 +1898,7 @@ checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "windows-sys 0.45.0",
 ]
 
@@ -1990,7 +1915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -2032,7 +1957,7 @@ dependencies = [
  "bevy_asset_loader",
  "bevy_common_assets",
  "bevy_editor_pls",
- "bevy_egui 0.19.0",
+ "bevy_egui",
  "bevy_hanabi",
  "bevy_kira_audio",
  "bevy_prototype_debug_lines",
@@ -2041,14 +1966,14 @@ dependencies = [
  "chrono",
  "embed-resource",
  "glob",
- "image 0.24.5",
+ "image",
  "indexmap",
  "iyes_progress",
  "leafwing-input-manager",
  "oxidized_navigation",
  "rand",
  "regex",
- "ron 0.8.0",
+ "ron",
  "serde",
  "strum",
  "strum_macros",
@@ -2126,6 +2051,17 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "ghost"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e0cd8a998937e25c6ba7cc276b96ec5cc3f4dc4ab5de9ede4fb152bdd5c5eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "gilrs"
 version = "0.10.1"
@@ -2159,11 +2095,17 @@ dependencies = [
  "windows 0.43.0",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
+
 [[package]]
 name = "glam"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774"
+checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c"
 dependencies = [
  "bytemuck",
  "serde",
@@ -2177,9 +2119,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glow"
-version = "0.11.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
+checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -2253,6 +2195,19 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "gpu-allocator"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+dependencies = [
+ "backtrace",
+ "log",
+ "thiserror",
+ "winapi",
+ "windows 0.44.0",
+]
+
 [[package]]
 name = "gpu-descriptor"
 version = "0.2.3"
@@ -2283,26 +2238,6 @@ dependencies = [
  "svg_fmt",
 ]
 
-[[package]]
-name = "hash32"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "hash32-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59d2aba832b60be25c1b169146b27c64115470981b128ed84c8db18c1b03c6ff"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -2313,6 +2248,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hassle-rs"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85"
+dependencies = [
+ "bitflags",
+ "com-rs",
+ "libc",
+ "libloading",
+ "thiserror",
+ "widestring",
+ "winapi",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -2328,17 +2278,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
 [[package]]
 name = "hexasphere"
-version = "8.0.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "619ce654558681d7d0a7809e1b20249c7032ff13ee6baa7bb7ff64f7f28a906a"
+checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588"
 dependencies = [
  "glam",
  "once_cell",
@@ -2374,12 +2318,6 @@ dependencies = [
  "cxx-build",
 ]
 
-[[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.3.0"
@@ -2390,22 +2328,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "image"
-version = "0.23.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-iter",
- "num-rational 0.3.2",
- "num-traits",
- "png 0.16.8",
- "tiff 0.6.1",
-]
-
 [[package]]
 name = "image"
 version = "0.24.5"
@@ -2415,12 +2337,12 @@ dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
- "jpeg-decoder 0.3.0",
- "num-rational 0.4.1",
+ "jpeg-decoder",
+ "num-rational",
  "num-traits",
- "png 0.17.7",
+ "png",
  "scoped_threadpool",
- "tiff 0.8.1",
+ "tiff",
 ]
 
 [[package]]
@@ -2472,6 +2394,16 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "inventory"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "498ae1c9c329c7972b917506239b557a60386839192f1cf0ca034f345b65db99"
+dependencies = [
+ "ctor",
+ "ghost",
+]
+
 [[package]]
 name = "io-kit-sys"
 version = "0.2.0"
@@ -2499,9 +2431,9 @@ checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
 [[package]]
 name = "iyes_progress"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266c468795c5af070ab4c5fa01aca792a8f01f511e76feb9bea3878a1dbee144"
+checksum = "c445a5cfe8748bab1353bdeb93ee607d387395ce0c250b8937db3ef97e2d30f2"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -2550,12 +2482,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "jpeg-decoder"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
-
 [[package]]
 name = "jpeg-decoder"
 version = "0.3.0"
@@ -2571,12 +2497,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
-
 [[package]]
 name = "khronos-egl"
 version = "4.1.0"
@@ -2620,6 +2540,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "ktx2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -2634,23 +2563,26 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "leafwing-input-manager"
-version = "0.8.0"
-source = "git+https://github.com/TimJentzsch/leafwing-input-manager.git?branch=307-scancode-support#f0ba3bea47d73f029da989ef03453d22a817a342"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd149c23a439a4e15e53571940092cb329e447de43f9841830f294f83b8402d9"
 dependencies = [
  "bevy",
- "bevy_egui 0.19.0",
+ "bevy_egui",
  "derive_more",
  "fixedbitset",
  "itertools",
  "leafwing_input_manager_macros",
+ "once_cell",
  "petitset",
  "serde",
 ]
 
 [[package]]
 name = "leafwing_input_manager_macros"
-version = "0.7.0"
-source = "git+https://github.com/TimJentzsch/leafwing-input-manager.git?branch=307-scancode-support#f0ba3bea47d73f029da989ef03453d22a817a342"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11aefabfcc9ef0a78bc97eea053d2f1bb050d5278a4134bdc1b769064a90064a"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2658,17 +2590,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "lewton"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
-dependencies = [
- "byteorder",
- "ogg",
- "tinyvec",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.139"
@@ -2815,25 +2736,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
-dependencies = [
- "adler",
- "autocfg",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.6.2"
@@ -2857,9 +2759,9 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707"
+checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5"
 dependencies = [
  "bit-set",
  "bitflags",
@@ -2879,16 +2781,16 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6515c882ebfddccaa73ead7320ca28036c4bc84c9bcca3cc0cbba8efe89223a"
+checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511"
 dependencies = [
  "approx",
  "glam",
  "matrixmultiply",
  "nalgebra-macros",
  "num-complex",
- "num-rational 0.4.1",
+ "num-rational",
  "num-traits",
  "serde",
  "simba",
@@ -2929,7 +2831,7 @@ dependencies = [
  "jni-sys",
  "ndk-sys 0.4.1+23.1.7779620",
  "num_enum",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -2939,36 +2841,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
-[[package]]
-name = "ndk-glue"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f"
-dependencies = [
- "android_logger",
- "libc",
- "log",
- "ndk 0.7.0",
- "ndk-context",
- "ndk-macro",
- "ndk-sys 0.4.1+23.1.7779620",
- "once_cell",
- "parking_lot",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
-dependencies = [
- "darling",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ndk-sys"
 version = "0.3.0"
@@ -2987,19 +2859,6 @@ dependencies = [
  "jni-sys",
 ]
 
-[[package]]
-name = "nix"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if",
- "libc",
- "memoffset 0.6.5",
-]
-
 [[package]]
 name = "nix"
 version = "0.23.2"
@@ -3080,6 +2939,15 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -3121,28 +2989,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-iter"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-rational"
 version = "0.4.1"
@@ -3209,11 +3055,37 @@ dependencies = [
 name = "objc-foundation"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
+[[package]]
+name = "objc-sys"
+version = "0.2.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
+
+[[package]]
+name = "objc2"
+version = "0.3.0-beta.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe31e5425d3d0b89a15982c024392815da40689aceb34bad364d58732bcfd649"
+dependencies = [
+ "block2",
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "2.0.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
 dependencies = [
- "block",
- "objc",
- "objc_id",
+ "objc-sys",
 ]
 
 [[package]]
@@ -3234,6 +3106,15 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "object"
+version = "0.30.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "oboe"
 version = "0.4.6"
@@ -3257,15 +3138,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ogg"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.17.1"
@@ -3288,6 +3160,18 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc"
 
+[[package]]
+name = "orbclient"
+version = "0.3.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "974465c5e83cf9df05c1e4137b271d29035c902e39e5ad4c1939837e22160af8"
+dependencies = [
+ "cfg-if",
+ "redox_syscall 0.2.16",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -3305,9 +3189,9 @@ dependencies = [
 
 [[package]]
 name = "oxidized_navigation"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3948284a9e1cfd232c2776e0fccff1245a750506f5ed9063c5dcc68e9af772"
+checksum = "00a059d95d7308243da096540ec82d9c96e40f4a71fe557c646194a0c39a60d6"
 dependencies = [
  "bevy",
  "bevy_rapier3d",
@@ -3348,7 +3232,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
  "windows-sys 0.45.0",
 ]
@@ -3424,18 +3308,6 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
-[[package]]
-name = "png"
-version = "0.16.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
-dependencies = [
- "bitflags",
- "crc32fast",
- "deflate",
- "miniz_oxide 0.3.7",
-]
-
 [[package]]
 name = "png"
 version = "0.17.7"
@@ -3445,7 +3317,7 @@ dependencies = [
  "bitflags",
  "crc32fast",
  "flate2",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -3476,7 +3348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.18.1",
 ]
 
 [[package]]
@@ -3592,15 +3464,6 @@ dependencies = [
  "vec_map",
 ]
 
-[[package]]
-name = "raw-window-handle"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
-dependencies = [
- "cty",
-]
-
 [[package]]
 name = "raw-window-handle"
 version = "0.5.0"
@@ -3653,6 +3516,15 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb02a9aee8e8c7ad8d86890f1e16b49e0bbbffc9961ff3788c31d57c98bcbf03"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -3660,7 +3532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
  "getrandom",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
@@ -3711,21 +3583,11 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea"
 
-[[package]]
-name = "rodio"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb10b653d5ec0e9411a2e7d46e2c7f4046fd87d35b9955bd73ba4108d69072b5"
-dependencies = [
- "cpal",
- "lewton",
-]
-
 [[package]]
 name = "ron"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
+checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
 dependencies = [
  "base64",
  "bitflags",
@@ -3733,15 +3595,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "ron"
-version = "0.8.0"
+name = "rustc-demangle"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
-dependencies = [
- "base64",
- "bitflags",
- "serde",
-]
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "rustc-hash"
@@ -3773,6 +3630,16 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
 
+[[package]]
+name = "ruzstd"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100"
+dependencies = [
+ "byteorder",
+ "twox-hash",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.12"
@@ -3838,18 +3705,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "71f2b4817415c6d4210bfe1c7bfcf4801b2d904cb4d0e1a8fdb651013c9e86b8"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "d071a94a3fac4aff69d023a7f411e33f40f3483f8c5190b1953822b6b76d7630"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3867,6 +3734,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "sha1"
 version = "0.6.1"
@@ -3950,16 +3826,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "spin_sleep"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134"
-dependencies = [
- "once_cell",
- "winapi",
-]
-
 [[package]]
 name = "spirv"
 version = "0.2.0+1.5.4"
@@ -4031,12 +3897,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strum"
 version = "0.24.1"
@@ -4144,17 +4004,29 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.28.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e847e2de7a137c8c2cede5095872dbb00f4f9bf34d061347e36b43322acd56"
+dependencies = [
+ "cfg-if",
+ "core-foundation-sys",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "winapi",
+]
+
 [[package]]
 name = "taffy"
-version = "0.1.0"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec27dea659b100d489dffa57cf0efc6d7bfefb119af817b92cc14006c0b214e3"
+checksum = "2ee314c07429e51c4770287734f62d23bb27cb9e941823f969b57f50171079ee"
 dependencies = [
  "arrayvec",
- "hash32",
- "hash32-derive",
  "num-traits",
- "typenum",
+ "slotmap",
 ]
 
 [[package]]
@@ -4196,17 +4068,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tiff"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437"
-dependencies = [
- "jpeg-decoder 0.1.22",
- "miniz_oxide 0.4.4",
- "weezl",
-]
-
 [[package]]
 name = "tiff"
 version = "0.8.1"
@@ -4214,7 +4075,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471"
 dependencies = [
  "flate2",
- "jpeg-decoder 0.3.0",
+ "jpeg-decoder",
  "weezl",
 ]
 
@@ -4253,12 +4114,33 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime 0.6.1",
+ "toml_edit 0.19.6",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
 
+[[package]]
+name = "toml_datetime"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.18.1"
@@ -4267,7 +4149,20 @@ checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
 dependencies = [
  "indexmap",
  "nom8",
- "toml_datetime",
+ "toml_datetime 0.5.1",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime 0.6.1",
+ "winnow",
 ]
 
 [[package]]
@@ -4295,13 +4190,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-chrome"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ac1f6a3a47e9c755e65ef974653c978da2246487a16044a8ee1d9a0a67257c"
+checksum = "496b3cd5447f7ff527bbbf19b071ad542a000adf297d4127078b4dfdb931f41a"
 dependencies = [
- "crossbeam",
- "json",
- "tracing",
+ "serde_json",
+ "tracing-core",
  "tracing-subscriber",
 ]
 
@@ -4371,12 +4265,46 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
 
+[[package]]
+name = "twox-hash"
+version = "1.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
+dependencies = [
+ "cfg-if",
+ "static_assertions",
+]
+
 [[package]]
 name = "typenum"
 version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
+[[package]]
+name = "typetag"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69bf9bd14fed1815295233a0eee76a963283b53ebcbd674d463f697d3bfcae0c"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
+
+[[package]]
+name = "typetag-impl"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf9f5f225956dc2254c6c27500deac9390a066b2e8a1a571300627a7c4400a33"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.10"
@@ -4500,16 +4428,13 @@ dependencies = [
 
 [[package]]
 name = "warbler_grass"
-version = "0.1.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b5ca571fc51ece12a533f51c3f97dcba045dc2900d74744658da9184b82836d"
+checksum = "80f27edf9f3acf394df16ba3955c56fa8b35e7c50857c8bbb91a6456196f129f"
 dependencies = [
  "bevy",
- "bevy-inspector-egui",
  "bitflags",
  "bytemuck",
- "rand",
- "ron 0.8.0",
  "serde",
 ]
 
@@ -4591,6 +4516,17 @@ version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
+[[package]]
+name = "wayland-scanner"
+version = "0.29.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "xml-rs",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.61"
@@ -4613,7 +4549,7 @@ dependencies = [
  "log",
  "ndk-context",
  "objc",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "url",
  "web-sys",
 ]
@@ -4626,16 +4562,18 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
 [[package]]
 name = "wgpu"
-version = "0.14.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937"
+checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7"
 dependencies = [
  "arrayvec",
+ "cfg-if",
  "js-sys",
  "log",
  "naga",
  "parking_lot",
- "raw-window-handle 0.5.0",
+ "profiling",
+ "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
@@ -4648,21 +4586,20 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.14.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca"
+checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff"
 dependencies = [
  "arrayvec",
  "bit-vec",
  "bitflags",
- "cfg_aliases",
  "codespan-reporting",
  "fxhash",
  "log",
  "naga",
  "parking_lot",
  "profiling",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "smallvec",
  "thiserror",
  "web-sys",
@@ -4672,9 +4609,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.14.1"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f"
+checksum = "7762ae7fcc06943c1b5d4987ab0194e82aaba7767fbfb75d3458844c5b82cc45"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -4688,9 +4625,12 @@ dependencies = [
  "fxhash",
  "glow",
  "gpu-alloc",
+ "gpu-allocator",
  "gpu-descriptor",
+ "hassle-rs",
  "js-sys",
  "khronos-egl",
+ "libc",
  "libloading",
  "log",
  "metal",
@@ -4699,7 +4639,7 @@ dependencies = [
  "parking_lot",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
  "renderdoc-sys",
  "smallvec",
  "thiserror",
@@ -4711,11 +4651,13 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.14.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6"
+checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110"
 dependencies = [
  "bitflags",
+ "js-sys",
+ "web-sys",
 ]
 
 [[package]]
@@ -4728,6 +4670,12 @@ dependencies = [
  "safe_arch",
 ]
 
+[[package]]
+name = "widestring"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -4797,16 +4745,36 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.36.1"
+name = "windows"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f"
 dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -4854,12 +4822,6 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.37.0"
@@ -4872,12 +4834,6 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.37.0"
@@ -4890,12 +4846,6 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.37.0"
@@ -4908,12 +4858,6 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.37.0"
@@ -4932,12 +4876,6 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.37.0"
@@ -4952,12 +4890,13 @@ checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
 
 [[package]]
 name = "winit"
-version = "0.27.5"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
+checksum = "9d38e7dc904dda347b54dbec3b2d4bf534794f4fb4e6df0be91a264f4f2ed1cf"
 dependencies = [
+ "android-activity",
  "bitflags",
- "cocoa",
+ "cfg_aliases",
  "core-foundation",
  "core-graphics",
  "dispatch",
@@ -4966,19 +4905,28 @@ dependencies = [
  "log",
  "mio",
  "ndk 0.7.0",
- "ndk-glue",
- "objc",
+ "objc2",
  "once_cell",
- "parking_lot",
+ "orbclient",
  "percent-encoding",
- "raw-window-handle 0.4.3",
- "raw-window-handle 0.5.0",
+ "raw-window-handle",
+ "redox_syscall 0.3.4",
  "wasm-bindgen",
+ "wayland-scanner",
  "web-sys",
- "windows-sys 0.36.1",
+ "windows-sys 0.45.0",
  "x11-dl",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.10.1"
@@ -4999,18 +4947,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "x11rb"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a"
-dependencies = [
- "gethostname",
- "nix 0.22.3",
- "winapi",
- "winapi-wsapoll",
-]
-
 [[package]]
 name = "x11rb"
 version = "0.10.1"
@@ -5039,7 +4975,8 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
-[[patch.unused]]
-name = "bevy_hanabi"
-version = "0.6.0-dev"
-source = "git+https://github.com/janhohenheim/bevy_hanabi#1d652dd1eeccf9cd91bb7932fa62264b24c18047"
+[[package]]
+name = "xml-rs"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
diff --git a/Cargo.toml b/Cargo.toml
index 152939ce..c5142d5c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,14 +17,25 @@ default = [
 ]
 
 core = [
+    "bevy/animation",
+    "bevy/bevy_asset",
+    "bevy/bevy_scene",
     "bevy/bevy_winit",
-    "bevy/render",
-    "bevy/hdr",
+    "bevy/bevy_core_pipeline",
+    "bevy/bevy_pbr",
+    "bevy/bevy_gltf",
+    "bevy/bevy_render",
+    "bevy/bevy_sprite",
+    "bevy/bevy_text",
+    "bevy/bevy_ui",
     "bevy/png",
     "bevy/jpeg",
-    "bevy/bevy_asset",
+    "bevy/hdr",
+    "bevy/zstd",
     "bevy/x11",
-    "bevy/animation",
+    "bevy/ktx2",
+    "bevy/filesystem_watcher",
+    "bevy/tonemapping_luts",
     "bevy/serialize",
 ]
 
@@ -35,7 +46,7 @@ dev = [
 ]
 
 native-dev = [
-    "bevy/dynamic",
+    "bevy/bevy_dylib",
     "bevy/filesystem_watcher",
     "dev",
     "native"
@@ -63,42 +74,36 @@ tracing = [
 ]
 
 [dependencies]
-bevy = { version = "^0.9.1", default-features = false }
-bevy_kira_audio = "0.13"
-bevy_asset_loader = { version = "0.14.1", features = ["progress_tracking"] }
-bevy_common_assets = { version = "0.4.0", features = ["ron", "toml"] }
-bevy_egui = "0.19"
+bevy = { version = "0.10", default-features = false }
+bevy_kira_audio = "0.15"
+bevy_asset_loader = { version = "0.15", features = ["progress_tracking"] }
+bevy_common_assets = { version = "0.5", features = ["ron", "toml"] }
+bevy_egui = "0.20"
 serde = { version = "1", features = ["derive"] }
 indexmap = { version = "1", features = ["serde-1"] }
-strum = "0.24.1"
-strum_macros = "0.24.3"
-ron = "0.8.0"
+strum = "0.24"
+strum_macros = "0.24"
+ron = "0.8"
 regex = "1"
-chrono = "0.4.23"
-glob = "0.3.1"
-oxidized_navigation = "0.2.0"
-bitflags = "1.3.2"
-iyes_progress = "0.7.1"
-unicode-segmentation = "1.10.1"
-bevy_hanabi = { version = "0.5", optional = true }
-anyhow = "1.0.69"
-bevy_rapier3d = { version = "0.20", features = ["serde-serialize", "simd-nightly"] }
-leafwing-input-manager = { version = "0.8.0", features = [ "egui" ] }
-bevy_editor_pls = { version = "0.2", optional = true}
-bevy_prototype_debug_lines = { version = "0.9.0", optional = true, features = ["3d"] }
-wasm-bindgen = { version = "0.2.84", optional = true }
-warbler_grass = "0.1"
-rand = { version = "0.8.5", features = ["small_rng", "nightly"] }
+chrono = "0.4"
+glob = "0.3"
+oxidized_navigation = "0.3"
+bitflags = "1"
+iyes_progress = "0.8"
+unicode-segmentation = "1"
+bevy_hanabi = { version = "0.6", optional = true }
+anyhow = "1"
+bevy_rapier3d = { version = "0.21", features = ["serde-serialize", "simd-nightly"] }
+leafwing-input-manager = { version = "0.9", features = [ "egui" ] }
+bevy_editor_pls = { version = "0.3", optional = true}
+bevy_prototype_debug_lines = { version = "0.10", optional = true, features = ["3d"] }
+wasm-bindgen = { version = "0.2", optional = true }
+warbler_grass = "0.3"
+rand = { version = "0.8", features = ["small_rng", "nightly"] }
 
 # keep the following in sync with Bevy's dependencies
-winit = { version = "0.27", default-features = false }
+winit = { version = "0.28", default-features = false }
 image = { version = "0.24", default-features = false }
 
 [build-dependencies]
 embed-resource = "1.4"
-
-[patch.crates-io]
-leafwing-input-manager = { git = "https://github.com/TimJentzsch/leafwing-input-manager.git", branch = "307-scancode-support" } # https://github.com/Leafwing-Studios/leafwing-input-manager/pull/312
-bevy_asset_loader = { git = "https://github.com/NiklasEi/bevy_asset_loader.git", rev = "be7f9005db76224912a06742ed521557262b50fe" } # Collections as maps feature
-bevy_editor_pls = { git = "https://github.com/jakobhellermann/bevy_editor_pls", rev = "6062b860aea87034081399369fd7ef5715f13256" } # Smaller bug fixes
-bevy_hanabi = { git = "https://github.com/janhohenheim/bevy_hanabi" } # https://github.com/djeedai/bevy_hanabi/issues/144
diff --git a/src/bevy_config.rs b/src/bevy_config.rs
index 600d0a74..175db178 100644
--- a/src/bevy_config.rs
+++ b/src/bevy_config.rs
@@ -1,8 +1,8 @@
 use crate::util::log_error::log_errors;
 use anyhow::{Context, Result};
 use bevy::prelude::*;
-use bevy::window::{PresentMode, WindowId};
-use bevy::winit::WinitWindows;
+use bevy::window::PresentMode;
+use bevy::window::PrimaryWindow;
 use std::io::Cursor;
 use winit::window::Icon;
 
@@ -12,14 +12,13 @@ pub struct BevyConfigPlugin;
 impl Plugin for BevyConfigPlugin {
     fn build(&self, app: &mut App) {
         let default_plugins = DefaultPlugins.set(WindowPlugin {
-            window: WindowDescriptor {
-                width: 800.,
-                height: 600.,
+            primary_window: Some(Window {
+                resolution: (800, 600).into(),
                 title: "Foxtrot".to_string(),
                 canvas: Some("#bevy".to_owned()),
                 present_mode: PresentMode::AutoVsync,
                 ..default()
-            },
+            }),
             ..default()
         });
         #[cfg(feature = "native-dev")]
@@ -27,7 +26,7 @@ impl Plugin for BevyConfigPlugin {
             watch_for_changes: true,
             ..default()
         });
-        app.insert_resource(Msaa { samples: 4 })
+        app.insert_resource(Msaa::Sample4)
             .insert_resource(ClearColor(Color::rgb(0.4, 0.4, 0.4)))
             .add_plugins(default_plugins)
             .add_startup_system(set_window_icon.pipe(log_errors));
@@ -35,9 +34,9 @@ impl Plugin for BevyConfigPlugin {
 }
 
 // Sets the icon on Windows and X11
-fn set_window_icon(windows: NonSend<WinitWindows>) -> Result<()> {
-    let primary = windows
-        .get_window(WindowId::primary())
+fn set_window_icon(primary_windows: Query<&Window, With<PrimaryWindow>>) -> Result<()> {
+    let primary = primary_windows
+        .get_single()
         .context("Failed to get primary window")?;
     let icon_buf = Cursor::new(include_bytes!(
         "../build/macos/AppIcon.iconset/icon_256x256.png"
diff --git a/src/file_system_interaction/asset_loading.rs b/src/file_system_interaction/asset_loading.rs
index e6043b22..fc91564f 100644
--- a/src/file_system_interaction/asset_loading.rs
+++ b/src/file_system_interaction/asset_loading.rs
@@ -8,7 +8,7 @@ use bevy_asset_loader::prelude::*;
 use bevy_common_assets::ron::RonAssetPlugin;
 use bevy_common_assets::toml::TomlAssetPlugin;
 use bevy_egui::egui::ProgressBar;
-use bevy_egui::{egui, EguiContext};
+use bevy_egui::{egui, EguiContexts};
 use bevy_kira_audio::AudioSource;
 use iyes_progress::{ProgressCounter, ProgressPlugin};
 
@@ -97,7 +97,7 @@ pub struct ConfigAssets {
 
 fn show_progress(
     progress: Option<Res<ProgressCounter>>,
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     mut last_done: Local<u32>,
     audio_assets: Option<Res<AudioAssets>>,
     scene_assets: Option<Res<SceneAssets>>,
@@ -112,7 +112,7 @@ fn show_progress(
             *last_done = progress.done;
         }
 
-        egui::CentralPanel::default().show(egui_context.ctx_mut(), |ui| {
+        egui::CentralPanel::default().show(egui_contexts.ctx_mut(), |ui| {
             ui.vertical_centered(|ui| {
                 ui.add_space(100.0);
                 ui.heading("Loading");
diff --git a/src/ingame_menu.rs b/src/ingame_menu.rs
index 252f5a9c..a658c05d 100644
--- a/src/ingame_menu.rs
+++ b/src/ingame_menu.rs
@@ -1,7 +1,7 @@
 use crate::player_control::actions::{ActionsFrozen, UiAction};
 use crate::GameState;
 use bevy::prelude::*;
-use bevy_egui::{egui, EguiContext};
+use bevy_egui::{egui, EguiContexts};
 use leafwing_input_manager::prelude::ActionState;
 
 /// Handles the pause menu accessed while playing the game via ESC.
@@ -19,7 +19,7 @@ fn handle_pause(
     mut time: ResMut<Time>,
     actions: Query<&ActionState<UiAction>>,
     mut actions_frozen: ResMut<ActionsFrozen>,
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     mut paused: Local<bool>,
 ) {
     for action in actions.iter() {
@@ -35,7 +35,7 @@ fn handle_pause(
                         fill: egui::Color32::from_black_alpha(240),
                         ..default()
                     })
-                    .show(egui_context.ctx_mut(), |ui| {
+                    .show(egui_contexts.ctx_mut(), |ui| {
                         ui.vertical_centered_justified(|ui| {
                             ui.visuals_mut().override_text_color =
                                 Some(egui::Color32::from_gray(240));
diff --git a/src/level_instantiation/grass.rs b/src/level_instantiation/grass.rs
index 9bdf4baf..35a4647b 100644
--- a/src/level_instantiation/grass.rs
+++ b/src/level_instantiation/grass.rs
@@ -5,8 +5,6 @@ use bevy::prelude::*;
 use bevy::render::mesh::{PrimitiveTopology, VertexAttributeValues};
 use bevy::transform::TransformSystem;
 use rand::{rngs::SmallRng, Rng, SeedableRng};
-use warbler_grass::grass::GrassBlade;
-use warbler_grass::grass_spawner::GrassSpawner;
 use warbler_grass::prelude::*;
 
 pub struct GrassPlugin;
@@ -45,23 +43,21 @@ pub fn add_grass(
 
                 let rng = SmallRng::from_entropy();
                 const BLADES_PER_SQUARE_METER: f32 = 10.0;
-                let blades = triangles
+                let positions = triangles
                     .flat_map(|triangle| {
                         let area = area_of_triangle(&triangle);
                         let blade_count = (area * BLADES_PER_SQUARE_METER) as usize;
                         let mut rng = rng.clone();
                         (0..blade_count).map(move |_| {
-                            let position =
-                                pick_uniform_random_point_in_triangle(&mut rng, &triangle);
-                            let height = 0.6 + rng.gen::<f32>() * 0.25;
-                            GrassBlade { position, height }
+                            pick_uniform_random_point_in_triangle(&mut rng, &triangle)
                         })
                     })
                     .collect();
+                let height = 0.7;
                 commands.spawn((
                     Name::new("Grass"),
-                    WarblersBundle {
-                        grass_spawner: GrassSpawner::new().from_grass_blades(blades),
+                    WarblersExplicitBundle {
+                        grass: Grass { positions, height },
                         ..default()
                     },
                 ));
diff --git a/src/level_instantiation/map.rs b/src/level_instantiation/map.rs
index 7a7650ee..6079e611 100644
--- a/src/level_instantiation/map.rs
+++ b/src/level_instantiation/map.rs
@@ -3,7 +3,7 @@ use crate::level_instantiation::spawning::{DelayedSpawnEvent, GameObject, SpawnE
 use crate::player_control::player_embodiment::Player;
 use crate::GameState;
 use bevy::prelude::*;
-use bevy_egui::{egui, EguiContext};
+use bevy_egui::{egui, EguiContexts};
 
 pub struct MapPlugin;
 
@@ -47,9 +47,9 @@ fn setup(
     });
 }
 
-fn show_loading_screen(player_query: Query<&Player>, mut egui_context: ResMut<EguiContext>) {
+fn show_loading_screen(player_query: Query<&Player>, mut egui_contexts: EguiContexts) {
     if player_query.iter().next().is_none() {
-        egui::CentralPanel::default().show(egui_context.ctx_mut(), |ui| {
+        egui::CentralPanel::default().show(egui_contexts.ctx_mut(), |ui| {
             ui.vertical_centered(|ui| {
                 ui.add_space(100.0);
                 ui.heading("Loading");
@@ -65,9 +65,9 @@ fn show_loading_screen(player_query: Query<&Player>, mut egui_context: ResMut<Eg
 }
 
 #[cfg(feature = "wasm")]
-fn show_wasm_loader(player_query: Query<&Player>, mut egui_context: ResMut<EguiContext>) {
+fn show_wasm_loader(player_query: Query<&Player>, mut egui_contexts: EguiContexts) {
     let id = egui::Id::new("loading-screen-shown");
-    let memory = &mut egui_context.ctx_mut().memory().data;
+    let memory = &mut egui_contexts.ctx_mut().memory().data;
     match (memory.get_temp::<()>(id), player_query.iter().next()) {
         (None, None) => {
             loader::show_loader();
diff --git a/src/menu.rs b/src/menu.rs
index 5cc54446..07121c10 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -6,7 +6,7 @@ use bevy::prelude::*;
 use bevy_egui::egui::FontFamily::Proportional;
 use bevy_egui::egui::FontId;
 use bevy_egui::egui::TextStyle::{Button, Heading};
-use bevy_egui::{egui, EguiContext};
+use bevy_egui::{egui, EguiContexts};
 
 /// This plugin is responsible for the game menu
 /// The menu is only drawn during the State `GameState::Menu` and is removed when that state is exited.
@@ -20,12 +20,9 @@ impl Plugin for MenuPlugin {
     }
 }
 
-fn setup_menu(
-    mut egui_context: ResMut<EguiContext>,
-    mut state: ResMut<State<GameState>>,
-) -> Result<()> {
+fn setup_menu(mut egui_contexts: EguiContexts, mut state: ResMut<State<GameState>>) -> Result<()> {
     get_menu_panel()
-        .show(egui_context.ctx_mut(), |ui| {
+        .show(egui_contexts.ctx_mut(), |ui| {
             set_menu_style(ui.style_mut());
             ui.vertical_centered_justified(|ui| {
                 ui.add_space(50.);
diff --git a/src/movement/navigation.rs b/src/movement/navigation.rs
index 9625dcae..c063e21b 100644
--- a/src/movement/navigation.rs
+++ b/src/movement/navigation.rs
@@ -14,7 +14,7 @@ use bevy::prelude::*;
 use bevy_prototype_debug_lines::DebugLines;
 use oxidized_navigation::{
     query::{find_path, perform_string_pulling_on_path},
-    NavMesh, NavMeshGenerationState, NavMeshSettings, OxidizedNavigationPlugin,
+    NavMesh, NavMeshSettings, OxidizedNavigationPlugin,
 };
 use serde::{Deserialize, Serialize};
 
@@ -26,32 +26,30 @@ const CELL_WIDTH: f32 = 0.5 * npc::RADIUS;
 
 impl Plugin for NavigationPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(OxidizedNavigationPlugin {
-            starting_state: NavMeshGenerationState::Running, // Generate tile updates.
-        })
-        .insert_resource(NavMeshSettings {
-            cell_width: CELL_WIDTH,
-            cell_height: 0.5 * CELL_WIDTH,
-            tile_width: 150,
-            world_half_extents: 250.0,
-            world_bottom_bound: -100.0,
-            max_traversable_slope_radians: (40.0_f32 - 0.1).to_radians(),
-            walkable_height: 25,
-            walkable_radius: 3,
-            step_height: 3,
-            min_region_area: 50,
-            merge_region_area: 500,
-            max_contour_simplification_error: 1.1,
-            max_edge_length: 70,
-        })
-        .add_system_set(
-            SystemSet::on_update(GameState::Playing).with_system(
-                query_mesh
-                    .pipe(log_errors)
-                    .after(reset_movement_components)
-                    .before(apply_walking),
-            ),
-        );
+        app.add_plugin(OxidizedNavigationPlugin)
+            .insert_resource(NavMeshSettings {
+                cell_width: CELL_WIDTH,
+                cell_height: 0.5 * CELL_WIDTH,
+                tile_width: 150,
+                world_half_extents: 250.0,
+                world_bottom_bound: -100.0,
+                max_traversable_slope_radians: (40.0_f32 - 0.1).to_radians(),
+                walkable_height: 25,
+                walkable_radius: 3,
+                step_height: 3,
+                min_region_area: 50,
+                merge_region_area: 500,
+                max_contour_simplification_error: 1.1,
+                max_edge_length: 70,
+            })
+            .add_system_set(
+                SystemSet::on_update(GameState::Playing).with_system(
+                    query_mesh
+                        .pipe(log_errors)
+                        .after(reset_movement_components)
+                        .before(apply_walking),
+                ),
+            );
     }
 }
 
diff --git a/src/particles/init.rs b/src/particles/init.rs
index 0c89a99d..9228faaf 100644
--- a/src/particles/init.rs
+++ b/src/particles/init.rs
@@ -45,7 +45,7 @@ fn create_sprinting_effect(effects: &mut Assets<EffectAsset>) -> ParticleEffect
                 center: Vec3::ZERO,
                 axis: Vec3::Y,
             })
-            .init(ParticleLifetimeModifier { lifetime: 0.8 })
+            .init(InitLifetimeModifier { lifetime: 0.8 })
             .update(LinearDragModifier { drag: 5. })
             .render(BillboardModifier {})
             .update(AccelModifier {
diff --git a/src/player_control/camera.rs b/src/player_control/camera.rs
index f79c76bf..8386ed03 100644
--- a/src/player_control/camera.rs
+++ b/src/player_control/camera.rs
@@ -8,6 +8,7 @@ use crate::GameState;
 use anyhow::{Context, Result};
 use bevy::prelude::*;
 use bevy::window::CursorGrabMode;
+use bevy::window::PrimaryWindow;
 use bevy_rapier3d::prelude::*;
 pub use first_person::FirstPersonCamera;
 pub use fixed_angle::FixedAngleCamera;
@@ -238,14 +239,14 @@ fn move_skydome(
 pub struct ForceCursorGrabMode(pub Option<CursorGrabMode>);
 
 fn cursor_grab_system(
-    mut windows: ResMut<Windows>,
+    mut primary_windows: Query<&mut Window, With<PrimaryWindow>>,
     actions_frozen: Res<ActionsFrozen>,
     force_cursor_grab: Res<ForceCursorGrabMode>,
 ) -> Result<()> {
     #[cfg(feature = "tracing")]
     let _span = info_span!("cursor_grab_system").entered();
-    let window = windows
-        .get_primary_mut()
+    let mut window = primary_windows
+        .get_single_mut()
         .context("Failed to get primary window")?;
     if let Some(mode) = force_cursor_grab.0 {
         window.set_cursor_grab_mode(mode);
diff --git a/src/world_interaction/dialog.rs b/src/world_interaction/dialog.rs
index 38be9ad1..6b81d73f 100644
--- a/src/world_interaction/dialog.rs
+++ b/src/world_interaction/dialog.rs
@@ -12,7 +12,7 @@ use bevy::prelude::*;
 use bevy_egui::egui::FontFamily::Proportional;
 use bevy_egui::egui::FontId;
 use bevy_egui::egui::TextStyle::{Body, Button};
-use bevy_egui::{egui, EguiContext, EguiPlugin};
+use bevy_egui::{egui, EguiContexts, EguiPlugin};
 use leafwing_input_manager::prelude::ActionState;
 use serde::{Deserialize, Serialize};
 use std::path::Path;
@@ -104,7 +104,7 @@ fn show_dialog(
     current_dialog: Option<ResMut<CurrentDialog>>,
     active_conditions: Res<ActiveConditions>,
     mut condition_writer: EventWriter<ConditionAddEvent>,
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     mut actions_frozen: ResMut<ActionsFrozen>,
     actions: Query<&ActionState<PlayerAction>>,
     time: Res<Time>,
@@ -121,7 +121,7 @@ fn show_dialog(
     for actions in actions.iter() {
         let current_page = current_dialog.fetch_current_page()?;
         get_dialog_window()
-            .show(egui_context.ctx_mut(), |ui| {
+            .show(egui_contexts.ctx_mut(), |ui| {
                 // Get current context style
                 set_dialog_style(ui.style_mut());
                 let dialog_size = egui::Vec2::new(500., 150.);
diff --git a/src/world_interaction/interactions_ui.rs b/src/world_interaction/interactions_ui.rs
index 31fc99fb..b254360c 100644
--- a/src/world_interaction/interactions_ui.rs
+++ b/src/world_interaction/interactions_ui.rs
@@ -7,7 +7,8 @@ use crate::GameState;
 use anyhow::{Context, Result};
 use bevy::prelude::*;
 use bevy::utils::HashSet;
-use bevy_egui::{egui, EguiContext};
+use bevy::window::PrimaryWindow;
+use bevy_egui::{egui, EguiContexts};
 use bevy_rapier3d::prelude::*;
 use leafwing_input_manager::prelude::ActionState;
 use serde::{Deserialize, Serialize};
@@ -151,9 +152,9 @@ fn is_facing_target(
 fn display_interaction_prompt(
     interaction_ui: Option<Res<InteractionUi>>,
     mut dialog_event_writer: EventWriter<DialogEvent>,
-    mut egui_context: ResMut<EguiContext>,
+    mut egui_contexts: EguiContexts,
     actions: Query<&ActionState<PlayerAction>>,
-    windows: Res<Windows>,
+    primary_windows: Query<&Window, With<PrimaryWindow>>,
     actions_frozen: Res<ActionsFrozen>,
     dialog_target_query: Query<&DialogTarget>,
 ) -> Result<()> {
@@ -166,15 +167,15 @@ fn display_interaction_prompt(
     };
 
     for actions in actions.iter() {
-        let window = windows
-            .get_primary()
+        let window = primary_windows
+            .get_single()
             .context("Failed to get primary window")?;
         egui::Window::new("Interaction")
             .collapsible(false)
             .title_bar(false)
             .auto_sized()
             .fixed_pos(egui::Pos2::new(window.width() / 2., window.height() / 2.))
-            .show(egui_context.ctx_mut(), |ui| {
+            .show(egui_contexts.ctx_mut(), |ui| {
                 ui.label("E: Talk");
             });
         if actions.just_pressed(PlayerAction::Interact) {

From 8764ced5f8e957c8c7764c38d84b70c097d93eaa Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 00:56:44 +0100
Subject: [PATCH 02/13] Fix all compile errors

---
 src/bevy_config.rs                            | 13 +++--
 src/dev/dev_editor.rs                         | 12 +++--
 src/file_system_interaction/asset_loading.rs  | 18 +++----
 src/file_system_interaction/audio.rs          |  2 +-
 .../game_state_serialization.rs               | 22 +++------
 .../level_serialization.rs                    |  2 +-
 src/ingame_menu.rs                            |  2 +-
 src/level_instantiation/grass.rs              |  6 +--
 src/level_instantiation/map.rs                |  8 ++-
 src/level_instantiation/spawning.rs           | 34 +++++++------
 .../spawning/objects/sunlight.rs              | 11 -----
 .../spawning/post_spawn_modification.rs       |  2 +-
 src/lib.rs                                    |  5 +-
 src/menu.rs                                   | 36 +++++---------
 src/movement/general_movement.rs              | 18 ++++---
 src/movement/navigation.rs                    | 13 +++--
 src/movement/physics.rs                       |  7 +--
 src/particles.rs                              |  6 +--
 src/particles/init.rs                         | 15 +++---
 src/player_control/actions.rs                 |  7 +--
 src/player_control/camera.rs                  | 49 ++++++++++---------
 src/player_control/player_embodiment.rs       | 44 ++++++++---------
 src/shader.rs                                 |  9 ++--
 src/world_interaction/condition.rs            |  2 +-
 src/world_interaction/dialog.rs               | 10 ++--
 src/world_interaction/interactions_ui.rs      | 21 ++++----
 26 files changed, 181 insertions(+), 193 deletions(-)

diff --git a/src/bevy_config.rs b/src/bevy_config.rs
index 175db178..2d66cab7 100644
--- a/src/bevy_config.rs
+++ b/src/bevy_config.rs
@@ -3,6 +3,7 @@ use anyhow::{Context, Result};
 use bevy::prelude::*;
 use bevy::window::PresentMode;
 use bevy::window::PrimaryWindow;
+use bevy::winit::WinitWindows;
 use std::io::Cursor;
 use winit::window::Icon;
 
@@ -13,7 +14,7 @@ impl Plugin for BevyConfigPlugin {
     fn build(&self, app: &mut App) {
         let default_plugins = DefaultPlugins.set(WindowPlugin {
             primary_window: Some(Window {
-                resolution: (800, 600).into(),
+                resolution: (800., 600.).into(),
                 title: "Foxtrot".to_string(),
                 canvas: Some("#bevy".to_owned()),
                 present_mode: PresentMode::AutoVsync,
@@ -34,9 +35,13 @@ impl Plugin for BevyConfigPlugin {
 }
 
 // Sets the icon on Windows and X11
-fn set_window_icon(primary_windows: Query<&Window, With<PrimaryWindow>>) -> Result<()> {
-    let primary = primary_windows
-        .get_single()
+fn set_window_icon(
+    windows: NonSend<WinitWindows>,
+    primary_windows: Query<Entity, With<PrimaryWindow>>,
+) -> Result<()> {
+    let primary_entity = primary_windows.single();
+    let primary = windows
+        .get_window(primary_entity)
         .context("Failed to get primary window")?;
     let icon_buf = Cursor::new(include_bytes!(
         "../build/macos/AppIcon.iconset/icon_256x256.png"
diff --git a/src/dev/dev_editor.rs b/src/dev/dev_editor.rs
index c66ebda2..477aaea0 100644
--- a/src/dev/dev_editor.rs
+++ b/src/dev/dev_editor.rs
@@ -23,11 +23,13 @@ impl Plugin for DevEditorPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<DevEditorState>()
             .add_editor_window::<DevEditorWindow>()
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(handle_debug_render.pipe(log_errors))
-                    .with_system(handle_navmesh_render.pipe(log_errors))
-                    .with_system(set_cursor_grab_mode),
+            .add_systems(
+                (
+                    handle_debug_render.pipe(log_errors),
+                    handle_navmesh_render.pipe(log_errors),
+                    set_cursor_grab_mode,
+                )
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
diff --git a/src/file_system_interaction/asset_loading.rs b/src/file_system_interaction/asset_loading.rs
index fc91564f..b12263a8 100644
--- a/src/file_system_interaction/asset_loading.rs
+++ b/src/file_system_interaction/asset_loading.rs
@@ -21,16 +21,16 @@ impl Plugin for LoadingPlugin {
             .add_plugin(TomlAssetPlugin::<GameConfig>::new(&["game.toml"]))
             .add_plugin(ProgressPlugin::new(GameState::Loading).continue_to(GameState::Menu))
             .add_loading_state(
-                LoadingState::new(GameState::Loading)
-                    .with_collection::<AudioAssets>()
-                    .with_collection::<SceneAssets>()
-                    .with_collection::<AnimationAssets>()
-                    .with_collection::<LevelAssets>()
-                    .with_collection::<DialogAssets>()
-                    .with_collection::<TextureAssets>()
-                    .with_collection::<ConfigAssets>(),
+                LoadingState::new(GameState::Loading).continue_to_state(GameState::Menu),
             )
-            .add_system_set(SystemSet::on_update(GameState::Loading).with_system(show_progress));
+            .add_collection_to_loading_state::<_, AudioAssets>(GameState::Loading)
+            .add_collection_to_loading_state::<_, SceneAssets>(GameState::Loading)
+            .add_collection_to_loading_state::<_, AnimationAssets>(GameState::Loading)
+            .add_collection_to_loading_state::<_, LevelAssets>(GameState::Loading)
+            .add_collection_to_loading_state::<_, DialogAssets>(GameState::Loading)
+            .add_collection_to_loading_state::<_, TextureAssets>(GameState::Loading)
+            .add_collection_to_loading_state::<_, ConfigAssets>(GameState::Loading)
+            .add_system(show_progress.in_set(OnUpdate(GameState::Loading)));
     }
 }
 
diff --git a/src/file_system_interaction/audio.rs b/src/file_system_interaction/audio.rs
index 8d4c84a0..cbd9739c 100644
--- a/src/file_system_interaction/audio.rs
+++ b/src/file_system_interaction/audio.rs
@@ -10,7 +10,7 @@ pub struct InternalAudioPlugin;
 impl Plugin for InternalAudioPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugin(AudioPlugin)
-            .add_system_set(SystemSet::on_exit(GameState::Loading).with_system(init_audio));
+            .add_system(init_audio.in_schedule(OnExit(GameState::Loading)));
     }
 }
 
diff --git a/src/file_system_interaction/game_state_serialization.rs b/src/file_system_interaction/game_state_serialization.rs
index 32964af1..0c4a1c48 100644
--- a/src/file_system_interaction/game_state_serialization.rs
+++ b/src/file_system_interaction/game_state_serialization.rs
@@ -20,25 +20,17 @@ impl Plugin for GameStateSerializationPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<GameSaveRequest>()
             .add_event::<GameLoadRequest>()
-            .add_system_set(
-                SystemSet::on_in_stack_update(GameState::Playing)
-                    .with_system(
-                        handle_load_requests
-                            .pipe(log_errors)
-                            .label(HandleLoadRequestsLabel),
-                    )
-                    .with_system(
-                        handle_save_requests
-                            .pipe(log_errors)
-                            .after(HandleLoadRequestsLabel),
-                    ),
+            .add_systems(
+                (
+                    handle_load_requests.pipe(log_errors),
+                    handle_save_requests.pipe(log_errors),
+                )
+                    .chain()
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
 
-#[derive(SystemLabel)]
-pub struct HandleLoadRequestsLabel;
-
 #[derive(Debug, Clone, Eq, PartialEq, Resource, Serialize, Deserialize, Default)]
 pub struct GameSaveRequest {
     pub filename: Option<String>,
diff --git a/src/file_system_interaction/level_serialization.rs b/src/file_system_interaction/level_serialization.rs
index c8267e2d..3439e156 100644
--- a/src/file_system_interaction/level_serialization.rs
+++ b/src/file_system_interaction/level_serialization.rs
@@ -20,7 +20,7 @@ impl Plugin for LevelSerializationPlugin {
         app.add_event::<WorldSaveRequest>()
             .add_event::<WorldLoadRequest>()
             .add_system(save_world.pipe(log_errors).after(SpawnRequestedLabel))
-            .add_system_to_stage(CoreStage::PostUpdate, load_world.pipe(log_errors));
+            .add_system(load_world.pipe(log_errors).in_base_set(CoreSet::PostUpdate));
     }
 }
 #[derive(Debug, Clone, Eq, PartialEq, Reflect, Serialize, Deserialize, Default)]
diff --git a/src/ingame_menu.rs b/src/ingame_menu.rs
index a658c05d..04b0c0f5 100644
--- a/src/ingame_menu.rs
+++ b/src/ingame_menu.rs
@@ -10,7 +10,7 @@ pub struct IngameMenuPlugin;
 impl Plugin for IngameMenuPlugin {
     fn build(&self, app: &mut App) {
         {
-            app.add_system_set(SystemSet::on_update(GameState::Playing).with_system(handle_pause));
+            app.add_system(handle_pause.in_set(OnUpdate(GameState::Playing)));
         }
     }
 }
diff --git a/src/level_instantiation/grass.rs b/src/level_instantiation/grass.rs
index 35a4647b..38935ec3 100644
--- a/src/level_instantiation/grass.rs
+++ b/src/level_instantiation/grass.rs
@@ -11,11 +11,11 @@ pub struct GrassPlugin;
 
 impl Plugin for GrassPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(WarblersPlugin).add_system_to_stage(
-            CoreStage::PostUpdate,
+        app.add_plugin(WarblersPlugin).add_system(
             add_grass
                 .pipe(log_errors)
-                .after(TransformSystem::TransformPropagate),
+                .after(TransformSystem::TransformPropagate)
+                .in_base_set(CoreSet::PostUpdate),
         );
     }
 }
diff --git a/src/level_instantiation/map.rs b/src/level_instantiation/map.rs
index 6079e611..43d629c2 100644
--- a/src/level_instantiation/map.rs
+++ b/src/level_instantiation/map.rs
@@ -9,12 +9,10 @@ pub struct MapPlugin;
 
 impl Plugin for MapPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system_set(SystemSet::on_enter(GameState::Playing).with_system(setup))
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing).with_system(show_loading_screen),
-            );
+        app.add_system(setup.in_schedule(OnEnter(GameState::Playing)))
+            .add_system(show_loading_screen.in_set(OnUpdate(GameState::Playing)));
         #[cfg(feature = "wasm")]
-        app.add_system_set(SystemSet::on_update(GameState::Playing).with_system(show_wasm_loader));
+        app.add_system(show_wasm_loader.in_set(OnUpdate(GameState::Playing)));
     }
 }
 
diff --git a/src/level_instantiation/spawning.rs b/src/level_instantiation/spawning.rs
index 6951d041..1d510c06 100644
--- a/src/level_instantiation/spawning.rs
+++ b/src/level_instantiation/spawning.rs
@@ -36,7 +36,7 @@ mod event;
 mod post_spawn_modification;
 pub mod spawn;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, SystemLabel)]
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
 pub struct SpawnRequestedLabel;
 
 impl Plugin for SpawningPlugin {
@@ -50,22 +50,24 @@ impl Plugin for SpawningPlugin {
             .register_type::<Despawn>()
             .register_type::<DelayedSpawnEvents>()
             .register_type::<AnimationEntityLink>()
-            .add_system_set(
-                SystemSet::on_exit(GameState::Loading).with_system(load_assets_for_spawner),
+            .add_system(load_assets_for_spawner.in_schedule(OnExit(GameState::Loading)))
+            .add_systems(
+                (
+                    spawn_requested.pipe(log_errors).in_set(SpawnRequestedLabel),
+                    spawn_delayed,
+                    despawn,
+                    link_animations.after(SpawnRequestedLabel),
+                )
+                    .in_set(OnUpdate(GameState::Playing)),
             )
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(spawn_requested.pipe(log_errors).label(SpawnRequestedLabel))
-                    .with_system(spawn_delayed)
-                    .with_system(despawn)
-                    .with_system(link_animations.after(SpawnRequestedLabel)),
-            )
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(set_hidden)
-                    .with_system(despawn_removed)
-                    .with_system(set_color.pipe(log_errors))
-                    .with_system(set_shadows.pipe(log_errors)),
+            .add_systems(
+                (
+                    set_hidden,
+                    despawn_removed,
+                    set_color.pipe(log_errors),
+                    set_shadows.pipe(log_errors),
+                )
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
diff --git a/src/level_instantiation/spawning/objects/sunlight.rs b/src/level_instantiation/spawning/objects/sunlight.rs
index 20ef6037..8bcd797a 100644
--- a/src/level_instantiation/spawning/objects/sunlight.rs
+++ b/src/level_instantiation/spawning/objects/sunlight.rs
@@ -14,22 +14,11 @@ impl PrimedGameObjectSpawnerImplementor for SunlightSpawner {
         transform: Transform,
     ) -> Result<Entity> {
         // directional 'sun' light
-        const HALF_SIZE: f32 = 50.0;
         Ok(spawner
             .commands
             .spawn((
                 DirectionalLightBundle {
                     directional_light: DirectionalLight {
-                        // Configure the projection to better fit the scene
-                        shadow_projection: OrthographicProjection {
-                            left: -HALF_SIZE,
-                            right: HALF_SIZE,
-                            bottom: -HALF_SIZE,
-                            top: HALF_SIZE,
-                            near: -10.0 * HALF_SIZE,
-                            far: 10.0 * HALF_SIZE,
-                            ..default()
-                        },
                         shadows_enabled: true,
                         ..default()
                     },
diff --git a/src/level_instantiation/spawning/post_spawn_modification.rs b/src/level_instantiation/spawning/post_spawn_modification.rs
index 371020f0..86e1d673 100644
--- a/src/level_instantiation/spawning/post_spawn_modification.rs
+++ b/src/level_instantiation/spawning/post_spawn_modification.rs
@@ -11,7 +11,7 @@ pub fn set_hidden(mut added_name: Query<(&Name, &mut Visibility), Added<Name>>)
     let _span = info_span!("set_hidden").entered();
     for (name, mut visibility) in added_name.iter_mut() {
         if name.to_lowercase().contains("[hidden]") {
-            visibility.is_visible = false;
+            *visibility = Visibility::Hidden;
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index b9553c09..8c9f1ac7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -45,9 +45,10 @@ use crate::shader::ShaderPlugin;
 use crate::world_interaction::WorldInteractionPlugin;
 use bevy::prelude::*;
 
-#[derive(Clone, Eq, PartialEq, Debug, Hash)]
+#[derive(States, Default, Clone, Eq, PartialEq, Debug, Hash)]
 enum GameState {
     /// During the loading State the LoadingPlugin will load our assets
+    #[default]
     Loading,
     /// During this State the actual game logic is executed
     Playing,
@@ -82,7 +83,7 @@ impl Plugin for GamePlugin {
         #[cfg(all(feature = "native-dev", not(feature = "native")))]
         compile_error!("You can only compile with the native-dev feature if you compile with the native feature.");
 
-        app.add_state(GameState::Loading)
+        app.add_state::<GameState>()
             .add_plugin(BevyConfigPlugin)
             .add_plugin(MenuPlugin)
             .add_plugin(MovementPlugin)
diff --git a/src/menu.rs b/src/menu.rs
index 07121c10..8de2d487 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -1,7 +1,4 @@
-use crate::util::log_error::log_errors;
 use crate::GameState;
-use anyhow::Ok;
-use anyhow::Result;
 use bevy::prelude::*;
 use bevy_egui::egui::FontFamily::Proportional;
 use bevy_egui::egui::FontId;
@@ -14,30 +11,23 @@ pub struct MenuPlugin;
 
 impl Plugin for MenuPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system_set(
-            SystemSet::on_update(GameState::Menu).with_system(setup_menu.pipe(log_errors)),
-        );
+        app.add_system(setup_menu.in_set(OnUpdate(GameState::Menu)));
     }
 }
 
-fn setup_menu(mut egui_contexts: EguiContexts, mut state: ResMut<State<GameState>>) -> Result<()> {
-    get_menu_panel()
-        .show(egui_contexts.ctx_mut(), |ui| {
-            set_menu_style(ui.style_mut());
-            ui.vertical_centered_justified(|ui| {
-                ui.add_space(50.);
-                ui.heading("Foxtrot");
-                ui.separator();
-                ui.add_space(50.);
-                if ui.button("Play").clicked() {
-                    state.set(GameState::Playing)?;
-                }
-                Ok(())
-            })
-            .inner
+fn setup_menu(mut egui_contexts: EguiContexts, mut next_state: ResMut<NextState<GameState>>) {
+    get_menu_panel().show(egui_contexts.ctx_mut(), |ui| {
+        set_menu_style(ui.style_mut());
+        ui.vertical_centered_justified(|ui| {
+            ui.add_space(50.);
+            ui.heading("Foxtrot");
+            ui.separator();
+            ui.add_space(50.);
+            if ui.button("Play").clicked() {
+                next_state.set(GameState::Playing);
+            }
         })
-        .inner?;
-    Ok(())
+    });
 }
 
 fn get_menu_panel() -> egui::CentralPanel {
diff --git a/src/movement/general_movement.rs b/src/movement/general_movement.rs
index d7906956..47b37650 100644
--- a/src/movement/general_movement.rs
+++ b/src/movement/general_movement.rs
@@ -41,14 +41,16 @@ impl Plugin for GeneralMovementPlugin {
             .register_type::<Velocity>()
             .register_type::<Walking>()
             .register_type::<CharacterAnimations>()
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(reset_movement_components)
-                    .with_system(update_grounded.after(reset_movement_components))
-                    .with_system(apply_walking.after(update_grounded))
-                    .with_system(apply_jumping.after(update_grounded))
-                    .with_system(rotate_characters.after(update_grounded))
-                    .with_system(play_animations.pipe(log_errors).after(update_grounded)),
+            .add_systems(
+                (
+                    reset_movement_components,
+                    update_grounded.after(reset_movement_components),
+                    apply_walking.after(update_grounded),
+                    apply_jumping.after(update_grounded),
+                    rotate_characters.after(update_grounded),
+                    play_animations.pipe(log_errors).after(update_grounded),
+                )
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
diff --git a/src/movement/navigation.rs b/src/movement/navigation.rs
index c063e21b..aced1e13 100644
--- a/src/movement/navigation.rs
+++ b/src/movement/navigation.rs
@@ -42,13 +42,12 @@ impl Plugin for NavigationPlugin {
                 max_contour_simplification_error: 1.1,
                 max_edge_length: 70,
             })
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing).with_system(
-                    query_mesh
-                        .pipe(log_errors)
-                        .after(reset_movement_components)
-                        .before(apply_walking),
-                ),
+            .add_system(
+                query_mesh
+                    .pipe(log_errors)
+                    .after(reset_movement_components)
+                    .before(apply_walking)
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
diff --git a/src/movement/physics.rs b/src/movement/physics.rs
index 772f0a4c..3db84ae7 100644
--- a/src/movement/physics.rs
+++ b/src/movement/physics.rs
@@ -20,9 +20,10 @@ impl Plugin for PhysicsPlugin {
                 },
                 ..default()
             })
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(read_colliders.pipe(log_errors)),
+            .add_system(
+                read_colliders
+                    .pipe(log_errors)
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
diff --git a/src/particles.rs b/src/particles.rs
index ac1b3b70..3ecfe341 100644
--- a/src/particles.rs
+++ b/src/particles.rs
@@ -16,10 +16,8 @@ impl Plugin for ParticlePlugin {
     fn build(&self, app: &mut App) {
         app.register_type::<SprintingParticle>()
             .add_plugin(HanabiPlugin)
-            .add_system_set(SystemSet::on_exit(GameState::Loading).with_system(init_effects))
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing).with_system(play_sprinting_effect),
-            );
+            .add_system(init_effects.in_schedule(OnExit(GameState::Loading)))
+            .add_system(play_sprinting_effect.in_set(OnUpdate(GameState::Playing)));
     }
 }
 
diff --git a/src/particles/init.rs b/src/particles/init.rs
index 9228faaf..52ddbb7a 100644
--- a/src/particles/init.rs
+++ b/src/particles/init.rs
@@ -38,19 +38,22 @@ fn create_sprinting_effect(effects: &mut Assets<EffectAsset>) -> ParticleEffect
                 spawner: Spawner::rate(10.0.into()).with_active(false),
                 ..Default::default()
             }
-            .init(PositionCircleModifier {
+            .init(InitPositionCircleModifier {
                 dimension: ShapeDimension::Volume,
                 radius: player::RADIUS * 0.5,
-                speed: 1_f32.into(),
                 center: Vec3::ZERO,
                 axis: Vec3::Y,
             })
-            .init(InitLifetimeModifier { lifetime: 0.8 })
+            .init(InitVelocitySphereModifier {
+                speed: 1_f32.into(),
+                center: Vec3::ZERO,
+            })
+            .init(InitLifetimeModifier {
+                lifetime: 0.8.into(),
+            })
             .update(LinearDragModifier { drag: 5. })
             .render(BillboardModifier {})
-            .update(AccelModifier {
-                accel: Vec3::new(0., 1., 0.),
-            })
+            .update(AccelModifier::constant(Vec3::new(0., 1., 0.)))
             .render(ColorOverLifetimeModifier {
                 gradient: color_gradient,
             })
diff --git a/src/player_control/actions.rs b/src/player_control/actions.rs
index 341a97b7..46a6c670 100644
--- a/src/player_control/actions.rs
+++ b/src/player_control/actions.rs
@@ -37,9 +37,10 @@ impl Plugin for ActionsPlugin {
             .add_plugin(InputManagerPlugin::<PlayerAction>::default())
             .add_plugin(InputManagerPlugin::<CameraAction>::default())
             .add_plugin(InputManagerPlugin::<UiAction>::default())
-            .add_system_to_stage(
-                CoreStage::PreUpdate,
-                remove_actions_when_frozen.after(InputManagerSystem::ManualControl),
+            .add_system(
+                remove_actions_when_frozen
+                    .after(InputManagerSystem::ManualControl)
+                    .in_base_set(CoreSet::PreUpdate),
             );
     }
 }
diff --git a/src/player_control/camera.rs b/src/player_control/camera.rs
index 8386ed03..4232c75d 100644
--- a/src/player_control/camera.rs
+++ b/src/player_control/camera.rs
@@ -99,7 +99,7 @@ impl Default for IngameCameraKind {
 /// third person or fixed angle camera is used.
 pub struct CameraPlugin;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, SystemLabel)]
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
 pub struct SetCameraFocusLabel;
 
 impl Plugin for CameraPlugin {
@@ -112,26 +112,28 @@ impl Plugin for CameraPlugin {
             .register_type::<FixedAngleCamera>()
             .init_resource::<ForceCursorGrabMode>()
             .add_startup_system(spawn_ui_camera)
-            .add_system_set(SystemSet::on_enter(GameState::Playing).with_system(despawn_ui_camera))
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(cursor_grab_system.pipe(log_errors))
-                    .with_system(init_camera.pipe(log_errors))
-                    .with_system(set_camera_focus.pipe(log_errors).label(SetCameraFocusLabel))
-                    .with_system(switch_kind.after(SetCameraFocusLabel))
-                    .with_system(
-                        update_transform
-                            .pipe(log_errors)
-                            .label(UpdateCameraTransformLabel)
-                            .after(switch_kind),
-                    )
-                    .with_system(update_config.pipe(log_errors))
-                    .with_system(move_skydome.after(UpdateCameraTransformLabel)),
+            .add_system(despawn_ui_camera.in_schedule(OnEnter(GameState::Playing)))
+            .add_systems(
+                (
+                    cursor_grab_system.pipe(log_errors),
+                    init_camera.pipe(log_errors),
+                    set_camera_focus
+                        .pipe(log_errors)
+                        .in_set(SetCameraFocusLabel),
+                    switch_kind.after(SetCameraFocusLabel),
+                    update_transform
+                        .pipe(log_errors)
+                        .in_set(UpdateCameraTransformLabel)
+                        .after(switch_kind),
+                    update_config.pipe(log_errors),
+                    move_skydome.after(UpdateCameraTransformLabel),
+                )
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
 
-#[derive(SystemLabel)]
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
 pub struct UpdateCameraTransformLabel;
 
 fn init_camera(
@@ -248,17 +250,18 @@ fn cursor_grab_system(
     let mut window = primary_windows
         .get_single_mut()
         .context("Failed to get primary window")?;
+    let cursor = &mut window.cursor;
     if let Some(mode) = force_cursor_grab.0 {
-        window.set_cursor_grab_mode(mode);
-        window.set_cursor_visibility(mode != CursorGrabMode::Locked);
+        cursor.grab_mode = mode;
+        cursor.visible = mode != CursorGrabMode::Locked;
         return Ok(());
     }
     if actions_frozen.is_frozen() {
-        window.set_cursor_grab_mode(CursorGrabMode::None);
-        window.set_cursor_visibility(true);
+        cursor.grab_mode = CursorGrabMode::None;
+        cursor.visible = true;
     } else {
-        window.set_cursor_grab_mode(CursorGrabMode::Locked);
-        window.set_cursor_visibility(false);
+        cursor.grab_mode = CursorGrabMode::Locked;
+        cursor.visible = false;
     }
     Ok(())
 }
diff --git a/src/player_control/player_embodiment.rs b/src/player_control/player_embodiment.rs
index 3ba64fe5..1de35f36 100644
--- a/src/player_control/player_embodiment.rs
+++ b/src/player_control/player_embodiment.rs
@@ -27,28 +27,24 @@ impl Plugin for PlayerEmbodimentPlugin {
     fn build(&self, app: &mut App) {
         app.register_type::<Timer>()
             .register_type::<Player>()
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(
-                        handle_jump
-                            .after(reset_movement_components)
-                            .before(apply_jumping),
-                    )
-                    .with_system(
-                        handle_horizontal_movement
-                            .pipe(log_errors)
-                            .after(UpdateCameraTransformLabel)
-                            .after(reset_movement_components)
-                            .before(apply_walking),
-                    )
-                    .with_system(
-                        handle_camera_kind
-                            .after(switch_camera_kind)
-                            .before(apply_walking),
-                    )
-                    .with_system(handle_speed_effects)
-                    .with_system(rotate_to_speaker)
-                    .with_system(control_walking_sound.pipe(log_errors)),
+            .add_systems(
+                (
+                    handle_jump
+                        .after(reset_movement_components)
+                        .before(apply_jumping),
+                    handle_horizontal_movement
+                        .pipe(log_errors)
+                        .after(UpdateCameraTransformLabel)
+                        .after(reset_movement_components)
+                        .before(apply_walking),
+                    handle_camera_kind
+                        .after(switch_camera_kind)
+                        .before(apply_walking),
+                    handle_speed_effects,
+                    rotate_to_speaker,
+                    control_walking_sound.pipe(log_errors),
+                )
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
@@ -121,10 +117,10 @@ fn handle_camera_kind(
                     let horizontal_direction = camera_transform.forward().split(up).horizontal;
                     let looking_target = player_transform.translation + horizontal_direction;
                     player_transform.look_at(looking_target, up);
-                    visibility.is_visible = false;
+                    *visibility = Visibility::Hidden;
                 }
                 IngameCameraKind::ThirdPerson(_) | IngameCameraKind::FixedAngle(_) => {
-                    visibility.is_visible = true
+                    *visibility = Visibility::Inherited;
                 }
             }
         }
diff --git a/src/shader.rs b/src/shader.rs
index efc8cdb0..8c7fc33f 100644
--- a/src/shader.rs
+++ b/src/shader.rs
@@ -26,10 +26,11 @@ impl Plugin for ShaderPlugin {
         app.add_plugin(MaterialPlugin::<GlowyMaterial>::default())
             .add_plugin(MaterialPlugin::<RepeatedMaterial>::default())
             .add_plugin(MaterialPlugin::<SkydomeMaterial>::default())
-            .add_system_set(SystemSet::on_exit(GameState::Loading).with_system(setup_shader))
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(set_texture_to_repeat.pipe(log_errors)),
+            .add_system(setup_shader.in_schedule(OnExit(GameState::Loading)))
+            .add_system(
+                set_texture_to_repeat
+                    .pipe(log_errors)
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
diff --git a/src/world_interaction/condition.rs b/src/world_interaction/condition.rs
index e592ba2f..957fc9ef 100644
--- a/src/world_interaction/condition.rs
+++ b/src/world_interaction/condition.rs
@@ -9,7 +9,7 @@ impl Plugin for ConditionPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<ActiveConditions>()
             .add_event::<ConditionAddEvent>()
-            .add_system_set(SystemSet::on_update(GameState::Playing).with_system(add_conditions));
+            .add_system(add_conditions.in_set(OnUpdate(GameState::Playing)));
     }
 }
 
diff --git a/src/world_interaction/dialog.rs b/src/world_interaction/dialog.rs
index 6b81d73f..072c07a8 100644
--- a/src/world_interaction/dialog.rs
+++ b/src/world_interaction/dialog.rs
@@ -26,10 +26,12 @@ impl Plugin for DialogPlugin {
         app.add_plugin(EguiPlugin)
             .register_type::<DialogId>()
             .add_event::<DialogEvent>()
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(set_current_dialog.pipe(log_errors))
-                    .with_system(show_dialog.pipe(log_errors)),
+            .add_systems(
+                (
+                    set_current_dialog.pipe(log_errors),
+                    show_dialog.pipe(log_errors),
+                )
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }
diff --git a/src/world_interaction/interactions_ui.rs b/src/world_interaction/interactions_ui.rs
index b254360c..3d6dcc3b 100644
--- a/src/world_interaction/interactions_ui.rs
+++ b/src/world_interaction/interactions_ui.rs
@@ -20,15 +20,18 @@ impl Plugin for InteractionsUiPlugin {
     fn build(&self, app: &mut App) {
         app.register_type::<InteractionOpportunities>()
             .init_resource::<InteractionOpportunities>()
-            .add_system_set(
-                SystemSet::on_update(GameState::Playing)
-                    .with_system(update_interaction_opportunities)
-                    .with_system(
-                        update_interaction_ui
-                            .pipe(log_errors)
-                            .after(update_interaction_opportunities),
-                    )
-                    .with_system(display_interaction_prompt.pipe(log_errors)),
+            .add_systems(
+                (
+                    update_interaction_opportunities,
+                    update_interaction_ui.pipe(log_errors),
+                )
+                    .chain()
+                    .in_set(OnUpdate(GameState::Playing)),
+            )
+            .add_system(
+                display_interaction_prompt
+                    .pipe(log_errors)
+                    .in_set(OnUpdate(GameState::Playing)),
             );
     }
 }

From 0ca46e2c6a7592e28f83ab7203e7e49a497bb7a9 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 01:03:36 +0100
Subject: [PATCH 03/13] Fix WASM build

---
 src/level_instantiation/map.rs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/level_instantiation/map.rs b/src/level_instantiation/map.rs
index 43d629c2..b5692a37 100644
--- a/src/level_instantiation/map.rs
+++ b/src/level_instantiation/map.rs
@@ -65,18 +65,20 @@ fn show_loading_screen(player_query: Query<&Player>, mut egui_contexts: EguiCont
 #[cfg(feature = "wasm")]
 fn show_wasm_loader(player_query: Query<&Player>, mut egui_contexts: EguiContexts) {
     let id = egui::Id::new("loading-screen-shown");
-    let memory = &mut egui_contexts.ctx_mut().memory().data;
-    match (memory.get_temp::<()>(id), player_query.iter().next()) {
-        (None, None) => {
-            loader::show_loader();
-            memory.insert_temp(id, ());
+    egui_contexts.ctx_mut().memory_mut(|memory| {
+        let memory = &mut memory.data;
+        match (memory.get_temp::<()>(id), player_query.iter().next()) {
+            (None, None) => {
+                loader::show_loader();
+                memory.insert_temp(id, ());
+            }
+            (Some(_), Some(_)) => {
+                loader::hide_loader();
+                memory.remove::<()>(id);
+            }
+            _ => {}
         }
-        (Some(_), Some(_)) => {
-            loader::hide_loader();
-            memory.remove::<()>(id);
-        }
-        _ => {}
-    }
+    });
 }
 
 #[cfg(feature = "wasm")]

From 83ab2d4a3d4b18be81bf22d4eb4a061ad05f7389 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 01:18:49 +0100
Subject: [PATCH 04/13] Play around with config

---
 .cargo/config.toml | 8 ++------
 Cargo.toml         | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 77c0719b..757d76e6 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -26,12 +26,8 @@ opt-level = 1
 
 # Enable high optimizations for dependencies (incl. Bevy), but not for our code:
 [profile.dev.package."*"]
-opt-level = 3
+opt-level = 2
 
 [profile.release]
-# Don't change this to "thin" or your macOS releases will be broken after being packed to a .app for some reason.
-lto = true
+lto = "thin"
 codegen-units = 1
-
-[build]
-incremental = true
diff --git a/Cargo.toml b/Cargo.toml
index c5142d5c..725fee17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,6 @@ core = [
     "bevy/zstd",
     "bevy/x11",
     "bevy/ktx2",
-    "bevy/filesystem_watcher",
     "bevy/tonemapping_luts",
     "bevy/serialize",
 ]

From 8c803cdea44ddada7ee2df5a36a9f41a0d9bd351 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 01:26:07 +0100
Subject: [PATCH 05/13] Fix outdated info in readme

---
 readme.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index e729cad4..afd74d14 100644
--- a/readme.md
+++ b/readme.md
@@ -23,9 +23,10 @@ be good enough for others to find inspiration, copy parts they like or troublesh
 - Animations
 - A custom dialog system
 - Shaders
-- GLTF imports, including colliders and navmeshes
-- dynamic builds in the `native-dev` feature
-- Grass blades using `warblersneeds`
+- GLTF imports, including auto-detection of colliders
+- Dynamic builds in the `native-dev` feature
+- Grass blades using `warbler_grass`
+- A skydome that follows the camera
 
 ## Usage
 

From 32b5596143163fa0d2e11a22a576792522ec87e6 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 15:51:23 +0100
Subject: [PATCH 06/13] Fix missing WGSL imports

---
 assets/shaders/glowy.wgsl    | 6 +++---
 assets/shaders/repeated.wgsl | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/assets/shaders/glowy.wgsl b/assets/shaders/glowy.wgsl
index ef5a72d7..a697a45b 100644
--- a/assets/shaders/glowy.wgsl
+++ b/assets/shaders/glowy.wgsl
@@ -38,8 +38,8 @@ fn dir_to_equirectangular(dir: vec3<f32>) -> vec2<f32> {
 /// Is prefixed with "own_" because the built-in refract function is only available in WASM for some reason.
 fn own_refract(i: vec3<f32>, n: vec3<f32>, eta: f32) -> vec3<f32> {
     let k = 1.0 - eta * eta * (1.0 - dot(n, i) * dot(n, i));
-    let k = max(k, 0.0);
-    return eta * i - (eta * dot(n, i) + sqrt(k)) * n;
+    let relu_k = max(k, 0.0);
+    return eta * i - (eta * dot(n, i) + sqrt(relu_k)) * n;
 }
 
 /// Returns RGB vector
@@ -93,4 +93,4 @@ fn fragment(in: FragmentInput) -> @location(0) vec4<f32> {
     /// The RGB of the reflection is multiplied with a fresnel on the edge, making it only appear as a "sheen"
     let total = color * refraction + reflection * (fresnel + 0.05);
     return vec4<f32>(total, alpha);
-}
\ No newline at end of file
+}
diff --git a/assets/shaders/repeated.wgsl b/assets/shaders/repeated.wgsl
index 1988feee..522b2e47 100644
--- a/assets/shaders/repeated.wgsl
+++ b/assets/shaders/repeated.wgsl
@@ -7,6 +7,8 @@
 #import bevy_pbr::clustered_forward
 #import bevy_pbr::lighting
 #import bevy_pbr::shadows
+#import bevy_pbr::pbr_ambient
+#import bevy_pbr::fog
 #import bevy_pbr::pbr_functions
 
 struct Repeats {
@@ -84,4 +86,4 @@ fn fragment(in: FragmentInput) -> @location(0) vec4<f32> {
 
 
     return texture * pbr_output;
-}
\ No newline at end of file
+}

From 290b3d4a9a83cdc05372c12361446b015826a3eb Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 15:52:53 +0100
Subject: [PATCH 07/13] Fix WGSL redefinitions

---
 assets/shaders/glowy.wgsl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/assets/shaders/glowy.wgsl b/assets/shaders/glowy.wgsl
index a697a45b..d01ea58e 100644
--- a/assets/shaders/glowy.wgsl
+++ b/assets/shaders/glowy.wgsl
@@ -9,6 +9,8 @@
 #import bevy_pbr::clustered_forward
 #import bevy_pbr::lighting
 #import bevy_pbr::shadows
+#import bevy_pbr::pbr_ambient
+#import bevy_pbr::fog
 #import bevy_pbr::pbr_functions
 
 
@@ -61,8 +63,8 @@ fn fragment(in: FragmentInput) -> @location(0) vec4<f32> {
     // See <https://en.wikipedia.org/wiki/Fresnel_equations>
     // This will make sure we have a kind of "halo" of light around our reflection, which the eye expects
     // since reflections are usually much brigther around the edges
-    let fresnel = clamp(1. - n_dot_v, 0.0, 1.0);
-    let fresnel = pow(fresnel, 5.) * 2.;
+    var fresnel = clamp(1. - n_dot_v, 0.0, 1.0);
+    fresnel = pow(fresnel, 5.) * 2.;
 
     // Increase contrast
     // => Face in the center of the sphere have normals pointing to the camera, which makes them brighter

From 38544ad09b93f1eba8e159802fb927ffb91b0691 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 16:38:02 +0100
Subject: [PATCH 08/13] Fix Wasm crash by disabling CCD

---
 src/level_instantiation/spawning/objects/player.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/level_instantiation/spawning/objects/player.rs b/src/level_instantiation/spawning/objects/player.rs
index 3c2d91ed..9723c78a 100644
--- a/src/level_instantiation/spawning/objects/player.rs
+++ b/src/level_instantiation/spawning/objects/player.rs
@@ -43,7 +43,6 @@ impl PrimedGameObjectSpawnerImplementor for PlayerSpawner {
                     GameCollisionGroup::PLAYER.into(),
                     GameCollisionGroup::ALL.into(),
                 ),
-                Ccd::enabled(),
                 create_player_action_input_manager_bundle(),
                 create_ui_action_input_manager_bundle(),
             ))

From 6970312d566f91af1a8e6c2e01b4dd65a1cfeb44 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 17:37:05 +0100
Subject: [PATCH 09/13] Fix ground not receiving shadows

---
 assets/shaders/repeated.wgsl                  | 101 +++++++++++++-----
 .../spawning/objects/sunlight.rs              |   7 ++
 2 files changed, 81 insertions(+), 27 deletions(-)

diff --git a/assets/shaders/repeated.wgsl b/assets/shaders/repeated.wgsl
index 522b2e47..78028016 100644
--- a/assets/shaders/repeated.wgsl
+++ b/assets/shaders/repeated.wgsl
@@ -6,8 +6,8 @@
 #import bevy_pbr::utils
 #import bevy_pbr::clustered_forward
 #import bevy_pbr::lighting
-#import bevy_pbr::shadows
 #import bevy_pbr::pbr_ambient
+#import bevy_pbr::shadows
 #import bevy_pbr::fog
 #import bevy_pbr::pbr_functions
 
@@ -45,37 +45,84 @@ fn get_pbr_output(in: FragmentInput) -> vec4<f32> {
     var material = standard_material_new();
     material.perceptual_roughness = 1.0;
 
-    var pbr_input = pbr_input_new();
-    pbr_input.frag_coord = in.frag_coord;
-    pbr_input.world_position = in.world_position;
-    pbr_input.world_normal = in.world_normal;
-    pbr_input.material = material;
-    pbr_input.world_normal = prepare_world_normal(
-        in.world_normal,
-        (material.flags & STANDARD_MATERIAL_FLAGS_DOUBLE_SIDED_BIT) != 0u,
-        in.is_front,
-    );
-
-    pbr_input.is_orthographic = view.projection[3].w == 1.0;
-
-    pbr_input.N = apply_normal_mapping(
-        material.flags,
-        pbr_input.world_normal,
-        in.uv,
-    );
-    pbr_input.V = calculate_view(in.world_position, pbr_input.is_orthographic);
-
-    var output_color = pbr(pbr_input);
-
-    output_color = tone_mapping(output_color);
+    var output_color: vec4<f32> = material.base_color;
+
+
+    // NOTE: Unlit bit not set means == 0 is true, so the true case is if lit
+    if ((material.flags & STANDARD_MATERIAL_FLAGS_UNLIT_BIT) == 0u) {
+        // Prepare a 'processed' StandardMaterial by sampling all textures to resolve
+        // the material members
+        var pbr_input = pbr_input_new();
+        pbr_input.frag_coord = in.frag_coord;
+        pbr_input.world_position = in.world_position;
+        pbr_input.world_normal = in.world_normal;
+        pbr_input.material = material;
+
+        // TODO use .a for exposure compensation in HDR
+        var emissive: vec4<f32> = material.emissive;
+
+        pbr_input.material.emissive = emissive;
+
+        var metallic: f32 = material.metallic;
+        var perceptual_roughness: f32 = material.perceptual_roughness;
+
+        pbr_input.material.metallic = metallic;
+        pbr_input.material.perceptual_roughness = perceptual_roughness;
+
+        var occlusion: f32 = 1.0;
+
+        pbr_input.frag_coord = in.frag_coord;
+        pbr_input.world_position = in.world_position;
+        pbr_input.world_normal = prepare_world_normal(
+            in.world_normal,
+            (material.flags & STANDARD_MATERIAL_FLAGS_DOUBLE_SIDED_BIT) != 0u,
+            in.is_front,
+        );
+
+        pbr_input.is_orthographic = view.projection[3].w == 1.0;
+
+        pbr_input.N = apply_normal_mapping(
+            material.flags,
+            pbr_input.world_normal,
+#ifdef VERTEX_TANGENTS
+#ifdef STANDARDMATERIAL_NORMAL_MAP
+            in.world_tangent,
+#endif
+#endif
+#ifdef VERTEX_UVS
+            in.uv,
+#endif
+        );
+        pbr_input.V = calculate_view(in.world_position, pbr_input.is_orthographic);
+        pbr_input.occlusion = occlusion;
+
+        pbr_input.flags = mesh.flags;
+
+        output_color = pbr(pbr_input);
+    } else {
+        output_color = alpha_discard(material, output_color);
+    }
+
+    // fog
+    if (fog.mode != FOG_MODE_OFF && (material.flags & STANDARD_MATERIAL_FLAGS_FOG_ENABLED_BIT) != 0u) {
+        output_color = apply_fog(output_color, in.world_position.xyz, view.world_position.xyz);
+    }
+
+#ifdef TONEMAP_IN_SHADER
+        output_color = tone_mapping(output_color);
+#endif
+#ifdef DEBAND_DITHER
     var output_rgb = output_color.rgb;
-    output_rgb = pow(output_rgb, vec3<f32>(1.0 / 2.2));
+    output_rgb = powsafe(output_rgb, 1.0 / 2.2);
     output_rgb = output_rgb + screen_space_dither(in.frag_coord.xy);
     // This conversion back to linear space is required because our output texture format is
     // SRGB; the GPU will assume our output is linear and will apply an SRGB conversion.
-    output_rgb = pow(output_rgb, vec3<f32>(2.2));
+    output_rgb = powsafe(output_rgb, 2.2);
     output_color = vec4(output_rgb, output_color.a);
-
+#endif
+#ifdef PREMULTIPLY_ALPHA
+        output_color = premultiply_alpha(material.flags, output_color);
+#endif
     return output_color;
 }
 
diff --git a/src/level_instantiation/spawning/objects/sunlight.rs b/src/level_instantiation/spawning/objects/sunlight.rs
index 8bcd797a..76b3d34c 100644
--- a/src/level_instantiation/spawning/objects/sunlight.rs
+++ b/src/level_instantiation/spawning/objects/sunlight.rs
@@ -2,6 +2,7 @@ use crate::level_instantiation::spawning::{
     GameObject, PrimedGameObjectSpawner, PrimedGameObjectSpawnerImplementor,
 };
 use anyhow::Result;
+use bevy::pbr::CascadeShadowConfigBuilder;
 use bevy::prelude::*;
 
 pub struct SunlightSpawner;
@@ -22,6 +23,12 @@ impl PrimedGameObjectSpawnerImplementor for SunlightSpawner {
                         shadows_enabled: true,
                         ..default()
                     },
+                    cascade_shadow_config: CascadeShadowConfigBuilder {
+                        first_cascade_far_bound: 7.0,
+                        maximum_distance: 100.0,
+                        ..default()
+                    }
+                    .into(),
                     transform,
                     ..default()
                 },

From b0d58ff5883b286957a14858c58483883fa38ac0 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 17:43:03 +0100
Subject: [PATCH 10/13] Use new syntax for startup systems

---
 src/bevy_config.rs           | 2 +-
 src/player_control/camera.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bevy_config.rs b/src/bevy_config.rs
index 2d66cab7..c8808a6d 100644
--- a/src/bevy_config.rs
+++ b/src/bevy_config.rs
@@ -30,7 +30,7 @@ impl Plugin for BevyConfigPlugin {
         app.insert_resource(Msaa::Sample4)
             .insert_resource(ClearColor(Color::rgb(0.4, 0.4, 0.4)))
             .add_plugins(default_plugins)
-            .add_startup_system(set_window_icon.pipe(log_errors));
+            .add_system(set_window_icon.pipe(log_errors).on_startup());
     }
 }
 
diff --git a/src/player_control/camera.rs b/src/player_control/camera.rs
index 4232c75d..153d8da8 100644
--- a/src/player_control/camera.rs
+++ b/src/player_control/camera.rs
@@ -111,7 +111,7 @@ impl Plugin for CameraPlugin {
             .register_type::<FirstPersonCamera>()
             .register_type::<FixedAngleCamera>()
             .init_resource::<ForceCursorGrabMode>()
-            .add_startup_system(spawn_ui_camera)
+            .add_system(spawn_ui_camera.on_startup())
             .add_system(despawn_ui_camera.in_schedule(OnEnter(GameState::Playing)))
             .add_systems(
                 (

From f1a501090f82e15472dfaabadd5a73d3a33cdbc0 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 18:16:02 +0100
Subject: [PATCH 11/13] Refactor all systems returning early

---
 .../game_state_serialization.rs               | 17 +++-----
 .../level_serialization.rs                    | 15 +++----
 src/level_instantiation/map.rs                | 43 ++++++++++---------
 src/player_control/actions.rs                 | 23 +++++-----
 src/player_control/camera.rs                  |  4 +-
 src/player_control/player_embodiment.rs       | 17 +++-----
 src/util.rs                                   |  1 +
 src/util/criteria.rs                          |  6 +++
 src/world_interaction/dialog.rs               |  5 +--
 src/world_interaction/interactions_ui.rs      | 15 ++-----
 10 files changed, 64 insertions(+), 82 deletions(-)
 create mode 100644 src/util/criteria.rs

diff --git a/src/file_system_interaction/game_state_serialization.rs b/src/file_system_interaction/game_state_serialization.rs
index 0c4a1c48..e884e8b4 100644
--- a/src/file_system_interaction/game_state_serialization.rs
+++ b/src/file_system_interaction/game_state_serialization.rs
@@ -23,7 +23,9 @@ impl Plugin for GameStateSerializationPlugin {
             .add_systems(
                 (
                     handle_load_requests.pipe(log_errors),
-                    handle_save_requests.pipe(log_errors),
+                    handle_save_requests
+                        .pipe(log_errors)
+                        .run_if(resource_exists::<CurrentLevel>()),
                 )
                     .chain()
                     .in_set(OnUpdate(GameState::Playing)),
@@ -132,18 +134,9 @@ fn handle_save_requests(
     conditions: Res<ActiveConditions>,
     dialog: Option<Res<CurrentDialog>>,
     player_query: Query<&GlobalTransform, With<Player>>,
-    current_level: Option<Res<CurrentLevel>>,
+    current_level: Res<CurrentLevel>,
 ) -> Result<()> {
-    let dialog = if let Some(ref dialog) = dialog {
-        let dialog: CurrentDialog = dialog.as_ref().clone();
-        Some(dialog)
-    } else {
-        None
-    };
-    let current_level = match current_level {
-        Some(level) => level,
-        None => return Ok(()),
-    };
+    let dialog = dialog.map(|ref dialog| dialog.as_ref().clone());
     for save in save_events.iter() {
         for player in &player_query {
             let dialog_event = dialog.clone().map(|dialog| DialogEvent {
diff --git a/src/file_system_interaction/level_serialization.rs b/src/file_system_interaction/level_serialization.rs
index 3439e156..d2dd1802 100644
--- a/src/file_system_interaction/level_serialization.rs
+++ b/src/file_system_interaction/level_serialization.rs
@@ -20,7 +20,12 @@ impl Plugin for LevelSerializationPlugin {
         app.add_event::<WorldSaveRequest>()
             .add_event::<WorldLoadRequest>()
             .add_system(save_world.pipe(log_errors).after(SpawnRequestedLabel))
-            .add_system(load_world.pipe(log_errors).in_base_set(CoreSet::PostUpdate));
+            .add_system(
+                load_world
+                    .pipe(log_errors)
+                    .run_if(resource_exists::<LevelAssets>())
+                    .in_base_set(CoreSet::PostUpdate),
+            );
     }
 }
 #[derive(Debug, Clone, Eq, PartialEq, Reflect, Serialize, Deserialize, Default)]
@@ -96,14 +101,8 @@ fn load_world(
     current_spawn_query: Query<Entity, With<SpawnTracker>>,
     mut spawn_requests: EventWriter<SpawnEvent>,
     levels: Res<Assets<SerializedLevel>>,
-    level_handles: Option<Res<LevelAssets>>,
+    level_handles: Res<LevelAssets>,
 ) -> Result<()> {
-    let level_handles = match level_handles {
-        Some(level_handles) => level_handles,
-        None => {
-            return Ok(());
-        }
-    };
     for load in load_requests.iter() {
         let path = Path::new("levels")
             .join(load.filename.clone())
diff --git a/src/level_instantiation/map.rs b/src/level_instantiation/map.rs
index b5692a37..1936f464 100644
--- a/src/level_instantiation/map.rs
+++ b/src/level_instantiation/map.rs
@@ -9,8 +9,16 @@ pub struct MapPlugin;
 
 impl Plugin for MapPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(GameState::Playing)))
-            .add_system(show_loading_screen.in_set(OnUpdate(GameState::Playing)));
+        app.add_system(
+            setup
+                .run_if(not(resource_exists::<CurrentLevel>()))
+                .in_schedule(OnEnter(GameState::Playing)),
+        )
+        .add_system(
+            show_loading_screen
+                .run_if(not(any_with_component::<Player>()))
+                .in_set(OnUpdate(GameState::Playing)),
+        );
         #[cfg(feature = "wasm")]
         app.add_system(show_wasm_loader.in_set(OnUpdate(GameState::Playing)));
     }
@@ -20,12 +28,7 @@ fn setup(
     mut commands: Commands,
     mut loader: EventWriter<WorldLoadRequest>,
     mut delayed_spawner: EventWriter<DelayedSpawnEvent>,
-    current_level: Option<Res<CurrentLevel>>,
 ) {
-    if current_level.is_some() {
-        return;
-    }
-
     commands.insert_resource(AmbientLight {
         color: Color::WHITE,
         brightness: 0.3,
@@ -45,21 +48,19 @@ fn setup(
     });
 }
 
-fn show_loading_screen(player_query: Query<&Player>, mut egui_contexts: EguiContexts) {
-    if player_query.iter().next().is_none() {
-        egui::CentralPanel::default().show(egui_contexts.ctx_mut(), |ui| {
-            ui.vertical_centered(|ui| {
-                ui.add_space(100.0);
-                ui.heading("Loading");
-                ui.label("Spawning level...");
-                ui.add_space(10.0);
-                #[cfg(feature = "wasm")]
-                ui.add_space(40.0); // Spinner from CSS (build/web/styles.css) goes here.
-                #[cfg(feature = "wasm")]
-                ui.label("This may take a while. Don't worry, your browser did not crash!");
-            });
+fn show_loading_screen(mut egui_contexts: EguiContexts) {
+    egui::CentralPanel::default().show(egui_contexts.ctx_mut(), |ui| {
+        ui.vertical_centered(|ui| {
+            ui.add_space(100.0);
+            ui.heading("Loading");
+            ui.label("Spawning level...");
+            ui.add_space(10.0);
+            #[cfg(feature = "wasm")]
+            ui.add_space(40.0); // Spinner from CSS (build/web/styles.css) goes here.
+            #[cfg(feature = "wasm")]
+            ui.label("This may take a while. Don't worry, your browser did not crash!");
         });
-    }
+    });
 }
 
 #[cfg(feature = "wasm")]
diff --git a/src/player_control/actions.rs b/src/player_control/actions.rs
index 46a6c670..8b542eb5 100644
--- a/src/player_control/actions.rs
+++ b/src/player_control/actions.rs
@@ -1,3 +1,4 @@
+use crate::util::criteria::is_frozen;
 use bevy::prelude::*;
 use leafwing_input_manager::axislike::DualAxisData;
 use leafwing_input_manager::plugin::InputManagerSystem;
@@ -39,6 +40,7 @@ impl Plugin for ActionsPlugin {
             .add_plugin(InputManagerPlugin::<UiAction>::default())
             .add_system(
                 remove_actions_when_frozen
+                    .run_if(is_frozen)
                     .after(InputManagerSystem::ManualControl)
                     .in_base_set(CoreSet::PreUpdate),
             );
@@ -141,21 +143,18 @@ pub fn create_ui_action_input_manager_bundle() -> InputManagerBundle<UiAction> {
 }
 
 pub fn remove_actions_when_frozen(
-    actions_frozen: Res<ActionsFrozen>,
     mut player_actions_query: Query<&mut ActionState<PlayerAction>>,
     mut camera_actions_query: Query<&mut ActionState<CameraAction>>,
 ) {
-    if actions_frozen.is_frozen() {
-        for mut player_actions in player_actions_query.iter_mut() {
-            player_actions.action_data_mut(PlayerAction::Move).axis_pair = Some(default());
-            player_actions.release(PlayerAction::Jump);
-            player_actions.release(PlayerAction::Interact);
-            player_actions.release(PlayerAction::Sprint);
-        }
-        for mut camera_actions in camera_actions_query.iter_mut() {
-            camera_actions.action_data_mut(CameraAction::Pan).axis_pair = Some(default());
-            camera_actions.action_data_mut(CameraAction::Zoom).value = default();
-        }
+    for mut player_actions in player_actions_query.iter_mut() {
+        player_actions.action_data_mut(PlayerAction::Move).axis_pair = Some(default());
+        player_actions.release(PlayerAction::Jump);
+        player_actions.release(PlayerAction::Interact);
+        player_actions.release(PlayerAction::Sprint);
+    }
+    for mut camera_actions in camera_actions_query.iter_mut() {
+        camera_actions.action_data_mut(CameraAction::Pan).axis_pair = Some(default());
+        camera_actions.action_data_mut(CameraAction::Zoom).value = default();
     }
 }
 
diff --git a/src/player_control/camera.rs b/src/player_control/camera.rs
index 153d8da8..17a95ea9 100644
--- a/src/player_control/camera.rs
+++ b/src/player_control/camera.rs
@@ -254,9 +254,7 @@ fn cursor_grab_system(
     if let Some(mode) = force_cursor_grab.0 {
         cursor.grab_mode = mode;
         cursor.visible = mode != CursorGrabMode::Locked;
-        return Ok(());
-    }
-    if actions_frozen.is_frozen() {
+    } else if actions_frozen.is_frozen() {
         cursor.grab_mode = CursorGrabMode::None;
         cursor.visible = true;
     } else {
diff --git a/src/player_control/player_embodiment.rs b/src/player_control/player_embodiment.rs
index 1de35f36..f1f20932 100644
--- a/src/player_control/player_embodiment.rs
+++ b/src/player_control/player_embodiment.rs
@@ -41,7 +41,7 @@ impl Plugin for PlayerEmbodimentPlugin {
                         .after(switch_camera_kind)
                         .before(apply_walking),
                     handle_speed_effects,
-                    rotate_to_speaker,
+                    rotate_to_speaker.run_if(resource_exists::<CurrentDialog>()),
                     control_walking_sound.pipe(log_errors),
                 )
                     .in_set(OnUpdate(GameState::Playing)),
@@ -67,9 +67,8 @@ fn handle_horizontal_movement(
 ) -> Result<()> {
     #[cfg(feature = "tracing")]
     let _span = info_span!("handle_horizontal_movement").entered();
-    let camera = match camera_query.iter().next() {
-        Some(camera) => camera,
-        None => return Ok(()),
+    let Some(camera) = camera_query.iter().next() else {
+        return Ok(());
     };
 
     for (actions, mut walk, transform) in &mut player_query {
@@ -153,16 +152,12 @@ fn rotate_to_speaker(
     time: Res<Time>,
     mut with_player: Query<(&mut Transform, &Velocity), With<Player>>,
     without_player: Query<&Transform, Without<Player>>,
-    current_dialog: Option<Res<CurrentDialog>>,
+    current_dialog: Res<CurrentDialog>,
 ) {
     #[cfg(feature = "tracing")]
     let _span = info_span!("rotate_to_speaker").entered();
-    let speaker_entity = current_dialog
-        .map(|current_dialog| current_dialog.source)
-        .and_then(|source| without_player.get(source).ok());
-    let speaker_transform = match speaker_entity {
-        Some(speaker_transform) => speaker_transform,
-        None => return,
+    let Ok(speaker_transform) = without_player.get(current_dialog.source) else {
+         return;
     };
     let dt = time.delta_seconds();
 
diff --git a/src/util.rs b/src/util.rs
index a5ebdcc9..520ee069 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,2 +1,3 @@
+pub mod criteria;
 pub mod log_error;
 pub mod trait_extension;
diff --git a/src/util/criteria.rs b/src/util/criteria.rs
new file mode 100644
index 00000000..59d3d8b2
--- /dev/null
+++ b/src/util/criteria.rs
@@ -0,0 +1,6 @@
+use crate::player_control::actions::ActionsFrozen;
+use bevy::prelude::*;
+
+pub fn is_frozen(actions_frozen: Res<ActionsFrozen>) -> bool {
+    actions_frozen.is_frozen()
+}
diff --git a/src/world_interaction/dialog.rs b/src/world_interaction/dialog.rs
index 072c07a8..5f1bea70 100644
--- a/src/world_interaction/dialog.rs
+++ b/src/world_interaction/dialog.rs
@@ -112,12 +112,9 @@ fn show_dialog(
     time: Res<Time>,
     mut elapsed_time: Local<f32>,
 ) -> Result<()> {
-    let mut current_dialog = match current_dialog {
-        Some(current_dialog) => current_dialog,
-        None => {
+    let Some(mut current_dialog) = current_dialog else {
             *elapsed_time = 0.0;
             return Ok(());
-        }
     };
 
     for actions in actions.iter() {
diff --git a/src/world_interaction/interactions_ui.rs b/src/world_interaction/interactions_ui.rs
index 3d6dcc3b..ef0279bb 100644
--- a/src/world_interaction/interactions_ui.rs
+++ b/src/world_interaction/interactions_ui.rs
@@ -1,6 +1,7 @@
-use crate::player_control::actions::{ActionsFrozen, PlayerAction};
+use crate::player_control::actions::PlayerAction;
 use crate::player_control::camera::{IngameCamera, IngameCameraKind};
 use crate::player_control::player_embodiment::Player;
+use crate::util::criteria::is_frozen;
 use crate::util::log_error::log_errors;
 use crate::world_interaction::dialog::{DialogEvent, DialogTarget};
 use crate::GameState;
@@ -31,6 +32,7 @@ impl Plugin for InteractionsUiPlugin {
             .add_system(
                 display_interaction_prompt
                     .pipe(log_errors)
+                    .run_if(resource_exists::<InteractionUi>().and_then(not(is_frozen)))
                     .in_set(OnUpdate(GameState::Playing)),
             );
     }
@@ -153,22 +155,13 @@ fn is_facing_target(
 }
 
 fn display_interaction_prompt(
-    interaction_ui: Option<Res<InteractionUi>>,
+    interaction_ui: Res<InteractionUi>,
     mut dialog_event_writer: EventWriter<DialogEvent>,
     mut egui_contexts: EguiContexts,
     actions: Query<&ActionState<PlayerAction>>,
     primary_windows: Query<&Window, With<PrimaryWindow>>,
-    actions_frozen: Res<ActionsFrozen>,
     dialog_target_query: Query<&DialogTarget>,
 ) -> Result<()> {
-    if actions_frozen.is_frozen() {
-        return Ok(());
-    }
-    let interaction_ui = match interaction_ui {
-        Some(interaction_ui) => interaction_ui,
-        None => return Ok(()),
-    };
-
     for actions in actions.iter() {
         let window = primary_windows
             .get_single()

From 82e2124bb71773d5db0384860017da0f11d28f26 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Tue, 14 Mar 2023 18:22:30 +0100
Subject: [PATCH 12/13] Remove unnecessary reference wrangling

---
 src/file_system_interaction/game_state_serialization.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/file_system_interaction/game_state_serialization.rs b/src/file_system_interaction/game_state_serialization.rs
index e884e8b4..63a28de8 100644
--- a/src/file_system_interaction/game_state_serialization.rs
+++ b/src/file_system_interaction/game_state_serialization.rs
@@ -136,7 +136,7 @@ fn handle_save_requests(
     player_query: Query<&GlobalTransform, With<Player>>,
     current_level: Res<CurrentLevel>,
 ) -> Result<()> {
-    let dialog = dialog.map(|ref dialog| dialog.as_ref().clone());
+    let dialog = dialog.map(|dialog| dialog.clone());
     for save in save_events.iter() {
         for player in &player_query {
             let dialog_event = dialog.clone().map(|dialog| DialogEvent {

From c578ce8bfbd360498fc2013dcdc0216d492d7381 Mon Sep 17 00:00:00 2001
From: Jan Hohenheim <jan@hohenheim.ch>
Date: Wed, 15 Mar 2023 00:12:09 +0100
Subject: [PATCH 13/13] Patch warbler grass

---
 Cargo.lock | 3 +--
 Cargo.toml | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc7b6f11..623eb671 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4429,8 +4429,7 @@ dependencies = [
 [[package]]
 name = "warbler_grass"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80f27edf9f3acf394df16ba3955c56fa8b35e7c50857c8bbb91a6456196f129f"
+source = "git+https://github.com/EmiOnGit/warbler_grass?rev=3fd85a393eee3c1bdeef5d8290a072befe3bd35f#3fd85a393eee3c1bdeef5d8290a072befe3bd35f"
 dependencies = [
  "bevy",
  "bitflags",
diff --git a/Cargo.toml b/Cargo.toml
index 725fee17..8faa4c0f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,3 +106,7 @@ image = { version = "0.24", default-features = false }
 
 [build-dependencies]
 embed-resource = "1.4"
+
+[patch.crates-io]
+# Fix https://github.com/EmiOnGit/warbler_grass/issues/52
+warbler_grass = { git = "https://github.com/EmiOnGit/warbler_grass", rev = "3fd85a393eee3c1bdeef5d8290a072befe3bd35f" }