diff --git a/game/Cargo.lock b/game/Cargo.lock
index 5aad374ec6fc9744e4d7b988a071693183bf73e3..1ee3696e3a1240ca4be8b5d413abd7a754451481 100644
--- a/game/Cargo.lock
+++ b/game/Cargo.lock
@@ -2,12 +2,6 @@
# It is not intended for manual editing.
version = 3
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
[[package]]
name = "ab_glyph"
version = "0.2.22"
@@ -25,23 +19,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
[[package]]
-name = "adler32"
-version = "1.2.0"
+name = "accesskit"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
[[package]]
-name = "ahash"
-version = "0.4.7"
+name = "accesskit_consumer"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00"
+dependencies = [
+ "accesskit",
+]
+
+[[package]]
+name = "accesskit_macos"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "objc2",
+ "once_cell",
+]
+
+[[package]]
+name = "accesskit_windows"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "arrayvec",
+ "once_cell",
+ "paste",
+ "windows 0.48.0",
+]
+
+[[package]]
+name = "accesskit_winit"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0"
+dependencies = [
+ "accesskit",
+ "accesskit_macos",
+ "accesskit_windows",
+ "winit",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "ahash"
-version = "0.7.6"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
dependencies = [
+ "cfg-if",
"getrandom",
"once_cell",
"version_check",
@@ -56,16 +107,22 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
[[package]]
name = "alsa"
-version = "0.5.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18"
+checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47"
dependencies = [
"alsa-sys",
"bitflags 1.3.2",
"libc",
- "nix 0.20.0",
+ "nix 0.24.3",
]
[[package]]
@@ -79,36 +136,42 @@ dependencies = [
]
[[package]]
-name = "android_log-sys"
-version = "0.1.2"
+name = "android-activity"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8052e2d8aabbb8d556d6abbcce2a22b9590996c5f849b9c7ce4544a2e3b984e"
+checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
+dependencies = [
+ "android-properties",
+ "bitflags 1.3.2",
+ "cc",
+ "jni-sys",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "num_enum 0.6.1",
+]
[[package]]
-name = "android_log-sys"
-version = "0.2.0"
+name = "android-properties"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
[[package]]
-name = "android_logger"
-version = "0.8.6"
+name = "android_log-sys"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cbd542dd180566fad88fd2729a53a62a734843c626638006a9d63ec0688484e"
-dependencies = [
- "android_log-sys 0.1.2",
- "env_logger",
- "lazy_static",
- "log",
-]
+checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
[[package]]
-name = "ansi_term"
-version = "0.12.1"
+name = "android_system_properties"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
- "winapi 0.3.9",
+ "libc",
]
[[package]]
@@ -128,17 +191,17 @@ dependencies = [
[[package]]
name = "arrayvec"
-version = "0.5.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "ash"
-version = "0.31.0"
+version = "0.37.3+1.3.251"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c69a8137596e84c22d57f3da1b5de1d4230b1742a710091c85f4d7ce50f00f38"
+checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
dependencies = [
- "libloading 0.6.7",
+ "libloading 0.7.4",
]
[[package]]
@@ -188,10 +251,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
-name = "base-x"
-version = "0.2.11"
+name = "backtrace"
+version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
[[package]]
name = "base64"
@@ -199,44 +271,76 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+[[package]]
+name = "base64"
+version = "0.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+
[[package]]
name = "bevy"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b14f8ba7c373fdf7bd27547bb95f2849b2569bf02bbf3d19ca54e9d692de4f"
+checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7"
dependencies = [
"bevy_internal",
- "syn 1.0.65",
]
[[package]]
-name = "bevy-glsl-to-spirv"
-version = "0.2.1"
+name = "bevy_a11y"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42"
+dependencies = [
+ "accesskit",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+]
+
+[[package]]
+name = "bevy_animation"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d5f2f58f0aec3c50a20799792c3705e80dd7df327e79791cacec197e84e5e61"
+checksum = "f44eae3f1c35a87e38ad146f72317f19ce7616dad8bbdfb88ee752c1282d28c5"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+]
[[package]]
name = "bevy_app"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "845be45f00d9c031071f8c68f7681bf791796634efa5f58937275337154cb019"
+checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531"
dependencies = [
"bevy_derive",
"bevy_ecs",
"bevy_reflect",
+ "bevy_tasks",
"bevy_utils",
- "serde",
+ "downcast-rs",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "bevy_asset"
-version = "0.5.1"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd798cfbed1fcd406c9b3c978a8cb0a278aa03c4c8abd6edf460ee7cad0987e0"
+checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68"
dependencies = [
"anyhow",
+ "async-channel",
"bevy_app",
"bevy_diagnostic",
"bevy_ecs",
@@ -244,14 +348,13 @@ dependencies = [
"bevy_reflect",
"bevy_tasks",
"bevy_utils",
+ "bevy_winit",
"crossbeam-channel",
"downcast-rs",
+ "fastrand 1.9.0",
"js-sys",
- "ndk-glue 0.2.1",
"notify",
- "parking_lot",
- "rand",
- "ron",
+ "parking_lot 0.12.1",
"serde",
"thiserror",
"wasm-bindgen",
@@ -261,305 +364,453 @@ dependencies = [
[[package]]
name = "bevy_audio"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ca3cf9ce76696665e37a68b27ad6f6b0e2d0d85ccad36d8f018d3006812dbde"
+checksum = "4de308bd63a2f7a0b77ffeb7cf00cc185ec01393c5db2091fe03964f97152749"
dependencies = [
"anyhow",
"bevy_app",
"bevy_asset",
+ "bevy_derive",
"bevy_ecs",
+ "bevy_math",
"bevy_reflect",
+ "bevy_transform",
"bevy_utils",
- "parking_lot",
+ "oboe",
+ "parking_lot 0.12.1",
"rodio",
]
[[package]]
name = "bevy_core"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa5b6d7f68752cfb5b498fc5ea9ad5cfb5de871cdd4d894f2e046fef2e2898ea"
+checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48"
dependencies = [
"bevy_app",
- "bevy_derive",
"bevy_ecs",
"bevy_math",
"bevy_reflect",
"bevy_tasks",
"bevy_utils",
+ "bytemuck",
+]
+
+[[package]]
+name = "bevy_core_pipeline"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
+ "bitflags 2.4.0",
+ "radsort",
+ "serde",
]
[[package]]
name = "bevy_derive"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6fd06d325cfb4998b26fc84476380611ce6a2d0a8a99b501328c79d7bda104"
+checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e"
dependencies = [
- "Inflector",
- "find-crate",
- "proc-macro2",
+ "bevy_macro_utils",
"quote",
- "syn 1.0.65",
+ "syn 2.0.38",
]
[[package]]
name = "bevy_diagnostic"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2933425d2febac4a8aadc8aed05ddac2d5891c91ae60dd191b24a6e093dcbeba"
+checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e"
dependencies = [
"bevy_app",
"bevy_core",
"bevy_ecs",
"bevy_log",
+ "bevy_time",
"bevy_utils",
- "parking_lot",
-]
-
-[[package]]
-name = "bevy_dynamic_plugin"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3219befe938ee89dd8b2b78a02cfd835ef93fa930113a91631b093381005ed"
-dependencies = [
- "bevy_app",
- "libloading 0.7.4",
+ "sysinfo",
]
[[package]]
name = "bevy_ecs"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf4745460111bd4285ed6c3e6caa4d882db95471edb02b88c6ad4eac89b923c"
+checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6"
dependencies = [
"async-channel",
"bevy_ecs_macros",
+ "bevy_ptr",
"bevy_reflect",
"bevy_tasks",
"bevy_utils",
- "bitflags 1.3.2",
"downcast-rs",
- "fixedbitset 0.4.2",
- "fxhash",
- "parking_lot",
- "rand",
+ "event-listener",
+ "fixedbitset",
+ "rustc-hash",
"serde",
"thiserror",
+ "thread_local",
]
[[package]]
name = "bevy_ecs_macros"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65323f6896068407b768c16ec1aa5c8891d49a28b725d0cbabc663d7f47baaec"
+checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80"
dependencies = [
- "find-crate",
+ "bevy_macro_utils",
"proc-macro2",
"quote",
- "syn 1.0.65",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "bevy_encase_derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001"
+dependencies = [
+ "bevy_macro_utils",
+ "encase_derive_impl",
]
[[package]]
name = "bevy_gilrs"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b28a12e991a63fe044605aacf806b8dcdc5aa3af2d4482ba6cb9a1b74fc9392"
+checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b"
dependencies = [
"bevy_app",
"bevy_ecs",
"bevy_input",
+ "bevy_log",
+ "bevy_time",
"bevy_utils",
"gilrs",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_gizmos"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_transform",
+ "bevy_utils",
]
[[package]]
name = "bevy_gltf"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9233bfb7e2cf053b51f01d2e57ea5a549438c0e5f08735d595b6a6504d00639e"
+checksum = "f07494a733dca032e71a20f4b1f423de765da49cbff34406ae6cd813f9b50c41"
dependencies = [
"anyhow",
- "base64",
+ "base64 0.13.1",
+ "bevy_animation",
"bevy_app",
"bevy_asset",
"bevy_core",
+ "bevy_core_pipeline",
"bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_log",
"bevy_math",
"bevy_pbr",
"bevy_reflect",
"bevy_render",
"bevy_scene",
+ "bevy_tasks",
"bevy_transform",
+ "bevy_utils",
"gltf",
+ "percent-encoding",
+ "serde",
+ "serde_json",
"thiserror",
]
+[[package]]
+name = "bevy_hierarchy"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d"
+dependencies = [
+ "bevy_app",
+ "bevy_core",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_reflect",
+ "bevy_utils",
+ "smallvec",
+]
+
[[package]]
name = "bevy_input"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91a3a768c59a5965f491cda74fd75a72b4cd7c51c85b5a731dd4d8688582dc5"
+checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc"
dependencies = [
"bevy_app",
"bevy_ecs",
"bevy_math",
+ "bevy_reflect",
"bevy_utils",
+ "thiserror",
]
[[package]]
name = "bevy_internal"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53c568981b2911567cba7f6dae7190bac295ffd411bca777edb1b5152b1ccd62"
+checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e"
dependencies = [
+ "bevy_a11y",
+ "bevy_animation",
"bevy_app",
"bevy_asset",
"bevy_audio",
"bevy_core",
+ "bevy_core_pipeline",
"bevy_derive",
"bevy_diagnostic",
- "bevy_dynamic_plugin",
"bevy_ecs",
"bevy_gilrs",
+ "bevy_gizmos",
"bevy_gltf",
+ "bevy_hierarchy",
"bevy_input",
"bevy_log",
"bevy_math",
"bevy_pbr",
+ "bevy_ptr",
"bevy_reflect",
"bevy_render",
"bevy_scene",
"bevy_sprite",
"bevy_tasks",
"bevy_text",
+ "bevy_time",
"bevy_transform",
"bevy_ui",
"bevy_utils",
- "bevy_wgpu",
"bevy_window",
"bevy_winit",
- "ndk-glue 0.2.1",
]
[[package]]
name = "bevy_log"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae100fe4e6fc8f7bbf28c121cda0ced7ab79088374beb7ab8be39120603beb18"
+checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe"
dependencies = [
- "android_log-sys 0.2.0",
+ "android_log-sys",
"bevy_app",
+ "bevy_ecs",
"bevy_utils",
"console_error_panic_hook",
- "tracing-subscriber 0.2.25",
+ "tracing-log",
+ "tracing-subscriber",
"tracing-wasm",
]
+[[package]]
+name = "bevy_macro_utils"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981"
+dependencies = [
+ "quote",
+ "rustc-hash",
+ "syn 2.0.38",
+ "toml_edit",
+]
+
[[package]]
name = "bevy_math"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb36a879cdc96f554b62dd7c7c02392a9a10e94082e4bc686a8242e1d674e7cc"
+checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b"
dependencies = [
- "bevy_reflect",
- "glam 0.13.1",
+ "glam",
+ "serde",
+]
+
+[[package]]
+name = "bevy_mikktspace"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497"
+dependencies = [
+ "glam",
]
[[package]]
name = "bevy_pbr"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71f267c27b70d298de91ceac644908fa876cb04857ccb80615dadb1ae969425f"
+checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85"
dependencies = [
"bevy_app",
"bevy_asset",
- "bevy_core",
+ "bevy_core_pipeline",
"bevy_derive",
"bevy_ecs",
"bevy_math",
"bevy_reflect",
"bevy_render",
"bevy_transform",
+ "bevy_utils",
"bevy_window",
+ "bitflags 2.4.0",
+ "bytemuck",
+ "naga_oil",
+ "radsort",
]
+[[package]]
+name = "bevy_ptr"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6"
+
[[package]]
name = "bevy_reflect"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d7f57646077e9b016f079e0f39fe2826dce407bb0dccc29b481a33ef7552847"
+checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5"
dependencies = [
+ "bevy_math",
+ "bevy_ptr",
"bevy_reflect_derive",
"bevy_utils",
"downcast-rs",
"erased-serde",
- "glam 0.13.1",
- "parking_lot",
+ "glam",
+ "once_cell",
+ "parking_lot 0.12.1",
"serde",
"smallvec",
+ "smol_str",
"thiserror",
]
[[package]]
name = "bevy_reflect_derive"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc3f45d1d49c6e984b492ee13564677d1392828cac50c030e025f74f69386e1"
+checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528"
dependencies = [
- "find-crate",
+ "bevy_macro_utils",
+ "bit-set",
"proc-macro2",
"quote",
- "syn 1.0.65",
+ "syn 2.0.38",
"uuid",
]
[[package]]
name = "bevy_render"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f2b966619d16bdb89132848461d9580a622acb5b2bba73cb252e43c9c8830"
+checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb"
dependencies = [
"anyhow",
- "bevy-glsl-to-spirv",
+ "async-channel",
"bevy_app",
"bevy_asset",
"bevy_core",
"bevy_derive",
"bevy_ecs",
+ "bevy_encase_derive",
+ "bevy_hierarchy",
+ "bevy_log",
"bevy_math",
+ "bevy_mikktspace",
"bevy_reflect",
+ "bevy_render_macros",
+ "bevy_tasks",
+ "bevy_time",
"bevy_transform",
"bevy_utils",
"bevy_window",
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
+ "bytemuck",
+ "codespan-reporting",
"downcast-rs",
- "hex",
+ "encase",
+ "futures-lite",
"hexasphere",
"image",
- "once_cell",
- "parking_lot",
+ "js-sys",
+ "ktx2",
+ "naga",
+ "naga_oil",
+ "parking_lot 0.12.1",
+ "regex",
+ "ruzstd",
"serde",
- "shaderc",
"smallvec",
- "spirv-reflect",
"thiserror",
+ "thread_local",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu",
+ "wgpu-hal",
]
[[package]]
-name = "bevy_scene"
-version = "0.5.0"
+name = "bevy_render_macros"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "bevy_scene"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf1eaa680e61749cc226bcdcd0d968c396fe52c2a4e9e1718422888953ba6c3b"
+checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681"
dependencies = [
"anyhow",
"bevy_app",
"bevy_asset",
+ "bevy_derive",
"bevy_ecs",
+ "bevy_hierarchy",
"bevy_reflect",
+ "bevy_render",
"bevy_transform",
"bevy_utils",
- "parking_lot",
"ron",
"serde",
"thiserror",
@@ -568,13 +819,14 @@ dependencies = [
[[package]]
name = "bevy_sprite"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9ddb7699b4597794071ebb93b5a0c414407ab8956dc4dc86e59dde721a663d"
+checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397"
dependencies = [
"bevy_app",
"bevy_asset",
- "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_derive",
"bevy_ecs",
"bevy_log",
"bevy_math",
@@ -582,39 +834,38 @@ dependencies = [
"bevy_render",
"bevy_transform",
"bevy_utils",
- "bevy_window",
+ "bitflags 2.4.0",
+ "bytemuck",
+ "fixedbitset",
"guillotiere",
"rectangle-pack",
- "serde",
"thiserror",
]
[[package]]
name = "bevy_tasks"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77243565dde30ce01e538c615db54bc939a36e4c468b271e86a980004bac7bc9"
+checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf"
dependencies = [
"async-channel",
"async-executor",
- "event-listener",
+ "async-task",
+ "concurrent-queue",
"futures-lite",
- "instant",
- "num_cpus",
"wasm-bindgen-futures",
]
[[package]]
name = "bevy_text"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dfc4f2108582afd5a8995904ea55cd594787f210dac5d1df453cbe92eaab26"
+checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355"
dependencies = [
"ab_glyph",
"anyhow",
"bevy_app",
"bevy_asset",
- "bevy_core",
"bevy_ecs",
"bevy_math",
"bevy_reflect",
@@ -624,34 +875,50 @@ dependencies = [
"bevy_utils",
"bevy_window",
"glyph_brush_layout",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_time"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
+ "crossbeam-channel",
"thiserror",
]
[[package]]
name = "bevy_transform"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d166fe11f67dc195b42207e7b096f36680f611afc8f4105b3d81865b66ecf91"
+checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4"
dependencies = [
"bevy_app",
"bevy_ecs",
+ "bevy_hierarchy",
"bevy_math",
"bevy_reflect",
- "bevy_utils",
- "smallvec",
]
[[package]]
name = "bevy_ui"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef67dfa943511b8bbca6bf730f183ac5c602a35a7659e58bdf7471154018889d"
+checksum = "59b6d295a755e5b79e869a09e087029d72974562a521ec7ccfba7141fa948a32"
dependencies = [
+ "bevy_a11y",
"bevy_app",
"bevy_asset",
- "bevy_core",
+ "bevy_core_pipeline",
"bevy_derive",
"bevy_ecs",
+ "bevy_hierarchy",
"bevy_input",
"bevy_log",
"bevy_math",
@@ -662,72 +929,76 @@ dependencies = [
"bevy_transform",
"bevy_utils",
"bevy_window",
+ "bytemuck",
"serde",
"smallvec",
- "stretch",
+ "taffy",
+ "thiserror",
]
[[package]]
name = "bevy_utils"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c384a69b670329f968f59abdcf6506f183cf18b8619d6ec1cbfe33e268e5da20"
+checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7"
dependencies = [
- "ahash 0.7.6",
+ "ahash",
+ "bevy_utils_proc_macros",
"getrandom",
+ "hashbrown 0.14.1",
"instant",
+ "petgraph",
+ "thiserror",
"tracing",
"uuid",
]
[[package]]
-name = "bevy_wgpu"
-version = "0.5.0"
+name = "bevy_utils_proc_macros"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e16919cc645aa9a7e988c8644836d0f91c5f1bd23e17bdd9b461a32bf7667b"
+checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57"
dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_diagnostic",
- "bevy_ecs",
- "bevy_render",
- "bevy_utils",
- "bevy_window",
- "bevy_winit",
- "crossbeam-channel",
- "crossbeam-utils",
- "futures-lite",
- "parking_lot",
- "wgpu",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
]
[[package]]
name = "bevy_window"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b96496cb0a9c79ca6744a25e69edff4ba363c14b6070897a66a597db208405f0"
+checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944"
dependencies = [
"bevy_app",
"bevy_ecs",
+ "bevy_input",
"bevy_math",
+ "bevy_reflect",
"bevy_utils",
- "web-sys",
+ "raw-window-handle",
]
[[package]]
name = "bevy_winit"
-version = "0.5.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522dcea62526be0aa5ee35781e98a9f309047050cf684758bc0cd498820111f6"
+checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53"
dependencies = [
+ "accesskit_winit",
+ "approx",
+ "bevy_a11y",
"bevy_app",
+ "bevy_derive",
"bevy_ecs",
+ "bevy_hierarchy",
"bevy_input",
- "bevy_log",
"bevy_math",
+ "bevy_tasks",
"bevy_utils",
"bevy_window",
+ "crossbeam-channel",
+ "raw-window-handle",
"wasm-bindgen",
"web-sys",
"winit",
@@ -779,6 +1050,9 @@ name = "bitflags"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+dependencies = [
+ "serde",
+]
[[package]]
name = "block"
@@ -786,6 +1060,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 = "bumpalo"
version = "3.14.0"
@@ -797,6 +1090,20 @@ name = "bytemuck"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
[[package]]
name = "byteorder"
@@ -835,12 +1142,6 @@ dependencies = [
"nom",
]
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
[[package]]
name = "cfg-if"
version = "1.0.0"
@@ -853,19 +1154,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-[[package]]
-name = "chrono"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0"
-dependencies = [
- "js-sys",
- "num-integer",
- "num-traits",
- "wasm-bindgen",
- "winapi 0.3.9",
-]
-
[[package]]
name = "clang-sys"
version = "1.6.1"
@@ -878,42 +1166,13 @@ dependencies = [
]
[[package]]
-name = "cmake"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation",
- "core-foundation 0.9.3",
- "core-graphics 0.22.3",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.2"
+name = "codespan-reporting"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
dependencies = [
- "bitflags 1.3.2",
- "block",
- "core-foundation 0.9.3",
- "core-graphics-types",
- "libc",
- "objc",
+ "termcolor",
+ "unicode-width",
]
[[package]]
@@ -922,6 +1181,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"
@@ -947,34 +1212,29 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"wasm-bindgen",
]
[[package]]
-name = "copyless"
-version = "0.1.5"
+name = "const_panic"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536"
+checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
[[package]]
-name = "core-foundation"
-version = "0.6.4"
+name = "const_soft_float"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-dependencies = [
- "core-foundation-sys 0.6.2",
- "libc",
-]
+checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
[[package]]
-name = "core-foundation"
-version = "0.7.0"
+name = "constgebra"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
+checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420"
dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
+ "const_soft_float",
]
[[package]]
@@ -993,30 +1253,12 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-[[package]]
-name = "core-foundation-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-
[[package]]
name = "core-foundation-sys"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
-[[package]]
-name = "core-graphics"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.7.0",
- "foreign-types",
- "libc",
-]
-
[[package]]
name = "core-graphics"
version = "0.22.3"
@@ -1024,7 +1266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
dependencies = [
"bitflags 1.3.2",
- "core-foundation 0.9.3",
+ "core-foundation",
"core-graphics-types",
"foreign-types",
"libc",
@@ -1037,30 +1279,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
dependencies = [
"bitflags 1.3.2",
- "core-foundation 0.9.3",
- "libc",
-]
-
-[[package]]
-name = "core-video-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828"
-dependencies = [
- "cfg-if 0.1.10",
- "core-foundation-sys 0.7.0",
- "core-graphics 0.19.2",
+ "core-foundation",
"libc",
- "objc",
]
[[package]]
name = "coreaudio-rs"
-version = "0.10.0"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88"
+checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff"
dependencies = [
"bitflags 1.3.2",
+ "core-foundation-sys 0.6.2",
"coreaudio-sys",
]
@@ -1075,27 +1305,27 @@ dependencies = [
[[package]]
name = "cpal"
-version = "0.13.4"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418"
+checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c"
dependencies = [
"alsa",
"core-foundation-sys 0.8.4",
"coreaudio-rs",
- "jni",
+ "dasp_sample",
+ "jni 0.19.0",
"js-sys",
- "lazy_static",
"libc",
- "mach 0.3.2",
- "ndk 0.3.0",
- "ndk-glue 0.3.0",
- "nix 0.20.0",
+ "mach2",
+ "ndk",
+ "ndk-context",
"oboe",
- "parking_lot",
- "stdweb 0.1.3",
- "thiserror",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
"web-sys",
- "winapi 0.3.9",
+ "windows 0.46.0",
]
[[package]]
@@ -1104,7 +1334,7 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
]
[[package]]
@@ -1113,7 +1343,7 @@ version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"crossbeam-utils",
]
@@ -1123,108 +1353,74 @@ version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
]
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
[[package]]
name = "d3d12"
-version = "0.3.2"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a60cceb22c7c53035f8980524fdc7f17cf49681a3c154e6757d30afbec6ec4"
+checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
dependencies = [
"bitflags 1.3.2",
- "libloading 0.6.7",
- "winapi 0.3.9",
+ "libloading 0.7.4",
+ "winapi",
]
[[package]]
-name = "darling"
-version = "0.10.2"
+name = "dasp_sample"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
+checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
[[package]]
-name = "darling_core"
-version = "0.10.2"
+name = "data-encoding"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 1.0.65",
-]
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
[[package]]
-name = "darling_macro"
-version = "0.10.2"
+name = "dispatch"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
-dependencies = [
- "darling_core",
- "quote",
- "syn 1.0.65",
-]
+checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
[[package]]
-name = "deflate"
-version = "0.8.6"
+name = "downcast-rs"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
-dependencies = [
- "adler32",
- "byteorder",
-]
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]]
-name = "derivative"
-version = "2.2.0"
+name = "encase"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c"
dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.65",
+ "const_panic",
+ "encase_derive",
+ "glam",
+ "thiserror",
]
[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
-[[package]]
-name = "downcast-rs"
-version = "1.2.0"
+name = "encase_derive"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e"
+dependencies = [
+ "encase_derive_impl",
+]
[[package]]
-name = "env_logger"
-version = "0.7.1"
+name = "encase_derive_impl"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c"
dependencies = [
- "log",
- "regex",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
]
[[package]]
@@ -1272,38 +1468,42 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+[[package]]
+name = "fdeflate"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+dependencies = [
+ "simd-adler32",
+]
+
[[package]]
name = "filetime"
version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
"redox_syscall 0.3.5",
- "windows-sys",
-]
-
-[[package]]
-name = "find-crate"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2"
-dependencies = [
- "toml",
+ "windows-sys 0.48.0",
]
[[package]]
name = "fixedbitset"
-version = "0.2.0"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
-name = "fixedbitset"
-version = "0.4.2"
+name = "flate2"
+version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
[[package]]
name = "fnv"
@@ -1335,22 +1535,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags 1.3.2",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
[[package]]
name = "futures-core"
version = "0.3.28"
@@ -1378,15 +1562,6 @@ dependencies = [
"waker-fn",
]
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
[[package]]
name = "game"
version = "0.1.0"
@@ -1400,165 +1575,18 @@ version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"js-sys",
"libc",
"wasi",
"wasm-bindgen",
]
-[[package]]
-name = "gfx-auxil"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7b33ecf067f2117668d91c9b0f2e5f223ebd1ffec314caa2f3de27bb580186d"
-dependencies = [
- "fxhash",
- "gfx-hal",
- "spirv_cross",
-]
-
-[[package]]
-name = "gfx-backend-dx11"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f851d03c2e8f117e3702bf41201a4fafa447d5cb1276d5375870ae7573d069dd"
-dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
- "gfx-auxil",
- "gfx-hal",
- "libloading 0.6.7",
- "log",
- "parking_lot",
- "range-alloc",
- "raw-window-handle 0.3.4",
- "smallvec",
- "spirv_cross",
- "thunderdome",
- "winapi 0.3.9",
- "wio",
-]
-
-[[package]]
-name = "gfx-backend-dx12"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5032d716a2a5f4dafb4675a794c5dc32081af8fbc7303c93ad93ff5413c6559f"
-dependencies = [
- "arrayvec",
- "bit-set",
- "bitflags 1.3.2",
- "d3d12",
- "gfx-auxil",
- "gfx-hal",
- "log",
- "parking_lot",
- "range-alloc",
- "raw-window-handle 0.3.4",
- "smallvec",
- "spirv_cross",
- "thunderdome",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "gfx-backend-empty"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07ef26a65954cfdd7b4c587f485100d1bb3b0bd6a51b02d817d6c87cca7a91"
-dependencies = [
- "gfx-hal",
- "log",
- "raw-window-handle 0.3.4",
-]
-
-[[package]]
-name = "gfx-backend-gl"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6717c50ab601efe4a669bfb44db615e3888695ac8263222aeaa702642b9fbc2"
-dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
- "gfx-auxil",
- "gfx-hal",
- "glow",
- "js-sys",
- "khronos-egl",
- "libloading 0.6.7",
- "log",
- "naga",
- "parking_lot",
- "raw-window-handle 0.3.4",
- "spirv_cross",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "gfx-backend-metal"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dc54b456ece69ef49f8893269ebf24ac70969ed34ba2719c3f3abcc8fbff14e"
-dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation",
- "copyless",
- "foreign-types",
- "gfx-auxil",
- "gfx-hal",
- "log",
- "metal",
- "naga",
- "objc",
- "parking_lot",
- "range-alloc",
- "raw-window-handle 0.3.4",
- "spirv_cross",
- "storage-map",
-]
-
-[[package]]
-name = "gfx-backend-vulkan"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dabe88b1a5c91e0f969b441cc57e70364858066e4ba937deeb62065654ef9bd9"
-dependencies = [
- "arrayvec",
- "ash",
- "byteorder",
- "core-graphics-types",
- "gfx-hal",
- "inplace_it",
- "log",
- "naga",
- "objc",
- "parking_lot",
- "raw-window-handle 0.3.4",
- "smallvec",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "gfx-hal"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d9cc8d3b573dda62d0baca4f02e0209786e22c562caff001d77c389008781d"
-dependencies = [
- "bitflags 1.3.2",
- "naga",
- "raw-window-handle 0.3.4",
- "thiserror",
-]
-
[[package]]
name = "gilrs"
-version = "0.8.2"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1550c8bdebc993576e343d600a954654708a9a1182396ee1e805d6fe60c72909"
+checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a"
dependencies = [
"fnv",
"gilrs-core",
@@ -1569,38 +1597,39 @@ dependencies = [
[[package]]
name = "gilrs-core"
-version = "0.3.2"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c7262ce1e88429c9b1d847820c9d2ba00adafc955218393d9c0861d5aaab88"
+checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d"
dependencies = [
- "core-foundation 0.6.4",
+ "core-foundation",
"io-kit-sys",
+ "js-sys",
"libc",
"libudev-sys",
"log",
- "nix 0.23.2",
- "rusty-xinput",
- "stdweb 0.4.20",
+ "nix 0.26.4",
"uuid",
"vec_map",
- "winapi 0.3.9",
+ "wasm-bindgen",
+ "web-sys",
+ "windows 0.51.1",
]
[[package]]
-name = "glam"
-version = "0.13.1"
+name = "gimli"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70155b56080764b8b758e91e4c63d06da0262c0c939f2cd991cd1382087147df"
-dependencies = [
- "serde",
- "spirv-std",
-]
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]]
name = "glam"
-version = "0.15.2"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3abb554f8ee44336b72d522e0a7fe86a29e09f839a36022fa869a7dfe941a54b"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+dependencies = [
+ "bytemuck",
+ "serde",
+]
[[package]]
name = "glob"
@@ -1610,9 +1639,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "glow"
-version = "0.7.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "072136d2c3783f3a92f131acb227bc806d3886278e2a4dc1e9990ec89ef9e70b"
+checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
dependencies = [
"js-sys",
"slotmap",
@@ -1622,9 +1651,9 @@ dependencies = [
[[package]]
name = "gltf"
-version = "0.15.2"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6fb0d1d772daf10ea74528c3aeb12215f6d5b820adf2ecfc93a6578d6779c3c"
+checksum = "ad2dcfb6dd7a66f9eb3d181a29dcfb22d146b0bcdc2e1ed1713cbf03939a88ea"
dependencies = [
"byteorder",
"gltf-json",
@@ -1633,21 +1662,21 @@ dependencies = [
[[package]]
name = "gltf-derive"
-version = "0.15.2"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6636de7bf52227363554f1ca2d9cd180fc666129ddd0933097e1f227dfa7293"
+checksum = "f2cbcea5dd47e7ad4e9ee6f040384fcd7204bbf671aa4f9e7ca7dfc9bfa1de20"
dependencies = [
"inflections",
"proc-macro2",
"quote",
- "syn 1.0.65",
+ "syn 2.0.38",
]
[[package]]
name = "gltf-json"
-version = "0.15.2"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3fc3deb81e6fa04bf808f6be7c3983229552a95b77f687ad96af00f6d3e7d6c"
+checksum = "7d5b810806b78dde4b71a95cc0e6fdcab34c4c617da3574df166f9987be97d03"
dependencies = [
"gltf-derive",
"serde",
@@ -1668,13 +1697,12 @@ dependencies = [
[[package]]
name = "gpu-alloc"
-version = "0.3.2"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739e1e53f1e4b5093342e753bcb868e53d28e0c69da9c9ce9632455bfa37ba30"
+checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
dependencies = [
"bitflags 1.3.2",
"gpu-alloc-types",
- "tracing",
]
[[package]]
@@ -1686,16 +1714,28 @@ dependencies = [
"bitflags 1.3.2",
]
+[[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.1.1"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a70f1e87a3840ed6a3e99e02c2b861e4dbdf26f0d07e38f42ea5aff46cfce2"
+checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
"gpu-descriptor-types",
- "hashbrown 0.9.1",
- "tracing",
+ "hashbrown 0.14.1",
]
[[package]]
@@ -1707,6 +1747,12 @@ dependencies = [
"bitflags 2.4.0",
]
+[[package]]
+name = "grid"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c"
+
[[package]]
name = "guillotiere"
version = "0.6.2"
@@ -1717,15 +1763,6 @@ dependencies = [
"svg_fmt",
]
-[[package]]
-name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-dependencies = [
- "ahash 0.4.7",
-]
-
[[package]]
name = "hashbrown"
version = "0.12.3"
@@ -1737,49 +1774,55 @@ name = "hashbrown"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+ "serde",
+]
[[package]]
-name = "hermit-abi"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
+name = "hassle-rs"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+dependencies = [
+ "bitflags 1.3.2",
+ "com-rs",
+ "libc",
+ "libloading 0.7.4",
+ "thiserror",
+ "widestring",
+ "winapi",
+]
[[package]]
name = "hexasphere"
-version = "3.4.0"
+version = "9.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497fa99092cc737fe649ae39194b515fbc15ae27ebd437c9e3d9c8210341e0fc"
+checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10"
dependencies = [
- "glam 0.15.2",
- "lazy_static",
+ "constgebra",
+ "glam",
]
[[package]]
-name = "ident_case"
-version = "1.0.1"
+name = "hexf-parse"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
[[package]]
name = "image"
-version = "0.23.14"
+version = "0.24.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
dependencies = [
"bytemuck",
"byteorder",
"color_quant",
- "num-iter",
"num-rational",
"num-traits",
"png",
- "scoped_threadpool",
]
[[package]]
@@ -1828,19 +1871,13 @@ dependencies = [
"libc",
]
-[[package]]
-name = "inplace_it"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e567468c50f3d4bc7397702e09b380139f9b9288b4e909b070571007f8b5bf78"
-
[[package]]
name = "instant"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"js-sys",
"wasm-bindgen",
"web-sys",
@@ -1848,21 +1885,12 @@ dependencies = [
[[package]]
name = "io-kit-sys"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0"
-dependencies = [
- "core-foundation-sys 0.6.2",
- "mach 0.2.3",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de"
dependencies = [
- "libc",
+ "core-foundation-sys 0.8.4",
+ "mach2",
]
[[package]]
@@ -1885,6 +1913,20 @@ dependencies = [
"walkdir",
]
+[[package]]
+name = "jni"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+dependencies = [
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
[[package]]
name = "jni-sys"
version = "0.3.0"
@@ -1902,31 +1944,51 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.46"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
+name = "khronos-egl"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
+dependencies = [
+ "libc",
+ "libloading 0.7.4",
+ "pkg-config",
+]
+
+[[package]]
+name = "kqueue"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
dependencies = [
- "winapi 0.2.8",
- "winapi-build",
+ "kqueue-sys",
+ "libc",
]
[[package]]
-name = "khronos-egl"
-version = "3.0.2"
+name = "kqueue-sys"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b19cc4a81304db2a0ad69740e83cdc3a9364e3f9bd6d88a87288a4c2deec927b"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
dependencies = [
+ "bitflags 1.3.2",
"libc",
- "libloading 0.6.7",
+]
+
+[[package]]
+name = "ktx2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838"
+dependencies = [
+ "bitflags 1.3.2",
]
[[package]]
@@ -1941,6 +2003,17 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+[[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.149"
@@ -1949,38 +2022,26 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
[[package]]
name = "libloading"
-version = "0.6.7"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
dependencies = [
- "cfg-if 1.0.0",
- "winapi 0.3.9",
+ "cfg-if",
+ "winapi",
]
[[package]]
name = "libloading"
-version = "0.7.4"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
dependencies = [
- "cfg-if 1.0.0",
- "winapi 0.3.9",
+ "cfg-if",
+ "windows-sys 0.48.0",
]
[[package]]
-name = "libm"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
-
-[[package]]
-name = "libm"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-
-[[package]]
-name = "libudev-sys"
+name = "libudev-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
@@ -2006,19 +2067,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
[[package]]
-name = "mach"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "mach"
-version = "0.3.2"
+name = "mach2"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
dependencies = [
"libc",
]
@@ -2034,9 +2086,9 @@ dependencies = [
[[package]]
name = "matchers"
-version = "0.0.1"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
dependencies = [
"regex-automata 0.1.10",
]
@@ -2047,24 +2099,15 @@ version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
[[package]]
name = "metal"
-version = "0.21.0"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4598d719460ade24c7d91f335daf055bf2a7eec030728ce751814c50cdd6a26c"
+checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
dependencies = [
"bitflags 1.3.2",
"block",
- "cocoa-foundation",
+ "core-graphics-types",
"foreign-types",
"log",
"objc",
@@ -2076,150 +2119,80 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-[[package]]
-name = "minimp3"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372"
-dependencies = [
- "minimp3-sys",
- "slice-deque",
- "thiserror",
-]
-
-[[package]]
-name = "minimp3-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "miniz_oxide"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "mio"
-version = "0.6.23"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow 0.2.2",
- "net2",
- "slab",
- "winapi 0.2.8",
+ "adler",
+ "simd-adler32",
]
[[package]]
name = "mio"
-version = "0.7.14"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
"log",
- "miow 0.3.7",
- "ntapi",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "mio-extras"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
-dependencies = [
- "lazycell",
- "log",
- "mio 0.6.23",
- "slab",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "miow"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
-dependencies = [
- "winapi 0.3.9",
+ "wasi",
+ "windows-sys 0.48.0",
]
[[package]]
name = "naga"
-version = "0.3.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05089b2acdf0e6a962cdbf5e328402345a27f59fcde1a59fe97a73e8149d416f"
+checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
dependencies = [
"bit-set",
"bitflags 1.3.2",
- "fxhash",
+ "codespan-reporting",
+ "hexf-parse",
+ "indexmap 1.9.3",
"log",
"num-traits",
- "petgraph",
- "spirv_headers",
- "thiserror",
-]
-
-[[package]]
-name = "ndk"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73"
-dependencies = [
- "jni-sys",
- "ndk-sys 0.2.2",
- "num_enum 0.4.3",
+ "pp-rs",
+ "rustc-hash",
+ "spirv",
+ "termcolor",
"thiserror",
+ "unicode-xid",
]
[[package]]
-name = "ndk"
-version = "0.3.0"
+name = "naga_oil"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
+checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b"
dependencies = [
- "jni-sys",
- "ndk-sys 0.2.2",
- "num_enum 0.5.11",
+ "bit-set",
+ "codespan-reporting",
+ "data-encoding",
+ "indexmap 1.9.3",
+ "naga",
+ "once_cell",
+ "regex",
+ "regex-syntax 0.6.29",
+ "rustc-hash",
"thiserror",
+ "tracing",
+ "unicode-ident",
]
[[package]]
name = "ndk"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
dependencies = [
"bitflags 1.3.2",
"jni-sys",
- "ndk-sys 0.3.0",
+ "ndk-sys",
"num_enum 0.5.11",
+ "raw-window-handle",
"thiserror",
]
@@ -2229,97 +2202,35 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-[[package]]
-name = "ndk-glue"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241"
-dependencies = [
- "android_logger",
- "lazy_static",
- "libc",
- "log",
- "ndk 0.2.1",
- "ndk-macro",
- "ndk-sys 0.2.2",
-]
-
-[[package]]
-name = "ndk-glue"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "ndk 0.3.0",
- "ndk-macro",
- "ndk-sys 0.2.2",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d"
-dependencies = [
- "darling",
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "quote",
- "syn 1.0.65",
-]
-
[[package]]
name = "ndk-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
-
-[[package]]
-name = "ndk-sys"
-version = "0.3.0"
+version = "0.4.1+23.1.7779620"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
dependencies = [
"jni-sys",
]
-[[package]]
-name = "net2"
-version = "0.2.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
[[package]]
name = "nix"
-version = "0.20.0"
+version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
dependencies = [
"bitflags 1.3.2",
- "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
]
[[package]]
name = "nix"
-version = "0.23.2"
+version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
dependencies = [
"bitflags 1.3.2",
- "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
"libc",
- "memoffset",
]
[[package]]
@@ -2334,28 +2245,40 @@ dependencies = [
[[package]]
name = "notify"
-version = "5.0.0-pre.10"
+version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f18203a26893ca1d3526cf58084025d5639f91c44f8b70ab3b724f60e819a0"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
"crossbeam-channel",
"filetime",
"fsevent-sys",
"inotify",
+ "kqueue",
"libc",
- "mio 0.7.14",
+ "log",
+ "mio",
"walkdir",
- "winapi 0.3.9",
+ "windows-sys 0.48.0",
]
[[package]]
name = "ntapi"
-version = "0.3.7"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
dependencies = [
- "winapi 0.3.9",
+ "winapi",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
]
[[package]]
@@ -2379,22 +2302,11 @@ 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"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
dependencies = [
"autocfg",
"num-integer",
@@ -2408,45 +2320,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
dependencies = [
"autocfg",
- "libm 0.2.8",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
]
[[package]]
name = "num_enum"
-version = "0.4.3"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
dependencies = [
- "derivative",
- "num_enum_derive 0.4.3",
+ "num_enum_derive 0.5.11",
]
[[package]]
name = "num_enum"
-version = "0.5.11"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
dependencies = [
- "num_enum_derive 0.5.11",
+ "num_enum_derive 0.6.1",
]
[[package]]
name = "num_enum_derive"
-version = "0.4.3"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
dependencies = [
- "proc-macro-crate 0.1.5",
+ "proc-macro-crate",
"proc-macro2",
"quote",
"syn 1.0.65",
@@ -2454,14 +2354,14 @@ dependencies = [
[[package]]
name = "num_enum_derive"
-version = "0.5.11"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate",
"proc-macro2",
"quote",
- "syn 1.0.65",
+ "syn 2.0.38",
]
[[package]]
@@ -2474,6 +2374,32 @@ dependencies = [
"objc_exception",
]
+[[package]]
+name = "objc-sys"
+version = "0.2.0-beta.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
+
+[[package]]
+name = "objc2"
+version = "0.3.0-beta.3.patch-leaks.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
+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 = [
+ "objc-sys",
+]
+
[[package]]
name = "objc_exception"
version = "0.1.2"
@@ -2483,14 +2409,23 @@ dependencies = [
"cc",
]
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "oboe"
-version = "0.4.6"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1"
+checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
dependencies = [
- "jni",
- "ndk 0.6.0",
+ "jni 0.20.0",
+ "ndk",
"ndk-context",
"num-derive",
"num-traits",
@@ -2499,19 +2434,43 @@ dependencies = [
[[package]]
name = "oboe-sys"
-version = "0.4.5"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd"
+checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2"
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.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+[[package]]
+name = "orbclient"
+version = "0.3.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f"
+dependencies = [
+ "redox_syscall 0.3.5",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
[[package]]
name = "owned_ttf_parser"
version = "0.19.0"
@@ -2535,7 +2494,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [
"instant",
"lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.8",
]
[[package]]
@@ -2544,14 +2513,33 @@ version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"instant",
"libc",
"redox_syscall 0.2.16",
"smallvec",
- "winapi 0.3.9",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.3.5",
+ "smallvec",
+ "windows-targets 0.48.5",
]
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
[[package]]
name = "peeking_take_while"
version = "0.1.2"
@@ -2566,12 +2554,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "petgraph"
-version = "0.5.1"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
- "fixedbitset 0.2.0",
- "indexmap 1.9.3",
+ "fixedbitset",
+ "indexmap 2.0.2",
]
[[package]]
@@ -2588,29 +2576,24 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "png"
-version = "0.16.8"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
dependencies = [
"bitflags 1.3.2",
"crc32fast",
- "deflate",
+ "fdeflate",
+ "flate2",
"miniz_oxide",
]
[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
+name = "pp-rs"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee"
dependencies = [
- "toml",
+ "unicode-xid",
]
[[package]]
@@ -2632,6 +2615,12 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "profiling"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b"
+
[[package]]
name = "quote"
version = "1.0.33"
@@ -2642,34 +2631,10 @@ dependencies = [
]
[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
+name = "radsort"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
+checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b"
[[package]]
name = "range-alloc"
@@ -2679,28 +2644,15 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
[[package]]
name = "raw-window-handle"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76"
-dependencies = [
- "libc",
- "raw-window-handle 0.4.3",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.4.3"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
-dependencies = [
- "cty",
-]
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
[[package]]
name = "rectangle-pack"
-version = "0.3.0"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "831eb2fcb5b72b09c72a3f2d24c09a28d79886512827cd4674d9bac10557f16a"
+checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb"
[[package]]
name = "redox_syscall"
@@ -2764,51 +2716,55 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d"
+[[package]]
+name = "renderdoc-sys"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
+
[[package]]
name = "rodio"
-version = "0.13.1"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f"
+checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa"
dependencies = [
"cpal",
- "minimp3",
+ "lewton",
]
[[package]]
name = "ron"
-version = "0.6.6"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
dependencies = [
- "base64",
- "bitflags 1.3.2",
+ "base64 0.21.4",
+ "bitflags 2.4.0",
"serde",
+ "serde_derive",
]
[[package]]
-name = "rustc-hash"
-version = "1.1.0"
+name = "rustc-demangle"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
-name = "rustc_version"
-version = "0.2.3"
+name = "rustc-hash"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
-]
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
-name = "rusty-xinput"
-version = "1.2.0"
+name = "ruzstd"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb"
+checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
dependencies = [
- "lazy_static",
- "log",
- "winapi 0.3.9",
+ "byteorder",
+ "thiserror-core",
+ "twox-hash",
]
[[package]]
@@ -2826,33 +2782,12 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "scoped_threadpool"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-
[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
[[package]]
name = "serde"
version = "1.0.188"
@@ -2884,41 +2819,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
-]
-
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
-[[package]]
-name = "shaderc"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6e2c757b804157350d8d79d718c756899226016486aab07a11dddf8741111a0"
-dependencies = [
- "libc",
- "shaderc-sys",
-]
-
-[[package]]
-name = "shaderc-sys"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a36f3465fce5830d33a58846b9c924f510a1e92bac181834c13b38405efe983b"
-dependencies = [
- "cmake",
- "libc",
-]
-
[[package]]
name = "sharded-slab"
version = "0.1.7"
@@ -2934,6 +2834,12 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
[[package]]
name = "slab"
version = "0.4.9"
@@ -2944,22 +2850,14 @@ dependencies = [
]
[[package]]
-name = "slice-deque"
-version = "0.3.0"
+name = "slotmap"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25"
+checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
dependencies = [
- "libc",
- "mach 0.3.2",
- "winapi 0.3.9",
+ "version_check",
]
-[[package]]
-name = "slotmap"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf34684c5767b87de9119790e92e9a1d60056be2ceeaf16a8e6ef13082aeab1"
-
[[package]]
name = "smallvec"
version = "1.11.1"
@@ -2970,157 +2868,29 @@ dependencies = [
]
[[package]]
-name = "spirv-reflect"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecc7af6a7d3ca6d15f4d6b5077df89c77ad1f4b314d0cabee221656d041dad7"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "num-traits",
- "serde",
- "serde_derive",
- "spirv_headers",
-]
-
-[[package]]
-name = "spirv-std"
-version = "0.4.0-alpha.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e2676f3e58345b7c742b266b5bec022445b43e6471b9a00895faec03a52723e"
-dependencies = [
- "bitflags 1.3.2",
- "num-traits",
- "spirv-std-macros",
- "spirv-types",
-]
-
-[[package]]
-name = "spirv-std-macros"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3058b5fdfd040e8e3c3e457574f2667fd7148086cd59a45ef7fb3de58108c580"
-dependencies = [
- "proc-macro2",
- "quote",
- "spirv-std-types",
- "syn 1.0.65",
-]
-
-[[package]]
-name = "spirv-std-types"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a1c6e1dba9130f21b46aedece3a023a19d9622fb1e9fe5c23df4b72be73daaf"
-
-[[package]]
-name = "spirv-types"
-version = "0.4.0-alpha.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7509fe29b5051b494de4571309a9cdcd9e93aad937d168cacda449eb4a95844e"
-
-[[package]]
-name = "spirv_cross"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60647fadbf83c4a72f0d7ea67a7ca3a81835cf442b8deae5c134c3e0055b2e14"
-dependencies = [
- "cc",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "spirv_headers"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f5b132530b1ac069df335577e3581765995cba5a13995cdbbdbc8fb057c532c"
-dependencies = [
- "bitflags 1.3.2",
- "num-traits",
-]
-
-[[package]]
-name = "stdweb"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
-
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version",
- "serde",
- "serde_json",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn 1.0.65",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "syn 1.0.65",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
-[[package]]
-name = "storage-map"
-version = "0.3.0"
+name = "smol_str"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418bb14643aa55a7841d5303f72cf512cfb323b8cc221d51580500a1ca75206c"
+checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
dependencies = [
- "lock_api",
+ "serde",
]
[[package]]
-name = "stretch"
-version = "0.3.2"
+name = "spirv"
+version = "0.2.0+1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0dc6d20ce137f302edf90f9cd3d278866fd7fb139efca6f246161222ad6d87"
+checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
dependencies = [
- "lazy_static",
- "libm 0.1.4",
+ "bitflags 1.3.2",
+ "num-traits",
]
[[package]]
-name = "strsim"
-version = "0.9.3"
+name = "static_assertions"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "svg_fmt"
@@ -3150,6 +2920,41 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "sysinfo"
+version = "0.29.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5"
+dependencies = [
+ "cfg-if",
+ "core-foundation-sys 0.8.4",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "winapi",
+]
+
+[[package]]
+name = "taffy"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c488aa2bf4bb0cafed312e0876b79a591e3cfa47391f842b7198f9a56547561b"
+dependencies = [
+ "arrayvec",
+ "grid",
+ "num-traits",
+ "slotmap",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
+dependencies = [
+ "winapi-util",
+]
+
[[package]]
name = "thiserror"
version = "1.0.49"
@@ -3159,6 +2964,26 @@ dependencies = [
"thiserror-impl",
]
+[[package]]
+name = "thiserror-core"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497"
+dependencies = [
+ "thiserror-core-impl",
+]
+
+[[package]]
+name = "thiserror-core-impl"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.65",
+]
+
[[package]]
name = "thiserror-impl"
version = "1.0.49"
@@ -3176,24 +3001,24 @@ version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"once_cell",
]
[[package]]
-name = "thunderdome"
-version = "0.3.0"
+name = "tinyvec"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7572415bd688d401c52f6e36f4c8e805b9ae1622619303b9fa835d531db0acae"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
[[package]]
-name = "toml"
-version = "0.5.11"
+name = "tinyvec_macros"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "toml_datetime"
@@ -3218,7 +3043,7 @@ version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"pin-project-lite",
"tracing-attributes",
"tracing-core",
@@ -3256,47 +3081,22 @@ dependencies = [
"tracing-core",
]
-[[package]]
-name = "tracing-serde"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
[[package]]
name = "tracing-subscriber"
-version = "0.2.25"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
dependencies = [
- "ansi_term",
- "chrono",
- "lazy_static",
"matchers",
+ "nu-ansi-term",
+ "once_cell",
"regex",
- "serde",
- "serde_json",
"sharded-slab",
"smallvec",
"thread_local",
"tracing",
"tracing-core",
"tracing-log",
- "tracing-serde",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
-dependencies = [
- "sharded-slab",
- "thread_local",
- "tracing-core",
]
[[package]]
@@ -3306,7 +3106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07"
dependencies = [
"tracing",
- "tracing-subscriber 0.3.17",
+ "tracing-subscriber",
"wasm-bindgen",
]
@@ -3316,12 +3116,28 @@ version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
+[[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 = "unicode-ident"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
[[package]]
name = "unicode-xid"
version = "0.2.4"
@@ -3330,9 +3146,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "uuid"
-version = "0.8.2"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [
"getrandom",
"serde",
@@ -3380,36 +3196,36 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.69"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.69"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
- "lazy_static",
"log",
+ "once_cell",
"proc-macro2",
"quote",
- "syn 1.0.65",
+ "syn 2.0.38",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.19"
+version = "0.4.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
"js-sys",
"wasm-bindgen",
"web-sys",
@@ -3417,9 +3233,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.69"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -3427,28 +3243,39 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.69"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.65",
+ "syn 2.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.69"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[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.46"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -3456,68 +3283,109 @@ dependencies = [
[[package]]
name = "wgpu"
-version = "0.7.1"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79a0a0a63fac9492cfaf6e7e4bdf9729c128f1e94124b9e4cbc4004b8cb6d1d8"
+checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
dependencies = [
"arrayvec",
+ "cfg-if",
"js-sys",
+ "log",
"naga",
- "parking_lot",
- "raw-window-handle 0.3.4",
+ "parking_lot 0.11.2",
+ "profiling",
+ "raw-window-handle",
"smallvec",
- "syn 1.0.65",
- "tracing",
+ "static_assertions",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
"wgpu-core",
+ "wgpu-hal",
"wgpu-types",
]
[[package]]
name = "wgpu-core"
-version = "0.7.2"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20d26a5a744a6531fd3bdf79d4b105fff53ab06757fbf37a6b83ff4461458429"
+checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
dependencies = [
"arrayvec",
- "bitflags 1.3.2",
- "cfg_aliases",
- "copyless",
- "fxhash",
- "gfx-backend-dx11",
- "gfx-backend-dx12",
- "gfx-backend-empty",
- "gfx-backend-gl",
- "gfx-backend-metal",
- "gfx-backend-vulkan",
- "gfx-hal",
+ "bit-vec",
+ "bitflags 2.4.0",
+ "codespan-reporting",
+ "log",
+ "naga",
+ "parking_lot 0.11.2",
+ "profiling",
+ "raw-window-handle",
+ "rustc-hash",
+ "smallvec",
+ "thiserror",
+ "web-sys",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-hal"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
+dependencies = [
+ "android_system_properties",
+ "arrayvec",
+ "ash",
+ "bit-set",
+ "bitflags 2.4.0",
+ "block",
+ "core-graphics-types",
+ "d3d12",
+ "foreign-types",
+ "glow",
"gpu-alloc",
+ "gpu-allocator",
"gpu-descriptor",
+ "hassle-rs",
+ "js-sys",
+ "khronos-egl",
+ "libc",
+ "libloading 0.8.1",
+ "log",
+ "metal",
"naga",
- "parking_lot",
- "raw-window-handle 0.3.4",
+ "objc",
+ "parking_lot 0.11.2",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle",
+ "renderdoc-sys",
+ "rustc-hash",
"smallvec",
"thiserror",
- "tracing",
+ "wasm-bindgen",
+ "web-sys",
"wgpu-types",
+ "winapi",
]
[[package]]
name = "wgpu-types"
-version = "0.7.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72fa9ba80626278fd87351555c363378d08122d7601e58319be3d6fa85a87747"
+checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
+ "js-sys",
+ "web-sys",
]
[[package]]
-name = "winapi"
-version = "0.2.8"
+name = "widestring"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
[[package]]
name = "winapi"
@@ -3529,12 +3397,6 @@ dependencies = [
"winapi-x86_64-pc-windows-gnu",
]
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
@@ -3547,7 +3409,7 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
dependencies = [
- "winapi 0.3.9",
+ "winapi",
]
[[package]]
@@ -3556,13 +3418,107 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "windows"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.65",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.65",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
]
[[package]]
@@ -3571,51 +3527,93 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
]
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
[[package]]
name = "windows_i686_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
[[package]]
name = "windows_i686_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.5"
@@ -3624,32 +3622,31 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winit"
-version = "0.24.0"
+version = "0.28.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597"
+checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
dependencies = [
+ "android-activity",
"bitflags 1.3.2",
- "cocoa",
- "core-foundation 0.9.3",
- "core-graphics 0.22.3",
- "core-video-sys",
+ "cfg_aliases",
+ "core-foundation",
+ "core-graphics",
"dispatch",
"instant",
- "lazy_static",
"libc",
"log",
- "mio 0.6.23",
- "mio-extras",
- "ndk 0.2.1",
- "ndk-glue 0.2.1",
- "ndk-sys 0.2.2",
- "objc",
- "parking_lot",
+ "mio",
+ "ndk",
+ "objc2",
+ "once_cell",
+ "orbclient",
"percent-encoding",
- "raw-window-handle 0.3.4",
+ "raw-window-handle",
+ "redox_syscall 0.3.5",
"wasm-bindgen",
+ "wayland-scanner",
"web-sys",
- "winapi 0.3.9",
+ "windows-sys 0.45.0",
"x11-dl",
]
@@ -3662,25 +3659,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "wio"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
[[package]]
name = "x11-dl"
version = "2.21.0"
@@ -3697,3 +3675,9 @@ name = "xi-unicode"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
+
+[[package]]
+name = "xml-rs"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
diff --git a/game/Cargo.toml b/game/Cargo.toml
index 155a3132b72013c853bac9584733e2cbe3a1277c..cf168c635497a9a6a897d4686aa8b177ab411b69 100644
--- a/game/Cargo.toml
+++ b/game/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-bevy = "0.5"
+bevy = "0.11.3"
# Enable a small amount of optimization in debug mode
[profile.dev]
diff --git a/game/assets/pokeball.png b/game/assets/pokeball.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a8b3ae898b10b5010299730fef33527646a641a
Binary files /dev/null and b/game/assets/pokeball.png differ
diff --git a/game/assets/textures/Game Icons/exitRight.png b/game/assets/textures/Game Icons/exitRight.png
new file mode 100644
index 0000000000000000000000000000000000000000..de78ab6f0f02523b296d723667143949cbeab8d7
Binary files /dev/null and b/game/assets/textures/Game Icons/exitRight.png differ
diff --git a/game/assets/textures/Game Icons/right.png b/game/assets/textures/Game Icons/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f2480f9a5465d9ff1a9869dadebfd96ae9847d1
Binary files /dev/null and b/game/assets/textures/Game Icons/right.png differ
diff --git a/game/assets/textures/Game Icons/wrench.png b/game/assets/textures/Game Icons/wrench.png
new file mode 100644
index 0000000000000000000000000000000000000000..440e7edc41af9d033991f50595721ea70e2da744
Binary files /dev/null and b/game/assets/textures/Game Icons/wrench.png differ
diff --git a/game/src/main.rs b/game/src/main.rs
index fa2060eca92dcf6abae676db3fbd0619893d9ccc..c07a8e200305fb234b21858989cd480f16ec75fc 100644
--- a/game/src/main.rs
+++ b/game/src/main.rs
@@ -1,126 +1,832 @@
-use bevy::{prelude::*, render::camera::ScalingMode};
-use bevy_sprite::SpritePlugin;
-#[derive(Component)]
-struct Person;
-
-#[derive(Component)]
-struct Name(String);
-
-// fn hello_world() {
-// println!("hello world!");
-// }
-
-// fn add_people(mut commands: Commands) {
-// commands.spawn((Person, Name("Antoine A".to_string())));
-// commands.spawn((Person, Name("Ricardo B".to_string())));
-// commands.spawn(Person,Name("theo".to_string()));
-// }
-
-// fn greet_people(query: Query<&Name, With<Person>>) {
-// for name in &query {
-// println!("hello {}!", name.0);
-// }
-// }
-pub const RESOLUTION: f32 = 16.0 / 9.0;
-pub const CLEAR: Color = Color::rgb(0.1,0.1,0.1);
+//! This example will display a simple menu using Bevy UI where you can start a new game,
+//! change some settings or quit. There is no actual game, it will just display the current
+//! settings for 5 seconds before going back to the menu.
+
+use bevy::{
+ prelude::*,
+};
+
+const TEXT_COLOR: Color = Color::rgb(0.9, 0.9, 0.9);
+
+// Enum that will be used as a global state for the game
+#[derive(Clone, Copy, Default, Eq, PartialEq, Debug, Hash, States)]
+enum GameState {
+ #[default]
+ Splash,
+ Menu,
+ Game,
+}
+
+// One of the two settings that can be set through the menu. It will be a resource in the app
+#[derive(Resource, Debug, Component, PartialEq, Eq, Clone, Copy)]
+enum DisplayQuality {
+ Low,
+ Medium,
+ High,
+}
+
+// One of the two settings that can be set through the menu. It will be a resource in the app
+#[derive(Resource, Debug, Component, PartialEq, Eq, Clone, Copy)]
+struct Volume(u32);
fn main() {
- App::new()
- .insert_resource(ClearColor(CLEAR))
- .insert_resource(WindowDescriptor{
- width:height * RESOLUTION,
- height:240,
- title: "Pokeprof".to_string(),
- vsync:true,
- resizable: false,
- ..Default::default()
- })
- .add_startup_system(setup.system())
- .add_startup_system(spawn_camera.system())
- .add_startup_system(spawn_player.system())
+ App::new()/*
+ .insert_resource(ResolutionSettings {
+ large: Vec2::new(1920.0, 1080.0),
+ medium: Vec2::new(800.0, 600.0),
+ small: Vec2::new(640.0, 360.0),
+ })*/
.add_plugins(DefaultPlugins)
- .add_startup_system(move_character.system())
+ // Insert as resource the initial value for the settings resources
+ .insert_resource(DisplayQuality::Medium)
+ .insert_resource(Volume(7))
+ // Declare the game state, whose starting value is determined by the `Default` trait
+ .add_state::<GameState>()
+ .add_systems(Startup, setup)
+ // Adds the plugins for each state
+ .add_plugins((splash::SplashPlugin, menu::MenuPlugin, game::GamePlugin))
+ //.add_plugins(splash::SplashPlugin)
.run();
- // .add_systems(Startup, add_people)
- // .add_systems(Update, (hello_world, greet_people))
- //.run();
}
-fn setup(commands: &mut Commands, asset_server: Res<AssetServer>) {
-
- let map_texture = asset_server.load("map_png/mapdebut.png");
- let map_texture_atlas = TextureAtlas::from_grid(map_texture, Vec2::new(16.0, 16.0), 15, 15);
- let map_texture_atlas_handle = asset_server.load("map_png/mapdebut.png");
- commands.insert_resource(MapTextureAtlas(map_texture_atlas_handle));
-
- let character_texture = asset_server.load("prog_png/perso.png");
- let character_texture_atlas = TextureAtlas::from_grid(character_texture, Vec2::new(16.0, 16.0), 1, 1);
- let character_texture_atlas_handle = asset_server.load("prog_png/perso.png");
- commands.insert_resource(CharacterTextureAtlas(character_texture_atlas_handle));
+fn setup(mut commands: Commands) {
+ commands.spawn(Camera2dBundle::default());
}
+mod splash{
-fn spawn_camera(mut commands: Commands)
-{
- let mut camera = OrthographicCameraBundle::new_2d();
- camera.orthographic_projection.scaling_mode = ScalingMode::None;
- camera.orthographic_projection.top = 1.0;
- camera.orthographic_projection.bottom = -1.0;
- camera.orthographic_projection.right = 1.0 * RESOLUTION;
- camera.orthographic_projection.left = -1.0 * RESOLUTION;
- commands.spawn_bundle(camera);
-}
-fn spawn_player(mut commands: Commands, character_atlas: Res<CharacterTextureAtlas>)
-{
- let mut sprite= TextureAtlasSprite::new(0);
- sprite.color = Color::rgb(0.3,0.3,0.9);
- sprite.custom_size = Some(Vec2::splat(1.0));
- commands.spawn_bundle(SpriteSheetBundle
- {
- sprite: sprite,
- texture_atlas: character_atlas.0.clone(),
- transform: Transform {
- translation: Vec3::new(0.0, 0.0, 0.0),
- ..Default::default()
- },
- ..Default::default()
- });
+ use bevy::prelude::*;
+
+ use super::{despawn_screen, GameState};
+ // This plugin will display a splash screen with Bevy logo for 1 second before switching to the menu
+ pub struct SplashPlugin;
+
+ impl Plugin for SplashPlugin {
+ fn build(&self, app: &mut App) {
+ // As this plugin is managing the splash screen, it will focus on the state `GameState::Splash`
+ app
+ // When entering the state, spawn everything needed for this screen
+ .add_systems(OnEnter(GameState::Splash), splash_setup)
+ // While in this state, run the `countdown` system
+ .add_systems(Update, countdown.run_if(in_state(GameState::Splash)))
+ // When exiting the state, despawn everything that was spawned for this screen
+ .add_systems(OnExit(GameState::Splash), despawn_screen::<OnSplashScreen>);
+ }
+ }
+
+ // Tag component used to tag entities added on the splash screen
+ #[derive(Component)]
+ struct OnSplashScreen;
+
+ // Newtype to use a `Timer` for this screen as a resource
+ #[derive(Resource, Deref, DerefMut)]
+ struct SplashTimer(Timer);
+
+ fn splash_setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+ let icon = asset_server.load("pokeball.png");
+ // Display the logo
+ commands
+ .spawn((
+ NodeBundle {
+ style: Style {
+ align_items: AlignItems::Center,
+ justify_content: JustifyContent::Center,
+ width: Val::Percent(100.0),
+ ..default()
+ },
+ ..default()
+ },
+ OnSplashScreen,
+ ))
+ .with_children(|parent| {
+ parent.spawn(ImageBundle {
+ style: Style {
+ // This will set the logo to be 200px wide, and auto adjust its height
+ width: Val::Px(200.0),
+ ..default()
+ },
+ image: UiImage::new(icon),
+ ..default()
+ });
+ });
+ // Insert the timer as a resource
+ commands.insert_resource(SplashTimer(Timer::from_seconds(1.0, TimerMode::Once)));
+ }
+
+ // Tick the timer, and change state when finished
+ fn countdown(
+ mut game_state: ResMut<NextState<GameState>>,
+ time: Res<Time>,
+ mut timer: ResMut<SplashTimer>,
+ ) {
+ if timer.tick(time.delta()).finished() {
+ game_state.set(GameState::Menu);
+ }
+ }
}
-struct CharacterPosition(Vec2);
-fn move_character(
- keyboard_input: Res<Input<KeyCode>>,
- mut character_atlas: ResMut<CharacterTextureAtlas>,
- mut character_position: ResMut<CharacterPosition>,
- query: Query<(&mut Transform, &Character)>
- ,
-) {
- for mut transform in query.iter_mut() {
- let mut delta = Vec2::ZERO;
-
- if keyboard_input.pressed(KeyCode::Left) {
- delta.x -= 8.0;
+
+
+mod game {
+ use bevy::prelude::*;
+
+ use super::{despawn_screen, DisplayQuality, GameState, Volume, TEXT_COLOR};
+
+ // This plugin will contain the game. In this case, it's just be a screen that will
+ // display the current settings for 5 seconds before returning to the menu
+ pub struct GamePlugin;
+
+ impl Plugin for GamePlugin {
+ fn build(&self, app: &mut App) {
+ app.add_systems(OnEnter(GameState::Game), game_setup)
+ .add_systems(Update, game.run_if(in_state(GameState::Game)))
+ .add_systems(OnExit(GameState::Game), despawn_screen::<OnGameScreen>);
}
- if keyboard_input.pressed(KeyCode::Right) {
- delta.x += 8.0;
+ }
+
+ // Tag component used to tag entities added on the game screen
+ #[derive(Component)]
+ struct OnGameScreen;
+
+ #[derive(Resource, Deref, DerefMut)]
+ struct GameTimer(Timer);
+
+ fn game_setup(
+ mut commands: Commands,
+ display_quality: Res<DisplayQuality>,
+ volume: Res<Volume>,
+ ) {
+ commands
+ .spawn((
+ NodeBundle {
+ style: Style {
+ width: Val::Percent(100.0),
+ height: Val::Percent(100.0),
+ // center children
+ align_items: AlignItems::Center,
+ justify_content: JustifyContent::Center,
+ ..default()
+ },
+ ..default()
+ },
+ OnGameScreen,
+ ))
+ .with_children(|parent| {
+ // First create a `NodeBundle` for centering what we want to display
+ parent
+ .spawn(NodeBundle {
+ style: Style {
+ // This will display its children in a column, from top to bottom
+ flex_direction: FlexDirection::Column,
+ // `align_items` will align children on the cross axis. Here the main axis is
+ // vertical (column), so the cross axis is horizontal. This will center the
+ // children
+ align_items: AlignItems::Center,
+ ..default()
+ },
+ background_color: Color::BLACK.into(),
+ ..default()
+ })
+ .with_children(|parent| {
+ // Display two lines of text, the second one with the current settings
+ parent.spawn(
+ TextBundle::from_section(
+ "Will be back to the menu shortly...",
+ TextStyle {
+ font_size: 80.0,
+ color: TEXT_COLOR,
+ ..default()
+ },
+ )
+ .with_style(Style {
+ margin: UiRect::all(Val::Px(50.0)),
+ ..default()
+ }),
+ );
+ parent.spawn(
+ TextBundle::from_sections([
+ TextSection::new(
+ format!("quality: {:?}", *display_quality),
+ TextStyle {
+ font_size: 60.0,
+ color: Color::BLUE,
+ ..default()
+ },
+ ),
+ TextSection::new(
+ " - ",
+ TextStyle {
+ font_size: 60.0,
+ color: TEXT_COLOR,
+ ..default()
+ },
+ ),
+ TextSection::new(
+ format!("volume: {:?}", *volume),
+ TextStyle {
+ font_size: 60.0,
+ color: Color::GREEN,
+ ..default()
+ },
+ ),
+ ])
+ .with_style(Style {
+ margin: UiRect::all(Val::Px(50.0)),
+ ..default()
+ }),
+ );
+ });
+ });
+ // Spawn a 5 seconds timer to trigger going back to the menu
+ commands.insert_resource(GameTimer(Timer::from_seconds(5.0, TimerMode::Once)));
+ }
+
+ // Tick the timer, and change state when finished
+ fn game(
+ time: Res<Time>,
+ mut game_state: ResMut<NextState<GameState>>,
+ mut timer: ResMut<GameTimer>,
+ ) {
+ if timer.tick(time.delta()).finished() {
+ game_state.set(GameState::Menu);
+ }
+ }
+}
+
+mod menu {
+ use bevy::{app::AppExit, prelude::*};
+
+ use super::{despawn_screen, DisplayQuality, GameState, Volume, TEXT_COLOR};
+
+ // This plugin manages the menu, with 5 different screens:
+ // - a main menu with "New Game", "Settings", "Quit"
+ // - a settings menu with two submenus and a back button
+ // - two settings screen with a setting that can be set and a back button
+ pub struct MenuPlugin;
+
+ impl Plugin for MenuPlugin {
+ fn build(&self, app: &mut App) {
+ app
+ // At start, the menu is not enabled. This will be changed in `menu_setup` when
+ // entering the `GameState::Menu` state.
+ // Current screen in the menu is handled by an independent state from `GameState`
+ .add_state::<MenuState>()
+ .add_systems(OnEnter(GameState::Menu), menu_setup)
+ // Systems to handle the main menu screen
+ .add_systems(OnEnter(MenuState::Main), main_menu_setup)
+ .add_systems(OnExit(MenuState::Main), despawn_screen::<OnMainMenuScreen>)
+ // Systems to handle the settings menu screen
+ .add_systems(OnEnter(MenuState::Settings), settings_menu_setup)
+ .add_systems(
+ OnExit(MenuState::Settings),
+ despawn_screen::<OnSettingsMenuScreen>,
+ )
+ // Systems to handle the display settings screen
+ .add_systems(
+ OnEnter(MenuState::SettingsDisplay),
+ display_settings_menu_setup,
+ )
+ .add_systems(
+ Update,
+ (
+ setting_button::<DisplayQuality>
+ .run_if(in_state(MenuState::SettingsDisplay)),
+ ),
+ )
+ .add_systems(
+ OnExit(MenuState::SettingsDisplay),
+ despawn_screen::<OnDisplaySettingsMenuScreen>,
+ )
+ // Systems to handle the sound settings screen
+ .add_systems(OnEnter(MenuState::SettingsSound), sound_settings_menu_setup)
+ .add_systems(
+ Update,
+ setting_button::<Volume>.run_if(in_state(MenuState::SettingsSound)),
+ )
+ .add_systems(
+ OnExit(MenuState::SettingsSound),
+ despawn_screen::<OnSoundSettingsMenuScreen>,
+ )
+ // Common systems to all screens that handles buttons behavior
+ .add_systems(
+ Update,
+ (menu_action, button_system).run_if(in_state(GameState::Menu)),
+ );
}
- if keyboard_input.pressed(KeyCode::Down) {
- delta.y -= 8.0;
+ }
+
+ // State used for the current menu screen
+ #[derive(Clone, Copy, Default, Eq, PartialEq, Debug, Hash, States)]
+ enum MenuState {
+ Main,
+ Settings,
+ SettingsDisplay,
+ SettingsSound,
+ #[default]
+ Disabled,
+ }
+
+ // Tag component used to tag entities added on the main menu screen
+ #[derive(Component)]
+ struct OnMainMenuScreen;
+
+ // Tag component used to tag entities added on the settings menu screen
+ #[derive(Component)]
+ struct OnSettingsMenuScreen;
+
+ // Tag component used to tag entities added on the display settings menu screen
+ #[derive(Component)]
+ struct OnDisplaySettingsMenuScreen;
+
+ // Tag component used to tag entities added on the sound settings menu screen
+ #[derive(Component)]
+ struct OnSoundSettingsMenuScreen;
+
+ const NORMAL_BUTTON: Color = Color::rgb(0.15, 0.15, 0.15);
+ const HOVERED_BUTTON: Color = Color::rgb(0.25, 0.25, 0.25);
+ const HOVERED_PRESSED_BUTTON: Color = Color::rgb(0.25, 0.65, 0.25);
+ const PRESSED_BUTTON: Color = Color::rgb(0.35, 0.75, 0.35);
+
+ // Tag component used to mark which setting is currently selected
+ #[derive(Component)]
+ struct SelectedOption;
+
+ // All actions that can be triggered from a button click
+ #[derive(Component)]
+ enum MenuButtonAction {
+ Play,
+ Settings,
+ SettingsDisplay,
+ SettingsSound,
+ BackToMainMenu,
+ BackToSettings,
+ Quit,
+ }
+
+ // This system handles changing all buttons color based on mouse interaction
+ fn button_system(
+ mut interaction_query: Query<
+ (&Interaction, &mut BackgroundColor, Option<&SelectedOption>),
+ (Changed<Interaction>, With<Button>),
+ >,
+ ) {
+ for (interaction, mut color, selected) in &mut interaction_query {
+ *color = match (*interaction, selected) {
+ (Interaction::Pressed, _) | (Interaction::None, Some(_)) => PRESSED_BUTTON.into(),
+ (Interaction::Hovered, Some(_)) => HOVERED_PRESSED_BUTTON.into(),
+ (Interaction::Hovered, None) => HOVERED_BUTTON.into(),
+ (Interaction::None, None) => NORMAL_BUTTON.into(),
+ }
}
- if keyboard_input.pressed(KeyCode::Up) {
- delta.y += 8.0;
+ }
+
+ // This system updates the settings when a new value for a setting is selected, and marks
+ // the button as the one currently selected
+ fn setting_button<T: Resource + Component + PartialEq + Copy>(
+ interaction_query: Query<(&Interaction, &T, Entity), (Changed<Interaction>, With<Button>)>,
+ mut selected_query: Query<(Entity, &mut BackgroundColor), With<SelectedOption>>,
+ mut commands: Commands,
+ mut setting: ResMut<T>,
+ ) {
+ for (interaction, button_setting, entity) in &interaction_query {
+ if *interaction == Interaction::Pressed && *setting != *button_setting {
+ let (previous_button, mut previous_color) = selected_query.single_mut();
+ *previous_color = NORMAL_BUTTON.into();
+ commands.entity(previous_button).remove::<SelectedOption>();
+ commands.entity(entity).insert(SelectedOption);
+ *setting = *button_setting;
+ }
}
+ }
- if delta != Vec2::ZERO {
- character_position.0 += delta;
- transform.translation = Vec3::new(
- character_position.0.x,
- character_position.0.y,
- transform.translation.z,
- );
+ fn menu_setup(mut menu_state: ResMut<NextState<MenuState>>) {
+ menu_state.set(MenuState::Main);
+ }
+
+ fn main_menu_setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+ // Common style for all buttons on the screen
+ let button_style = Style {
+ width: Val::Px(250.0),
+ height: Val::Px(65.0),
+ margin: UiRect::all(Val::Px(20.0)),
+ justify_content: JustifyContent::Center,
+ align_items: AlignItems::Center,
+ ..default()
+ };
+ let button_icon_style = Style {
+ width: Val::Px(30.0),
+ // This takes the icons out of the flexbox flow, to be positioned exactly
+ position_type: PositionType::Absolute,
+ // The icon will be close to the left border of the button
+ left: Val::Px(10.0),
+ right: Val::Auto,
+ ..default()
+ };
+ let button_text_style = TextStyle {
+ font_size: 40.0,
+ color: TEXT_COLOR,
+ ..default()
+ };
+
+ commands
+ .spawn((
+ NodeBundle {
+ style: Style {
+ width: Val::Percent(100.0),
+ align_items: AlignItems::Center,
+ justify_content: JustifyContent::Center,
+ ..default()
+ },
+ ..default()
+ },
+ OnMainMenuScreen,
+ ))
+ .with_children(|parent| {
+ parent
+ .spawn(NodeBundle {
+ style: Style {
+ flex_direction: FlexDirection::Column,
+ align_items: AlignItems::Center,
+ ..default()
+ },
+ background_color: Color::BLACK.into(),
+ ..default()
+ })
+ .with_children(|parent| {
+ // Display the game name
+ parent.spawn(
+ TextBundle::from_section(
+ "Poke Profs\nMenu",
+ TextStyle {
+ font_size: 80.0,
+ color: TEXT_COLOR,
+ ..default()
+ },
+ )
+ .with_style(Style {
+ margin: UiRect::all(Val::Px(50.0)),
+ ..default()
+ }),
+ );
+
+ // Display three buttons for each action available from the main menu:
+ // - new game
+ // - settings
+ // - quit
+ parent
+ .spawn((
+ ButtonBundle {
+ style: button_style.clone(),
+ background_color: NORMAL_BUTTON.into(),
+ ..default()
+ },
+ MenuButtonAction::Play,
+ ))
+ .with_children(|parent| {
+ let icon = asset_server.load("textures/Game Icons/right.png");
+ parent.spawn(ImageBundle {
+ style: button_icon_style.clone(),
+ image: UiImage::new(icon),
+ ..default()
+ });
+ parent.spawn(TextBundle::from_section(
+ "New Game",
+ button_text_style.clone(),
+ ));
+ });
+ parent
+ .spawn((
+ ButtonBundle {
+ style: button_style.clone(),
+ background_color: NORMAL_BUTTON.into(),
+ ..default()
+ },
+ MenuButtonAction::Settings,
+ ))
+ .with_children(|parent| {
+ let icon = asset_server.load("textures/Game Icons/wrench.png");
+ parent.spawn(ImageBundle {
+ style: button_icon_style.clone(),
+ image: UiImage::new(icon),
+ ..default()
+ });
+ parent.spawn(TextBundle::from_section(
+ "Settings",
+ button_text_style.clone(),
+ ));
+ });
+ parent
+ .spawn((
+ ButtonBundle {
+ style: button_style,
+ background_color: NORMAL_BUTTON.into(),
+ ..default()
+ },
+ MenuButtonAction::Quit,
+ ))
+ .with_children(|parent| {
+ let icon = asset_server.load("textures/Game Icons/exitRight.png");
+ parent.spawn(ImageBundle {
+ style: button_icon_style,
+ image: UiImage::new(icon),
+ ..default()
+ });
+ parent.spawn(TextBundle::from_section("Quit", button_text_style));
+ });
+ });
+ });
+ }
+
+ fn settings_menu_setup(mut commands: Commands) {
+ let button_style = Style {
+ width: Val::Px(200.0),
+ height: Val::Px(65.0),
+ margin: UiRect::all(Val::Px(20.0)),
+ justify_content: JustifyContent::Center,
+ align_items: AlignItems::Center,
+ ..default()
+ };
+
+ let button_text_style = TextStyle {
+ font_size: 40.0,
+ color: TEXT_COLOR,
+ ..default()
+ };
+
+ commands
+ .spawn((
+ NodeBundle {
+ style: Style {
+ width: Val::Percent(100.0),
+ align_items: AlignItems::Center,
+ justify_content: JustifyContent::Center,
+ ..default()
+ },
+ ..default()
+ },
+ OnSettingsMenuScreen,
+ ))
+ .with_children(|parent| {
+ parent
+ .spawn(NodeBundle {
+ style: Style {
+ flex_direction: FlexDirection::Column,
+ align_items: AlignItems::Center,
+ ..default()
+ },
+ background_color: Color::BLACK.into(),
+ ..default()
+ })
+ .with_children(|parent| {
+ for (action, text) in [
+ (MenuButtonAction::SettingsDisplay, "Display"),
+ (MenuButtonAction::SettingsSound, "Sound"),
+ (MenuButtonAction::BackToMainMenu, "Back"),
+ ] {
+ parent
+ .spawn((
+ ButtonBundle {
+ style: button_style.clone(),
+ background_color: NORMAL_BUTTON.into(),
+ ..default()
+ },
+ action,
+ ))
+ .with_children(|parent| {
+ parent.spawn(TextBundle::from_section(
+ text,
+ button_text_style.clone(),
+ ));
+ });
+ }
+ });
+ });
+ }
+
+ fn display_settings_menu_setup(mut commands: Commands, display_quality: Res<DisplayQuality>) {
+ let button_style = Style {
+ width: Val::Px(200.0),
+ height: Val::Px(65.0),
+ margin: UiRect::all(Val::Px(20.0)),
+ justify_content: JustifyContent::Center,
+ align_items: AlignItems::Center,
+ ..default()
+ };
+ let button_text_style = TextStyle {
+ font_size: 40.0,
+ color: TEXT_COLOR,
+ ..default()
+ };
+
+ commands
+ .spawn((
+ NodeBundle {
+ style: Style {
+ width: Val::Percent(100.0),
+ align_items: AlignItems::Center,
+ justify_content: JustifyContent::Center,
+ ..default()
+ },
+ ..default()
+ },
+ OnDisplaySettingsMenuScreen,
+ ))
+ .with_children(|parent| {
+ parent
+ .spawn(NodeBundle {
+ style: Style {
+ flex_direction: FlexDirection::Column,
+ align_items: AlignItems::Center,
+ ..default()
+ },
+ background_color: Color::BLACK.into(),
+ ..default()
+ })
+ .with_children(|parent| {
+ // Create a new `NodeBundle`, this time not setting its `flex_direction`. It will
+ // use the default value, `FlexDirection::Row`, from left to right.
+ parent
+ .spawn(NodeBundle {
+ style: Style {
+ align_items: AlignItems::Center,
+ ..default()
+ },
+ background_color: Color::BLACK.into(),
+ ..default()
+ })
+ .with_children(|parent| {
+ // Display a label for the current setting
+ parent.spawn(TextBundle::from_section(
+ "Display Quality",
+ button_text_style.clone(),
+ ));
+ // Display a button for each possible value
+ for quality_setting in [
+ DisplayQuality::Low,
+ DisplayQuality::Medium,
+ DisplayQuality::High,
+ ] {
+ let mut entity = parent.spawn(ButtonBundle {
+ style: Style {
+ width: Val::Px(150.0),
+ height: Val::Px(65.0),
+ ..button_style.clone()
+ },
+ background_color: NORMAL_BUTTON.into(),
+ ..default()
+ });
+ entity.insert(quality_setting).with_children(|parent| {
+ parent.spawn(TextBundle::from_section(
+ format!("{quality_setting:?}"),
+ button_text_style.clone(),
+ ));
+ });
+ if *display_quality == quality_setting {
+ entity.insert(SelectedOption);
+ }
+ }
+ });
+ // Display the back button to return to the settings screen
+ parent
+ .spawn((
+ ButtonBundle {
+ style: button_style,
+ background_color: NORMAL_BUTTON.into(),
+ ..default()
+ },
+ MenuButtonAction::BackToSettings,
+ ))
+ .with_children(|parent| {
+ parent.spawn(TextBundle::from_section("Back", button_text_style));
+ });
+ });
+ });
+ }
+
+ fn sound_settings_menu_setup(mut commands: Commands, volume: Res<Volume>) {
+ let button_style = Style {
+ width: Val::Px(200.0),
+ height: Val::Px(65.0),
+ margin: UiRect::all(Val::Px(20.0)),
+ justify_content: JustifyContent::Center,
+ align_items: AlignItems::Center,
+ ..default()
+ };
+ let button_text_style = TextStyle {
+ font_size: 40.0,
+ color: TEXT_COLOR,
+ ..default()
+ };
+
+ commands
+ .spawn((
+ NodeBundle {
+ style: Style {
+ width: Val::Percent(100.0),
+ align_items: AlignItems::Center,
+ justify_content: JustifyContent::Center,
+ ..default()
+ },
+ ..default()
+ },
+ OnSoundSettingsMenuScreen,
+ ))
+ .with_children(|parent| {
+ parent
+ .spawn(NodeBundle {
+ style: Style {
+ flex_direction: FlexDirection::Column,
+ align_items: AlignItems::Center,
+ ..default()
+ },
+ background_color: Color::BLACK.into(),
+ ..default()
+ })
+ .with_children(|parent| {
+ parent
+ .spawn(NodeBundle {
+ style: Style {
+ align_items: AlignItems::Center,
+ ..default()
+ },
+ background_color: Color::BLACK.into(),
+ ..default()
+ })
+ .with_children(|parent| {
+ parent.spawn(TextBundle::from_section(
+ "Volume",
+ button_text_style.clone(),
+ ));
+ for volume_setting in [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] {
+ let mut entity = parent.spawn(ButtonBundle {
+ style: Style {
+ width: Val::Px(30.0),
+ height: Val::Px(65.0),
+ ..button_style.clone()
+ },
+ background_color: NORMAL_BUTTON.into(),
+ ..default()
+ });
+ entity.insert(Volume(volume_setting));
+ if *volume == Volume(volume_setting) {
+ entity.insert(SelectedOption);
+ }
+ }
+ });
+ parent
+ .spawn((
+ ButtonBundle {
+ style: button_style,
+ background_color: NORMAL_BUTTON.into(),
+ ..default()
+ },
+ MenuButtonAction::BackToSettings,
+ ))
+ .with_children(|parent| {
+ parent.spawn(TextBundle::from_section("Back", button_text_style));
+ });
+ });
+ });
+ }
+
+ fn menu_action(
+ interaction_query: Query<
+ (&Interaction, &MenuButtonAction),
+ (Changed<Interaction>, With<Button>),
+ >,
+ mut app_exit_events: EventWriter<AppExit>,
+ mut menu_state: ResMut<NextState<MenuState>>,
+ mut game_state: ResMut<NextState<GameState>>,
+ ) {
+ for (interaction, menu_button_action) in &interaction_query {
+ if *interaction == Interaction::Pressed {
+ match menu_button_action {
+ MenuButtonAction::Quit => app_exit_events.send(AppExit),
+ MenuButtonAction::Play => {
+ game_state.set(GameState::Game);
+ menu_state.set(MenuState::Disabled);
+ }
+ MenuButtonAction::Settings => menu_state.set(MenuState::Settings),
+ MenuButtonAction::SettingsDisplay => {
+ menu_state.set(MenuState::SettingsDisplay);
+ }
+ MenuButtonAction::SettingsSound => {
+ menu_state.set(MenuState::SettingsSound);
+ }
+ MenuButtonAction::BackToMainMenu => menu_state.set(MenuState::Main),
+ MenuButtonAction::BackToSettings => {
+ menu_state.set(MenuState::Settings);
+ }
+ }
+ }
}
}
}
-
\ No newline at end of file
+// Generic system that takes a component as a parameter, and will despawn all entities with that component
+fn despawn_screen<T: Component>(to_despawn: Query<Entity, With<T>>, mut commands: Commands) {
+ for entity in &to_despawn {
+ commands.entity(entity).despawn_recursive();
+ }
+}
diff --git a/game/target/.rustc_info.json b/game/target/.rustc_info.json
index 986c2fc73169cec8b2bec928bdda3c8ef7381c0c..beda76194061469bc97a383d7fb38a0056cd75be 100644
--- a/game/target/.rustc_info.json
+++ b/game/target/.rustc_info.json
@@ -1 +1 @@
-{"rustc_fingerprint":11201075139874679237,"outputs":{"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.73.0 (cc66ad468 2023-10-03)\nbinary: rustc\ncommit-hash: cc66ad468955717ab92600c770da8c1601a4ff33\ncommit-date: 2023-10-03\nhost: x86_64-unknown-linux-gnu\nrelease: 1.73.0\nLLVM version: 17.0.2\n","stderr":""},"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/theo/.rustup/toolchains/stable-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""}},"successes":{}}
\ No newline at end of file
+{"rustc_fingerprint":12132392323658241160,"outputs":{"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/ho/.rustup/toolchains/stable-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"unknown\"\nunix\n","stderr":""},"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.72.0 (5680fa18f 2023-08-23)\nbinary: rustc\ncommit-hash: 5680fa18feaa87f3ff04063800aec256c3d4b4be\ncommit-date: 2023-08-23\nhost: x86_64-unknown-linux-gnu\nrelease: 1.72.0\nLLVM version: 16.0.5\n","stderr":""}},"successes":{}}
\ No newline at end of file
diff --git a/prof_png/pokeball.png b/prof_png/pokeball.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a8b3ae898b10b5010299730fef33527646a641a
Binary files /dev/null and b/prof_png/pokeball.png differ