diff --git a/Cargo.lock b/Cargo.lock index 0a0f3d74..3c582771 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,13 +24,29 @@ version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6cb10ed32c63247e4e39a8f42e8e30fb9442fbf7878c8e4a9849e7e381619bea" +[[package]] +name = "accesskit" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448" + [[package]] name = "accesskit_consumer" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" dependencies = [ - "accesskit", + "accesskit 0.12.2", +] + +[[package]] +name = "accesskit_consumer" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdfa1638ddd6eb9c752def95568df8b3ad832df252e9156d2eb783b201ca8a9" +dependencies = [ + "accesskit 0.14.0", + "immutable-chunkmap", ] [[package]] @@ -39,37 +55,77 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" dependencies = [ - "accesskit", - "accesskit_consumer", + "accesskit 0.12.2", + "accesskit_consumer 0.16.1", "objc2 0.3.0-beta.3.patch-leaks.3", "once_cell", ] +[[package]] +name = "accesskit_macos" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c236a84ff1111defc280cee755eaa953d0b24398786851b9d28322c6d3bb1ebd" +dependencies = [ + "accesskit 0.14.0", + "accesskit_consumer 0.22.0", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", + "once_cell", +] + [[package]] name = "accesskit_windows" version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" dependencies = [ - "accesskit", - "accesskit_consumer", + "accesskit 0.12.2", + "accesskit_consumer 0.16.1", "once_cell", "paste", "static_assertions", "windows 0.48.0", ] +[[package]] +name = "accesskit_windows" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d7f43d24b16b3e76bef248124fbfd2493c3a9860edb5aae1010c890e826de5e" +dependencies = [ + "accesskit 0.14.0", + "accesskit_consumer 0.22.0", + "paste", + "static_assertions", + "windows 0.54.0", +] + [[package]] name = "accesskit_winit" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45f8f7c9f66d454d5fd8e344c8c8c7324b57194e1041b955519fc58a01e77a25" dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_windows", - "raw-window-handle 0.6.0", - "winit", + "accesskit 0.12.2", + "accesskit_macos 0.10.1", + "accesskit_windows 0.15.1", + "raw-window-handle", + "winit 0.29.10", +] + +[[package]] +name = "accesskit_winit" +version = "0.20.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "755535e6bf711a42dac28b888b884b10fc00ff4010d9d3bd871c5f5beae5aa78" +dependencies = [ + "accesskit 0.14.0", + "accesskit_macos 0.15.0", + "accesskit_windows 0.20.0", + "raw-window-handle", + "winit 0.30.3", ] [[package]] @@ -117,14 +173,13 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "alsa" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" dependencies = [ "alsa-sys", - "bitflags 1.3.2", + "bitflags 2.5.0", "libc", - "nix 0.24.3", ] [[package]] @@ -144,7 +199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 2.4.2", + "bitflags 2.5.0", "cc", "cesu8", "jni 0.21.1", @@ -154,7 +209,28 @@ dependencies = [ "ndk 0.8.0", "ndk-context", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-activity" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" +dependencies = [ + "android-properties", + "bitflags 2.5.0", + "cc", + "cesu8", + "jni 0.21.1", + "jni-sys", + "libc", + "log", + "ndk 0.9.0", + "ndk-context", + "ndk-sys 0.6.0+11769913", + "num_enum", "thiserror", ] @@ -240,11 +316,10 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock", "async-task", "concurrent-queue", "fastrand", @@ -313,79 +388,166 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bevy" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "611dd99f412e862610adb43e2243b16436c6d8009f6d9dbe8ce3d6d840b34029" dependencies = [ - "bevy_internal", + "bevy_internal 0.13.0", +] + +[[package]] +name = "bevy" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e938630e9f472b1899c78ef84aa907081b23bad8333140e2295c620485b6ee7" +dependencies = [ + "bevy_internal 0.14.0", ] [[package]] name = "bevy_a11y" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf80cd6d0dca4073f9b34b16f1d187a4caa035fd841892519431783bbc9e287" +checksum = "cd8ef2795f7f5c816a4eda04834083eb5a92e8fef603bc21d2091c6e3b63621a" dependencies = [ - "accesskit", - "bevy_app", - "bevy_derive", - "bevy_ecs", + "accesskit 0.12.2", + "bevy_app 0.13.2", + "bevy_derive 0.13.2", + "bevy_ecs 0.13.2", +] + +[[package]] +name = "bevy_a11y" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e613f0e7d5a92637e59744f7185e374c9a59654ecc6d7575adcec9581db1363" +dependencies = [ + "accesskit 0.14.0", + "bevy_app 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", ] [[package]] name = "bevy_animation" -version = "0.13.0" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23aa4141df149b743e69c90244261c6372bafb70d9f115885de48a75fc28fd9b" +dependencies = [ + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_color", + "bevy_core 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_log 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", + "bevy_time 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "blake3", + "fixedbitset 0.5.7", + "petgraph", + "ron", + "serde", + "thiserror", + "thread_local", + "uuid", +] + +[[package]] +name = "bevy_app" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4ef4c35533df3f0c4e938cf6a831456ea563775bab799336f74331140c7665" +checksum = "ab348a32e46d21c5d61794294a92d415a770d26c7ba8951830b127b40b53ccc4" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_time", - "bevy_transform", - "bevy_utils", + "bevy_derive 0.13.2", + "bevy_ecs 0.13.2", + "bevy_reflect 0.13.2", + "bevy_tasks 0.13.2", + "bevy_utils 0.13.2", + "downcast-rs", + "wasm-bindgen", + "web-sys", ] [[package]] name = "bevy_app" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bce3544afc010ffed39c136f6d5a9322d20d38df1394d468ba9106caa0434cb" +checksum = "6f548e9dab7d10c5f99e3b504c758c4bf87aa67df9bcb9cc8b317a0271770e72" dependencies = [ - "bevy_derive", - "bevy_ecs", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", + "console_error_panic_hook", "downcast-rs", + "thiserror", "wasm-bindgen", "web-sys", ] [[package]] name = "bevy_asset" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50028e0d4f28a9f6aab48f61b688ba2793141188f88cdc9aa6c2bca2cc02ad35" +dependencies = [ + "async-broadcast", + "async-fs", + "async-lock", + "bevy_app 0.13.2", + "bevy_asset_macros 0.13.2", + "bevy_ecs 0.13.2", + "bevy_log 0.13.2", + "bevy_reflect 0.13.2", + "bevy_tasks 0.13.2", + "bevy_utils 0.13.2", + "bevy_winit 0.13.2", + "blake3", + "crossbeam-channel", + "downcast-rs", + "futures-io", + "futures-lite", + "js-sys", + "parking_lot", + "ron", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac185d8e29c7eb0194f8aae7af3f7234f7ca7a448293be1d3d0d8fef435f65ec" +checksum = "f9d198e4c3419215de2ad981d4e734bbfab46469b7575e3b7150c912b9ec5175" dependencies = [ "async-broadcast", "async-fs", "async-lock", - "bevy_app", - "bevy_asset_macros", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", - "bevy_winit", + "bevy_app 0.14.0", + "bevy_asset_macros 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", + "bevy_winit 0.14.0", "blake3", "crossbeam-channel", "downcast-rs", @@ -396,6 +558,7 @@ dependencies = [ "ron", "serde", "thiserror", + "uuid", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -403,78 +566,156 @@ dependencies = [ [[package]] name = "bevy_asset_macros" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb82d1aac8251378c45a8d0ad788d1bf75f54db28c1750f84f1fd7c00127927a" +checksum = "6617475908368418d815360148fdbb82f879dc255a70d2d7baa3766f0cd4bfd7" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.13.2", "proc-macro2", "quote", "syn 2.0.50", ] [[package]] -name = "bevy_audio" -version = "0.13.0" +name = "bevy_asset_macros" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fe7f952e5e0a343fbde43180db7b8e719ad78594480c91b26876623944a3a1" +checksum = "11b2cbeba287a4b44e116c33dbaf37dce80a9d84477b2bb35ff459999d6c9e1b" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_transform", - "bevy_utils", - "oboe", + "bevy_macro_utils 0.14.0", + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "bevy_audio" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e41ecf15d0aae31bdb6d2b5cc590f966451e9736ddfee634c8f1ca5af1ac4342" +dependencies = [ + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "cpal", "rodio", ] +[[package]] +name = "bevy_color" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a933306f5c7dc9568209180f482b28b5f40d2f8d5b361bc1b270c0a588752c0" +dependencies = [ + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bytemuck", + "encase 0.8.0", + "serde", + "thiserror", + "wgpu-types 0.20.0", +] + [[package]] name = "bevy_core" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b1b340b8d08f48ecd51b97589d261f5023a7b073d25e300382c49146524103" +checksum = "12b0042f241ba7cd61487aadd8addfb56f7eeb662d713ac1577026704508fc6c" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_app 0.13.2", + "bevy_ecs 0.13.2", + "bevy_math 0.13.2", + "bevy_reflect 0.13.2", + "bevy_tasks 0.13.2", + "bevy_utils 0.13.2", "bytemuck", ] +[[package]] +name = "bevy_core" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ddeed5ebf2fa75a4d4f32e2da9c60f11037e36252695059a151c6685cd3d72b" +dependencies = [ + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", + "uuid", +] + [[package]] name = "bevy_core_pipeline" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "626a5aaadbdd69eae020c5856575d2d0113423ae1ae1351377e20956d940052c" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_derive", - "bevy_ecs", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bitflags 2.4.2", + "bevy_app 0.13.2", + "bevy_asset 0.13.2", + "bevy_core 0.13.2", + "bevy_derive 0.13.2", + "bevy_ecs 0.13.2", + "bevy_log 0.13.2", + "bevy_math 0.13.2", + "bevy_reflect 0.13.2", + "bevy_render 0.13.2", + "bevy_transform 0.13.2", + "bevy_utils 0.13.2", + "bitflags 2.5.0", "radsort", "serde", ] +[[package]] +name = "bevy_core_pipeline" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b978220b5edc98f2c5cbbd14c118c74b3ec7216e5416d3c187c1097279b009b" +dependencies = [ + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_color", + "bevy_core 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "bitflags 2.5.0", + "nonmax", + "radsort", + "serde", + "smallvec", + "thiserror", +] + [[package]] name = "bevy_derive" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028ae2a34678055185d7f1beebb1ebe6a8dcf3733e139e4ee1383a7f29ae8ba6" +checksum = "f0e01f8343f391e2d6a63b368b82fb5b252ed43c8713fc87f9a8f2d59407dd00" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.13.2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "bevy_derive" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8a8173bad3ed53fa158806b1beda147263337d6ef71a093780dd141b74386b1" +dependencies = [ + "bevy_macro_utils 0.14.0", "quote", "syn 2.0.50", ] @@ -485,43 +726,92 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01a104acfdc5280accd01a3524810daf3bda72924e3da0c8a9ec816a57eef4e3" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_time", - "bevy_utils", + "bevy_app 0.13.2", + "bevy_core 0.13.2", + "bevy_ecs 0.13.2", + "bevy_log 0.13.2", + "bevy_time 0.13.2", + "bevy_utils 0.13.2", + "const-fnv1a-hash", + "sysinfo", +] + +[[package]] +name = "bevy_diagnostic" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7f82011fd70048be282526a99756d54bf00e874edafa9664ba0dc247678f03" +dependencies = [ + "bevy_app 0.14.0", + "bevy_core 0.14.0", + "bevy_ecs 0.14.0", + "bevy_tasks 0.14.0", + "bevy_time 0.14.0", + "bevy_utils 0.14.0", "const-fnv1a-hash", "sysinfo", ] [[package]] name = "bevy_ecs" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85406d5febbbdbcac4444ef61cd9a816f2f025ed692a3fc5439a32153070304" +checksum = "98e612a8e7962ead849e370f3a7e972b88df879ced05cd9dad6a0286d14650cf" dependencies = [ "async-channel", - "bevy_ecs_macros", - "bevy_ptr", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_ecs_macros 0.13.2", + "bevy_ptr 0.13.2", + "bevy_reflect 0.13.2", + "bevy_tasks 0.13.2", + "bevy_utils 0.13.2", "downcast-rs", - "fixedbitset", + "fixedbitset 0.4.2", "rustc-hash", "serde", "thiserror", "thread_local", ] +[[package]] +name = "bevy_ecs" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c77fdc3a7230eff2fcebe4bd17c155bd238c660a0089d0f98c39ba0d461b923" +dependencies = [ + "arrayvec", + "bevy_ecs_macros 0.14.0", + "bevy_ptr 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", + "bitflags 2.5.0", + "concurrent-queue", + "fixedbitset 0.5.7", + "nonmax", + "petgraph", + "serde", + "thiserror", +] + [[package]] name = "bevy_ecs_macros" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3ce4b65d7c5f1990e729df75cec2ea6e2241b4a0c37b31c281a04c59c11b7b" +checksum = "807b5106c3410e58f4f523b55ea3c071e2a09e31e9510f3c22021c6a04732b5b" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.13.2", + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "bevy_ecs_macros" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272b511958525306cd141726d3ca59740f79fc0707c439b55a007bcc3497308" +dependencies = [ + "bevy_macro_utils 0.14.0", "proc-macro2", "quote", "syn 2.0.50", @@ -529,26 +819,35 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887087a5e522d9f20733a84dd7e6e9ca04cd8fdfac659220ed87d675eebc83a7" +dependencies = [ + "bevy_macro_utils 0.13.2", + "encase_derive_impl 0.7.0", +] + +[[package]] +name = "bevy_encase_derive" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3d301922e76b16819e17c8cc43b34e92c13ccd06ad19dfa3e52a91a0e13e5c" +checksum = "f0452d8254c8bfae4bff6caca2a8be3b0c1b2e1a72b93e9b9f6a21c8dff807e0" dependencies = [ - "bevy_macro_utils", - "encase_derive_impl", + "bevy_macro_utils 0.14.0", + "encase_derive_impl 0.8.0", ] [[package]] name = "bevy_gilrs" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96364a1875ee4545fcf825c78dc065ddb9a3b2a509083ef11142f9de0eb8aa17" +checksum = "fbad8e59470c3d5cf25aa8c48462c4cf6f0c6314538c68ab2f5cf393146f0fc2" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_log", - "bevy_time", - "bevy_utils", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_input 0.14.0", + "bevy_time 0.14.0", + "bevy_utils 0.14.0", "gilrs", "thiserror", ] @@ -559,20 +858,42 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdca80b7b4db340eb666d69374a0195b3935759120d0b990fcef8b27d0fb3680" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_gizmos_macros", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", + "bevy_app 0.13.2", + "bevy_asset 0.13.2", + "bevy_core 0.13.2", + "bevy_core_pipeline 0.13.0", + "bevy_ecs 0.13.2", + "bevy_gizmos_macros 0.13.0", + "bevy_log 0.13.2", + "bevy_math 0.13.2", + "bevy_pbr 0.13.0", + "bevy_reflect 0.13.2", + "bevy_render 0.13.2", + "bevy_transform 0.13.2", + "bevy_utils 0.13.2", +] + +[[package]] +name = "bevy_gizmos" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbb0556f0c6e45f4a17aef9c708c06ebf15ae1bed4533d7eddb493409f9f025" +dependencies = [ + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_color", + "bevy_core_pipeline 0.14.0", + "bevy_ecs 0.14.0", + "bevy_gizmos_macros 0.14.0", + "bevy_math 0.14.0", + "bevy_pbr 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", "bevy_sprite", - "bevy_transform", - "bevy_utils", + "bevy_time 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "bytemuck", ] [[package]] @@ -581,7 +902,19 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a949eb8b4538a6e4d875321cda2b63dc0fb0317cf18c8245ca5a32f24f6d26d" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.13.2", + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "bevy_gizmos_macros" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ef351a4b6498c197d1317c62f46ba84b69fbde3dbeb57beb2e744bbe5b7c3e0" +dependencies = [ + "bevy_macro_utils 0.14.0", "proc-macro2", "quote", "syn 2.0.50", @@ -589,59 +922,89 @@ dependencies = [ [[package]] name = "bevy_gltf" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031d0c2a7c0353bb9ac08a5130e58b9a2de3cdaa3c31b5da00b22a9e4732a155" +checksum = "cfd7abeaf3f28afd1f8999c2169aa17b40a37ad11253cf7dd05017024b65adc6" dependencies = [ - "base64", + "base64 0.22.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", + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_color", + "bevy_core 0.14.0", + "bevy_core_pipeline 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_math 0.14.0", + "bevy_pbr 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", + "bevy_scene 0.14.0", + "bevy_tasks 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", "gltf", "percent-encoding", "serde", "serde_json", + "smallvec", "thiserror", ] [[package]] name = "bevy_hierarchy" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f9f843e43d921f07658c24eae74285efc7a335c87998596f3f365155320c69" +checksum = "bbb3dfad24866a6713dafa3065a91c5cf5e355f6e1b191c25d704ae54185246c" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.13.2", + "bevy_core 0.13.2", + "bevy_ecs 0.13.2", + "bevy_log 0.13.2", + "bevy_reflect 0.13.2", + "bevy_utils 0.13.2", +] + +[[package]] +name = "bevy_hierarchy" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "802eca6f341d19ade790ccfaba7044be4d823b708087eb5ac4c1f74e4ea0916a" +dependencies = [ + "bevy_app 0.14.0", + "bevy_core 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_utils 0.14.0", + "smallvec", ] [[package]] name = "bevy_input" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9cb5b2f3747ffb00cf7e3d6b52f7384476921cd31f0cfd3d1ddff31f83d9252" +checksum = "47f2b2b3df168c6ef661d25e09abf5bd4fecaacd400f27e5db650df1c3fa3a3b" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.13.2", + "bevy_ecs 0.13.2", + "bevy_math 0.13.2", + "bevy_reflect 0.13.2", + "bevy_utils 0.13.2", + "smol_str", + "thiserror", +] + +[[package]] +name = "bevy_input" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d050f1433f48ca23f1ea078734ebff119a3f76eb7d221725ab0f1fd9f81230b" +dependencies = [ + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_utils 0.14.0", "smol_str", "thiserror", ] @@ -652,60 +1015,108 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7af89c7083830b1d65fcf0260c3d2537c397fe8ce871471b6e97198a4704f23e" dependencies = [ - "bevy_a11y", + "bevy_a11y 0.13.2", + "bevy_app 0.13.2", + "bevy_asset 0.13.2", + "bevy_core 0.13.2", + "bevy_core_pipeline 0.13.0", + "bevy_derive 0.13.2", + "bevy_diagnostic 0.13.0", + "bevy_ecs 0.13.2", + "bevy_gizmos 0.13.0", + "bevy_hierarchy 0.13.2", + "bevy_input 0.13.2", + "bevy_log 0.13.2", + "bevy_math 0.13.2", + "bevy_pbr 0.13.0", + "bevy_ptr 0.13.2", + "bevy_reflect 0.13.2", + "bevy_render 0.13.2", + "bevy_scene 0.13.0", + "bevy_tasks 0.13.2", + "bevy_time 0.13.2", + "bevy_transform 0.13.2", + "bevy_utils 0.13.2", + "bevy_window 0.13.2", +] + +[[package]] +name = "bevy_internal" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ddd2b23e44d3a1f8ae547cbee5b6661f8135cc456c5de206e8648789944e7a1" +dependencies = [ + "bevy_a11y 0.14.0", "bevy_animation", - "bevy_app", - "bevy_asset", + "bevy_app 0.14.0", + "bevy_asset 0.14.0", "bevy_audio", - "bevy_core", - "bevy_core_pipeline", - "bevy_derive", - "bevy_diagnostic", - "bevy_ecs", + "bevy_color", + "bevy_core 0.14.0", + "bevy_core_pipeline 0.14.0", + "bevy_derive 0.14.0", + "bevy_diagnostic 0.14.0", + "bevy_ecs 0.14.0", "bevy_gilrs", - "bevy_gizmos", + "bevy_gizmos 0.14.0", "bevy_gltf", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_ptr", - "bevy_reflect", - "bevy_render", - "bevy_scene", + "bevy_hierarchy 0.14.0", + "bevy_input 0.14.0", + "bevy_log 0.14.0", + "bevy_math 0.14.0", + "bevy_pbr 0.14.0", + "bevy_ptr 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", + "bevy_scene 0.14.0", "bevy_sprite", - "bevy_tasks", + "bevy_state", + "bevy_tasks 0.14.0", "bevy_text", - "bevy_time", - "bevy_transform", + "bevy_time 0.14.0", + "bevy_transform 0.14.0", "bevy_ui", - "bevy_utils", - "bevy_window", - "bevy_winit", + "bevy_utils 0.14.0", + "bevy_window 0.14.0", + "bevy_winit 0.14.0", ] [[package]] name = "bevy_log" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd5bcc3531f8008897fb03cc8751b86d0d29ef94f8fd38b422f9603b7ae80d0" +checksum = "a5eea6c527fd828b7fef8d0f518167f27f405b904a16f227b644687d3f46a809" dependencies = [ "android_log-sys", - "bevy_app", - "bevy_ecs", - "bevy_utils", + "bevy_app 0.13.2", + "bevy_ecs 0.13.2", + "bevy_utils 0.13.2", "console_error_panic_hook", "tracing-log 0.1.4", "tracing-subscriber", "tracing-wasm", ] +[[package]] +name = "bevy_log" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab641fd0de254915ab746165a07677465b2d89b72f5b49367d73b9197548a35" +dependencies = [ + "android_log-sys", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_utils 0.14.0", + "tracing-log 0.2.0", + "tracing-subscriber", + "tracing-wasm", +] + [[package]] name = "bevy_macro_utils" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac4401c25b197e7c1455a4875a90b61bba047a9e8d290ce029082c818ab1a21c" +checksum = "eb270c98a96243b29465139ed10bda2f675d00a11904f6588a5f7fc4774119c7" dependencies = [ "proc-macro2", "quote", @@ -714,30 +1125,64 @@ dependencies = [ "toml_edit 0.21.1", ] +[[package]] +name = "bevy_macro_utils" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ad860d35d74b35d4d6ae7f656d163b6f475aa2e64fc293ee86ac901977ddb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.50", + "toml_edit 0.22.12", +] + [[package]] name = "bevy_math" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f312b1b8aa6d3965b65040b08e33efac030db3071f20b44f9da9c4c3dfcaf76" +checksum = "f06daa26ffb82d90ba772256c0ba286f6c305c392f6976c9822717974805837c" dependencies = [ - "glam", + "glam 0.25.0", "serde", ] +[[package]] +name = "bevy_math" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bd6ce2174d3237d30e0ab5b2508480cc7593ca4d96ffb3a3095f9fc6bbc34c" +dependencies = [ + "bevy_reflect 0.14.0", + "glam 0.27.0", + "rand", + "smallvec", + "thiserror", +] + [[package]] name = "bevy_mikktspace" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3075c01f2b1799945892d5310fc1836e47c045dfe6af5878a304a475931a0c5f" +checksum = "a0d7ef7f2a826d0b19f059035831ce00a5e930435cc53c61e045773d0483f67a" dependencies = [ - "glam", + "glam 0.25.0", +] + +[[package]] +name = "bevy_mikktspace" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ce4266293629a2d10459cc112dffe3b3e9229a4f2b8a4d20061b8dd53316d0" +dependencies = [ + "glam 0.27.0", ] [[package]] name = "bevy_openxr_android" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.14.0", "bevy_oxr", "openxr", ] @@ -747,18 +1192,18 @@ name = "bevy_oxr" version = "0.2.0" dependencies = [ "ash", - "bevy", + "bevy 0.14.0", "color-eyre", - "d3d12", + "d3d12 0.20.0", "eyre", "futures-lite", "jni 0.20.0", "mint", "ndk-context", "openxr", - "wgpu", - "wgpu-core", - "wgpu-hal", + "wgpu 0.20.1", + "wgpu-core 0.21.0", + "wgpu-hal 0.21.0", "winapi", ] @@ -768,30 +1213,63 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c31c72bf12e50ff76c9ed9a7c51ceb88bfea9865d00f24d95b12344fffe1e270" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bevy_window", - "bitflags 2.4.2", + "bevy_app 0.13.2", + "bevy_asset 0.13.2", + "bevy_core_pipeline 0.13.0", + "bevy_derive 0.13.2", + "bevy_ecs 0.13.2", + "bevy_math 0.13.2", + "bevy_reflect 0.13.2", + "bevy_render 0.13.2", + "bevy_transform 0.13.2", + "bevy_utils 0.13.2", + "bevy_window 0.13.2", + "bitflags 2.5.0", "bytemuck", - "fixedbitset", + "fixedbitset 0.4.2", "radsort", "smallvec", "thread_local", ] +[[package]] +name = "bevy_pbr" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3effe8ff28899f14d250d0649ca9868dbe68b389d0f2b7af086759b8e16c6e3d" +dependencies = [ + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_color", + "bevy_core_pipeline 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "bevy_window 0.14.0", + "bitflags 2.5.0", + "bytemuck", + "fixedbitset 0.5.7", + "nonmax", + "radsort", + "smallvec", + "static_assertions", +] + [[package]] name = "bevy_ptr" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86afa4a88ee06b10fe1e6f28a796ba2eedd16804717cbbb911df0cbb0cd6677b" +checksum = "8050e2869fe341db6874203b5a01ff12673807a2c7c80cb829f6c7bea6997268" + +[[package]] +name = "bevy_ptr" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c115c97a5c8a263bd0aa7001b999772c744ac5ba797d07c86f25734ce381ea69" [[package]] name = "bevy_rapier3d" @@ -799,8 +1277,8 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ac2b344d110e8aff2dab7ca6ed428dfcbbfeeb8f20827825996538f24e7fcdf" dependencies = [ - "bevy", - "bitflags 2.4.2", + "bevy 0.13.0", + "bitflags 2.5.0", "log", "nalgebra", "rapier3d", @@ -808,29 +1286,62 @@ dependencies = [ [[package]] name = "bevy_reflect" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccbd7de21d586457a340a0962ad0747dc5098ff925eb6b27a918c4bdd8252f7b" +dependencies = [ + "bevy_math 0.13.2", + "bevy_ptr 0.13.2", + "bevy_reflect_derive 0.13.2", + "bevy_utils 0.13.2", + "downcast-rs", + "erased-serde", + "glam 0.25.0", + "serde", + "smol_str", + "thiserror", +] + +[[package]] +name = "bevy_reflect" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133dfab8d403d0575eeed9084e85780bbb449dcf75dd687448439117789b40a2" +checksum = "406ea0fce267169c2320c7302d97d09f605105686346762562c5f65960b5ca2f" dependencies = [ - "bevy_math", - "bevy_ptr", - "bevy_reflect_derive", - "bevy_utils", + "bevy_ptr 0.14.0", + "bevy_reflect_derive 0.14.0", + "bevy_utils 0.14.0", "downcast-rs", "erased-serde", - "glam", + "glam 0.27.0", + "petgraph", "serde", + "smallvec", "smol_str", "thiserror", + "uuid", ] [[package]] name = "bevy_reflect_derive" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ce33051bd49036d4a5a62aa3f2068672ec55f3ebe92aa0d003a341f15cc37ac" +dependencies = [ + "bevy_macro_utils 0.13.2", + "proc-macro2", + "quote", + "syn 2.0.50", + "uuid", +] + +[[package]] +name = "bevy_reflect_derive" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce1679a4dfdb2c9ff24ca590914c3cec119d7c9e1b56fa637776913acc030386" +checksum = "0427fdb4425fc72cc96d45e550df83ace6347f0503840de116c76a40843ba751" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.14.0", "proc-macro2", "quote", "syn 2.0.50", @@ -839,56 +1350,114 @@ dependencies = [ [[package]] name = "bevy_render" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b2c4b644c739c0b474b6f8f7b0bc68ac13d83b59688781e9a7753c52780177" +dependencies = [ + "async-channel", + "bevy_app 0.13.2", + "bevy_asset 0.13.2", + "bevy_core 0.13.2", + "bevy_derive 0.13.2", + "bevy_ecs 0.13.2", + "bevy_encase_derive 0.13.2", + "bevy_hierarchy 0.13.2", + "bevy_log 0.13.2", + "bevy_math 0.13.2", + "bevy_mikktspace 0.13.2", + "bevy_reflect 0.13.2", + "bevy_render_macros 0.13.2", + "bevy_tasks 0.13.2", + "bevy_time 0.13.2", + "bevy_transform 0.13.2", + "bevy_utils 0.13.2", + "bevy_window 0.13.2", + "bitflags 2.5.0", + "bytemuck", + "codespan-reporting", + "downcast-rs", + "encase 0.7.0", + "futures-lite", + "hexasphere 10.0.0", + "image 0.24.8", + "js-sys", + "naga 0.19.0", + "naga_oil 0.13.0", + "serde", + "thiserror", + "thread_local", + "wasm-bindgen", + "web-sys", + "wgpu 0.19.4", +] + +[[package]] +name = "bevy_render" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b194b7029b7541ef9206ac3cb696d3cb37f70bd3260d293fc00d378547e892" +checksum = "4c48acf1ff4267c231def4cbf573248d42ac60c9952108822d505019460bf36d" dependencies = [ "async-channel", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_derive", - "bevy_ecs", - "bevy_encase_derive", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_mikktspace", - "bevy_reflect", - "bevy_render_macros", - "bevy_tasks", - "bevy_time", - "bevy_transform", - "bevy_utils", - "bevy_window", - "bitflags 2.4.2", + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_color", + "bevy_core 0.14.0", + "bevy_derive 0.14.0", + "bevy_diagnostic 0.14.0", + "bevy_ecs 0.14.0", + "bevy_encase_derive 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_math 0.14.0", + "bevy_mikktspace 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render_macros 0.14.0", + "bevy_tasks 0.14.0", + "bevy_time 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "bevy_window 0.14.0", + "bitflags 2.5.0", "bytemuck", "codespan-reporting", "downcast-rs", - "encase", + "encase 0.8.0", "futures-lite", - "hexasphere", - "image", + "hexasphere 12.0.0", + "image 0.25.1", "js-sys", "ktx2", - "naga", - "naga_oil", + "naga 0.20.0", + "naga_oil 0.14.0", + "nonmax", "ruzstd", + "send_wrapper", "serde", + "smallvec", "thiserror", - "thread_local", "wasm-bindgen", "web-sys", - "wgpu", + "wgpu 0.20.1", ] [[package]] name = "bevy_render_macros" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "720b88406e786e378829b7d43c1ffb5300186912b99904d0d4d8ec6698a4f210" +dependencies = [ + "bevy_macro_utils 0.13.2", + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "bevy_render_macros" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa6d99b50375bb7f63be2c3055dfe2f926f7b3c4db108bb0b1181b4f02766aa" +checksum = "72ddf4a96d71519c8eca3d74dabcb89a9c0d50ab5d9230638cb004145f46e9ed" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.14.0", "proc-macro2", "quote", "syn 2.0.50", @@ -900,15 +1469,35 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c3c82eaff0b22949183a75a7e2d7fc4ece808235918b34c5b282aab52c3563a" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", + "bevy_app 0.13.2", + "bevy_asset 0.13.2", + "bevy_derive 0.13.2", + "bevy_ecs 0.13.2", + "bevy_hierarchy 0.13.2", + "bevy_reflect 0.13.2", + "bevy_render 0.13.2", + "bevy_transform 0.13.2", + "bevy_utils 0.13.2", + "serde", + "thiserror", + "uuid", +] + +[[package]] +name = "bevy_scene" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a9f0388612a116f02ab6187aeab66e52c9e91abbc21f919b8b50230c4d83e7" +dependencies = [ + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", "serde", "thiserror", "uuid", @@ -916,35 +1505,61 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea977d7d7c48fc4ba283d449f09528c4e70db17c9048e32e99ecd9890d72223" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bitflags 2.4.2", +checksum = "d837e33ed27b9f2e5212eca4bdd5655a9ee64c52914112e6189c043cb25dd1ec" +dependencies = [ + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_color", + "bevy_core_pipeline 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "bitflags 2.5.0", "bytemuck", - "fixedbitset", + "fixedbitset 0.5.7", "guillotiere", "radsort", "rectangle-pack", "thiserror", ] +[[package]] +name = "bevy_state" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0959984092d56885fd3b320ea84fb816821bad6bfa3040b9d4ee850d3273233d" +dependencies = [ + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_reflect 0.14.0", + "bevy_state_macros", + "bevy_utils 0.14.0", +] + +[[package]] +name = "bevy_state_macros" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887a98bfa268258377cd073f5bb839518d3a1cd6b96ed81418145485b69378e6" +dependencies = [ + "bevy_macro_utils 0.14.0", + "proc-macro2", + "quote", + "syn 2.0.50", +] + [[package]] name = "bevy_tasks" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b20f243f6fc4c4ba10c2dbff891e947ddae947bb20b263f43e023558b35294bd" +checksum = "f07fcc4969b357de143509925b39c9a2c56eaa8750828d97f319ca9ed41897cb" dependencies = [ "async-channel", "async-executor", @@ -954,23 +1569,37 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "bevy_tasks" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8bfb8d484bdb1e9bec3789c75202adc5e608c4244347152e50fb31668a54f9" +dependencies = [ + "async-channel", + "async-executor", + "concurrent-queue", + "futures-lite", + "wasm-bindgen-futures", +] + [[package]] name = "bevy_text" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006990d27551dbc339774178e833290952511621662fd5ca23a4e6e922ab2d9f" +checksum = "454fd29b7828244356b2e0ce782e6d0a6f26b47f521456accde3a7191b121727" dependencies = [ "ab_glyph", - "bevy_app", - "bevy_asset", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_color", + "bevy_ecs 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", "bevy_sprite", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "bevy_window 0.14.0", "glyph_brush_layout", "serde", "thiserror", @@ -978,68 +1607,98 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ea5ae9fe7f56f555dbb05a88d34931907873e3f0c7dc426591839eef72fe3e" +dependencies = [ + "bevy_app 0.13.2", + "bevy_ecs 0.13.2", + "bevy_reflect 0.13.2", + "bevy_utils 0.13.2", + "crossbeam-channel", + "thiserror", +] + +[[package]] +name = "bevy_time" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9738901b6b251d2c9250542af7002d6f671401fc3b74504682697c5ec822f210" +checksum = "a6c3d3d14ee8b0dbe4819fd516cc75509b61946134d78e0ee89ad3d1835ffe6c" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_utils 0.14.0", "crossbeam-channel", "thiserror", ] [[package]] name = "bevy_transform" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0d51a1f332cc00939d2f19ed6b909e5ed7037e39c7e25cc86930d79d432163e" +dependencies = [ + "bevy_app 0.13.2", + "bevy_ecs 0.13.2", + "bevy_hierarchy 0.13.2", + "bevy_math 0.13.2", + "bevy_reflect 0.13.2", + "thiserror", +] + +[[package]] +name = "bevy_transform" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba73744a95bc4b8683e91cea3e79b1ad0844c1d677f31fbbc1814c79a5b4f8f0" +checksum = "97e8aa6b16be573277c6ceda30aebf1d78af7c6ede19b448dcb052fb8601d815" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", "thiserror", ] [[package]] name = "bevy_ui" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafe872906bac6d7fc8ecff166f56b4253465b2895ed88801499aa113548ccc6" -dependencies = [ - "bevy_a11y", - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", +checksum = "38d9f864c646f3742ff77f67bcd89a13a7ab024b68ca2f1bfbab8245bcb1c06c" +dependencies = [ + "bevy_a11y 0.14.0", + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_color", + "bevy_core_pipeline 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_input 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_render 0.14.0", "bevy_sprite", "bevy_text", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "bevy_window 0.14.0", "bytemuck", + "nonmax", + "smallvec", "taffy", "thiserror", ] [[package]] name = "bevy_utils" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a06aca1c1863606416b892f4c79e300dbc6211b6690953269051a431c2cca0" +checksum = "5a9f845a985c00e0ee8dc2d8af3f417be925fb52aad4bda5b96e2e58a2b4d2eb" dependencies = [ "ahash", - "bevy_utils_proc_macros", + "bevy_utils_proc_macros 0.13.2", "getrandom", "hashbrown", "nonmax", @@ -1048,14 +1707,40 @@ dependencies = [ "thiserror", "tracing", "uuid", - "web-time", + "web-time 0.2.4", +] + +[[package]] +name = "bevy_utils" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fab364910e8f5839578aba9cfda00a8388e9ebe352ceb8491a742ce6af9ec6e" +dependencies = [ + "ahash", + "bevy_utils_proc_macros 0.14.0", + "getrandom", + "hashbrown", + "thread_local", + "tracing", + "web-time 1.1.0", ] [[package]] name = "bevy_utils_proc_macros" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef158627f30503d5c18c20c60b444829f698d343516eeaf6eeee078c9a45163" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "bevy_utils_proc_macros" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ae98e9c0c08b0f5c90e22cd713201f759b98d4fd570b99867a695f8641859a" +checksum = "ad9db261ab33a046e1f54b35f885a44f21fcc80aa2bc9050319466b88fe58fe3" dependencies = [ "proc-macro2", "quote", @@ -1064,44 +1749,88 @@ dependencies = [ [[package]] name = "bevy_window" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976202d2ed838176595b550ac654b15ae236e0178a6f19a94ca6d58f2a96ca60" +dependencies = [ + "bevy_a11y 0.13.2", + "bevy_app 0.13.2", + "bevy_ecs 0.13.2", + "bevy_input 0.13.2", + "bevy_math 0.13.2", + "bevy_reflect 0.13.2", + "bevy_utils 0.13.2", + "raw-window-handle", + "smol_str", +] + +[[package]] +name = "bevy_window" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb627efd7622a61398ac0d3674f93c997cffe16f13c59fb8ae8a05c9e28de961" +checksum = "c9ea5777f933bf7ecaeb3af1a30845720ec730e007972ca7d4aba2d3512abe24" dependencies = [ - "bevy_a11y", - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_math", - "bevy_reflect", - "bevy_utils", - "raw-window-handle 0.6.0", + "bevy_a11y 0.14.0", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_utils 0.14.0", + "raw-window-handle", "smol_str", ] [[package]] name = "bevy_winit" -version = "0.13.0" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa66539aa93d8522b146bf82de429714ea6370a6061fc1f1ff7bcacd4e64c6c4" +dependencies = [ + "accesskit_winit 0.17.0", + "approx", + "bevy_a11y 0.13.2", + "bevy_app 0.13.2", + "bevy_derive 0.13.2", + "bevy_ecs 0.13.2", + "bevy_hierarchy 0.13.2", + "bevy_input 0.13.2", + "bevy_math 0.13.2", + "bevy_tasks 0.13.2", + "bevy_utils 0.13.2", + "bevy_window 0.13.2", + "crossbeam-channel", + "raw-window-handle", + "wasm-bindgen", + "web-sys", + "winit 0.29.10", +] + +[[package]] +name = "bevy_winit" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55105324a201941ae587790f83f6d9caa327e0baa0205558ec41e5ee05a1f703" +checksum = "f8c2213bbf14debe819ec8ad4913f233c596002d087bc6f1f20d533e2ebaf8c6" dependencies = [ - "accesskit_winit", + "accesskit_winit 0.20.4", "approx", - "bevy_a11y", - "bevy_app", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_math", - "bevy_tasks", - "bevy_utils", - "bevy_window", + "bevy_a11y 0.14.0", + "bevy_app 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_input 0.14.0", + "bevy_log 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", + "bevy_window 0.14.0", + "cfg-if", "crossbeam-channel", - "raw-window-handle 0.6.0", + "raw-window-handle", "wasm-bindgen", "web-sys", - "winit", + "winit 0.30.3", ] [[package]] @@ -1110,7 +1839,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cexpr", "clang-sys", "itertools", @@ -1147,9 +1876,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -1188,7 +1917,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" dependencies = [ - "objc-sys 0.3.2", + "objc-sys 0.3.5", ] [[package]] @@ -1211,6 +1940,15 @@ dependencies = [ "objc2 0.4.1", ] +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + [[package]] name = "blocking" version = "1.5.1" @@ -1271,7 +2009,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "log", "polling", "rustix", @@ -1315,6 +2053,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "clang-sys" version = "1.7.0" @@ -1464,9 +2208,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "constgebra" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420" +checksum = "e1aaf9b65849a68662ac6c0810c8893a765c960b907dd7cfab9c4a50bf764fbc" dependencies = [ "const_soft_float", ] @@ -1533,27 +2277,25 @@ dependencies = [ [[package]] name = "cpal" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", "core-foundation-sys", "coreaudio-rs", "dasp_sample", - "jni 0.19.0", + "jni 0.21.1", "js-sys", "libc", "mach2", - "ndk 0.7.0", + "ndk 0.8.0", "ndk-context", "oboe", - "once_cell", - "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.46.0", + "windows 0.54.0", ] [[package]] @@ -1633,7 +2375,18 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", + "libloading 0.8.1", + "winapi", +] + +[[package]] +name = "d3d12" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" +dependencies = [ + "bitflags 2.5.0", "libloading 0.8.1", "winapi", ] @@ -1654,23 +2407,12 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" name = "demo" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.14.0", "bevy_oxr", "bevy_rapier3d", "color-eyre", ] -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "dispatch" version = "0.2.0" @@ -1686,12 +2428,27 @@ dependencies = [ "libloading 0.8.1", ] +[[package]] +name = "document-features" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + [[package]] name = "either" version = "1.10.0" @@ -1705,8 +2462,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103" dependencies = [ "const_panic", - "encase_derive", - "glam", + "encase_derive 0.7.0", + "glam 0.25.0", + "thiserror", +] + +[[package]] +name = "encase" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9299a95fa5671ddf29ecc22b00e121843a65cb9ff24911e394b4ae556baf36" +dependencies = [ + "const_panic", + "encase_derive 0.8.0", + "glam 0.27.0", "thiserror", ] @@ -1716,7 +2485,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a" dependencies = [ - "encase_derive_impl", + "encase_derive_impl 0.7.0", +] + +[[package]] +name = "encase_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e09decb3beb1fe2db6940f598957b2e1f7df6206a804d438ff6cb2a9cddc10" +dependencies = [ + "encase_derive_impl 0.8.0", ] [[package]] @@ -1730,6 +2508,17 @@ dependencies = [ "syn 2.0.50", ] +[[package]] +name = "encase_derive_impl" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.50", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1843,6 +2632,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +[[package]] +name = "fixedbitset" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + [[package]] name = "flate2" version = "1.0.28" @@ -1960,7 +2755,7 @@ dependencies = [ "libc", "libudev-sys", "log", - "nix 0.27.1", + "nix", "uuid", "vec_map", "wasm-bindgen", @@ -1995,6 +2790,17 @@ dependencies = [ "serde", ] +[[package]] +name = "glam" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9" +dependencies = [ + "bytemuck", + "rand", + "serde", +] + [[package]] name = "glob" version = "0.3.1" @@ -2075,7 +2881,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "gpu-alloc-types", ] @@ -2085,7 +2891,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] @@ -2105,27 +2911,47 @@ dependencies = [ name = "gpu-descriptor" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.5.0", + "gpu-descriptor-types 0.1.2", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.5.0", + "gpu-descriptor-types 0.2.0", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.4.2", - "gpu-descriptor-types", - "hashbrown", + "bitflags 2.5.0", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] name = "grid" -version = "0.10.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c" +checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82" [[package]] name = "guillotiere" @@ -2154,7 +2980,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "com", "libc", "libloading 0.8.1", @@ -2170,7 +2996,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f33ddb7f7143d9e703c072e88b98cd8b9719f174137a671429351bd2ee43c02a" dependencies = [ "constgebra", - "glam", + "glam 0.25.0", +] + +[[package]] +name = "hexasphere" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd6b038160f086b0a7496edae34169ae22f328793cbe2b627a5a3d8373748ec" +dependencies = [ + "constgebra", + "glam 0.27.0", ] [[package]] @@ -2200,9 +3036,29 @@ dependencies = [ "byteorder", "color_quant", "num-traits", +] + +[[package]] +name = "image" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +dependencies = [ + "bytemuck", + "byteorder", + "num-traits", "png", ] +[[package]] +name = "immutable-chunkmap" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4419f022e55cc63d5bbd6b44b71e1d226b9c9480a47824c706e9d54e5c40c5eb" +dependencies = [ + "arrayvec", +] + [[package]] name = "indenter" version = "0.3.3" @@ -2270,20 +3126,6 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - [[package]] name = "jni" version = "0.20.0" @@ -2322,9 +3164,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2416,7 +3258,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -2437,6 +3279,12 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.11" @@ -2502,7 +3350,22 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + +[[package]] +name = "metal" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" +dependencies = [ + "bitflags 2.5.0", "block", "core-graphics-types", "foreign-types", @@ -2540,7 +3403,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" dependencies = [ "bit-set", - "bitflags 2.4.2", + "bitflags 2.5.0", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "pp-rs", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "naga" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.5.0", "codespan-reporting", "hexf-parse", "indexmap", @@ -2564,7 +3449,27 @@ dependencies = [ "codespan-reporting", "data-encoding", "indexmap", - "naga", + "naga 0.19.0", + "once_cell", + "regex", + "regex-syntax 0.8.2", + "rustc-hash", + "thiserror", + "tracing", + "unicode-ident", +] + +[[package]] +name = "naga_oil" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "275d9720a7338eedac966141089232514c84d76a246a58ef501af88c5edf402f" +dependencies = [ + "bit-set", + "codespan-reporting", + "data-encoding", + "indexmap", + "naga 0.20.0", "once_cell", "regex", "regex-syntax 0.8.2", @@ -2581,7 +3486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4541eb06dce09c0241ebbaab7102f0a01a0c8994afed2e5d0d66775016e25ac2" dependencies = [ "approx", - "glam", + "glam 0.25.0", "matrixmultiply", "nalgebra-macros", "num-complex", @@ -2604,30 +3509,31 @@ dependencies = [ [[package]] name = "ndk" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", - "num_enum 0.5.11", - "raw-window-handle 0.5.2", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", + "raw-window-handle", "thiserror", ] [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "jni-sys", "log", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", - "raw-window-handle 0.6.0", + "ndk-sys 0.6.0+11769913", + "num_enum", + "raw-window-handle", "thiserror", ] @@ -2637,15 +3543,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.5.0+25.2.9519653" @@ -2656,14 +3553,12 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.24.3" +name = "ndk-sys" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", + "jni-sys", ] [[package]] @@ -2672,7 +3567,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "libc", ] @@ -2721,17 +3616,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-derive" version = "0.4.2" @@ -2773,34 +3657,13 @@ dependencies = [ "libm", ] -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - [[package]] name = "num_enum" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.2", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] @@ -2809,7 +3672,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.50", @@ -2833,45 +3696,242 @@ checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" [[package]] name = "objc-sys" -version = "0.3.2" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2 0.2.0-alpha.6", + "objc-sys 0.2.0-beta.2", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys 0.3.5", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys 0.3.5", + "objc2-encode 4.0.3", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-contacts", + "objc2-foundation", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "dispatch", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2 0.5.1", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", + "objc2-metal", +] [[package]] -name = "objc2" -version = "0.3.0-beta.3.patch-leaks.3" +name = "objc2-symbols" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" dependencies = [ - "block2 0.2.0-alpha.6", - "objc-sys 0.2.0-beta.2", - "objc2-encode 2.0.0-pre.2", + "objc2 0.5.2", + "objc2-foundation", ] [[package]] -name = "objc2" -version = "0.4.1" +name = "objc2-ui-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" dependencies = [ - "objc-sys 0.3.2", - "objc2-encode 3.0.0", + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", ] [[package]] -name = "objc2-encode" -version = "2.0.0-pre.2" +name = "objc2-uniform-type-identifiers" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" dependencies = [ - "objc-sys 0.2.0-beta.2", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-foundation", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-user-notifications" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2 0.5.2", + "objc2-core-location", + "objc2-foundation", +] [[package]] name = "objc_exception" @@ -2893,23 +3953,23 @@ dependencies = [ [[package]] name = "oboe" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ - "jni 0.20.0", - "ndk 0.7.0", + "jni 0.21.1", + "ndk 0.8.0", "ndk-context", - "num-derive 0.3.3", + "num-derive", "num-traits", "oboe-sys", ] [[package]] name = "oboe-sys" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" dependencies = [ "cc", ] @@ -3023,7 +4083,7 @@ dependencies = [ "downcast-rs", "either", "nalgebra", - "num-derive 0.4.2", + "num-derive", "num-traits", "rustc-hash", "simba", @@ -3050,8 +4110,30 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ - "fixedbitset", + "fixedbitset 0.4.2", "indexmap", + "serde", + "serde_derive", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.50", ] [[package]] @@ -3119,16 +4201,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -3168,6 +4240,21 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b" +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + [[package]] name = "range-alloc" version = "0.1.3" @@ -3187,19 +4274,13 @@ dependencies = [ "crossbeam", "downcast-rs", "nalgebra", - "num-derive 0.4.2", + "num-derive", "num-traits", "parry3d", "rustc-hash", "simba", ] -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - [[package]] name = "raw-window-handle" version = "0.6.0" @@ -3282,9 +4363,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "robust" @@ -3294,12 +4375,13 @@ checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" [[package]] name = "rodio" -version = "0.17.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +checksum = "d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3" dependencies = [ "cpal", "lewton", + "thiserror", ] [[package]] @@ -3308,8 +4390,8 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64", - "bitflags 2.4.2", + "base64 0.21.7", + "bitflags 2.5.0", "serde", "serde_derive", ] @@ -3332,7 +4414,7 @@ version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -3341,12 +4423,11 @@ dependencies = [ [[package]] name = "ruzstd" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" +checksum = "5022b253619b1ba797f243056276bed8ed1a73b0f5a7ce7225d524067644bf8f" dependencies = [ "byteorder", - "derive_more", "twox-hash", ] @@ -3380,6 +4461,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + [[package]] name = "serde" version = "1.0.197" @@ -3499,7 +4586,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] @@ -3552,13 +4639,14 @@ dependencies = [ [[package]] name = "taffy" -version = "0.3.18" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2287b6d7f721ada4cddf61ade5e760b2c6207df041cac9bfaa192897362fd3" +checksum = "e8b61630cba2afd2c851821add2e1bb1b7851a2436e839ab73b56558b009035e" dependencies = [ "arrayvec", "grid", "num-traits", + "serde", "slotmap", ] @@ -3573,18 +4661,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", @@ -3624,24 +4712,24 @@ checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.6.13", ] [[package]] @@ -3829,9 +4917,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3839,9 +4927,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -3854,9 +4942,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3866,9 +4954,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3876,9 +4964,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -3889,15 +4977,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3913,29 +5001,65 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "wgpu" -version = "0.19.1" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" +dependencies = [ + "arrayvec", + "cfg-if", + "cfg_aliases 0.1.1", + "js-sys", + "log", + "naga 0.19.0", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.19.0", + "wgpu-hal 0.19.1", + "wgpu-types 0.19.0", +] + +[[package]] +name = "wgpu" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" +checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c" dependencies = [ "arrayvec", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", - "naga", + "naga 0.20.0", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.21.0", + "wgpu-hal 0.21.0", + "wgpu-types 0.20.0", ] [[package]] @@ -3946,22 +5070,49 @@ checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.4.2", - "cfg_aliases", + "bitflags 2.5.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "indexmap", + "log", + "naga 0.19.0", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal 0.19.1", + "wgpu-types 0.19.0", +] + +[[package]] +name = "wgpu-core" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59e0d5fc509601c69e4e1fa06c1eb3c4c9f12956a5e30c79b61ef1c1be7daf0" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.5.0", + "cfg_aliases 0.1.1", "codespan-reporting", + "document-features", "indexmap", "log", - "naga", + "naga 0.20.0", "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.21.0", + "wgpu-types 0.20.0", ] [[package]] @@ -3974,37 +5125,82 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.4.2", + "bitflags 2.5.0", + "block", + "cfg_aliases 0.1.1", + "core-graphics-types", + "d3d12 0.19.0", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor 0.2.4", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal 0.27.0", + "naga 0.19.0", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.19.0", + "winapi", +] + +[[package]] +name = "wgpu-hal" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa24c3889f885a3fb9133b454c8418bfcfaadcfe4ed3be96ac80e76703b863b" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.5.0", "block", - "cfg_aliases", + "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12", + "d3d12 0.20.0", "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", - "gpu-descriptor", + "gpu-descriptor 0.3.0", "hassle-rs", "js-sys", "khronos-egl", "libc", "libloading 0.8.1", "log", - "metal", - "naga", + "metal 0.28.0", + "naga 0.20.0", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.6.0", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.20.0", "winapi", ] @@ -4014,7 +5210,18 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "wgpu-types" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" +dependencies = [ + "bitflags 2.5.0", "js-sys", "web-sys", ] @@ -4068,31 +5275,34 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.46.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.42.2", + "windows-implement 0.48.0", + "windows-interface 0.48.0", + "windows-targets 0.48.5", ] [[package]] name = "windows" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.5", + "windows-core 0.52.0", + "windows-targets 0.52.3", ] [[package]] name = "windows" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-core", + "windows-core 0.54.0", + "windows-implement 0.53.0", + "windows-interface 0.53.0", "windows-targets 0.52.3", ] @@ -4105,6 +5315,16 @@ dependencies = [ "windows-targets 0.52.3", ] +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.3", +] + [[package]] name = "windows-implement" version = "0.48.0" @@ -4116,6 +5336,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "windows-implement" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.50", +] + [[package]] name = "windows-interface" version = "0.48.0" @@ -4127,6 +5358,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "windows-interface" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "windows-result" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +dependencies = [ + "windows-targets 0.52.3", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -4331,12 +5582,11 @@ version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf" dependencies = [ - "android-activity", + "android-activity 0.5.2", "atomic-waker", - "bitflags 2.4.2", - "bytemuck", + "bitflags 2.5.0", "calloop", - "cfg_aliases", + "cfg_aliases 0.1.1", "core-foundation", "core-graphics", "cursor-icon", @@ -4349,8 +5599,7 @@ dependencies = [ "objc2 0.4.1", "once_cell", "orbclient", - "percent-encoding", - "raw-window-handle 0.6.0", + "raw-window-handle", "redox_syscall 0.3.5", "rustix", "smol_str", @@ -4358,8 +5607,50 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "web-time", + "web-time 0.2.4", "windows-sys 0.48.0", + "xkbcommon-dl", +] + +[[package]] +name = "winit" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004" +dependencies = [ + "android-activity 0.6.0", + "atomic-waker", + "bitflags 2.5.0", + "block2 0.5.1", + "bytemuck", + "calloop", + "cfg_aliases 0.2.1", + "concurrent-queue", + "core-foundation", + "core-graphics", + "cursor-icon", + "dpi", + "js-sys", + "libc", + "ndk 0.9.0", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", + "orbclient", + "percent-encoding", + "pin-project", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix", + "smol_str", + "tracing", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "web-time 1.1.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -4374,6 +5665,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + [[package]] name = "x11-dl" version = "2.21.0" @@ -4418,7 +5718,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "dlib", "log", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index 09f1c068..3b1acb4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ repository = "https://github.com/awtterpip/bevy_oxr" [workspace.dependencies] eyre = "0.6.2" -bevy = "0.13" +bevy = "0.14.0" openxr = "0.18" color-eyre = "0.6.2" @@ -36,14 +36,14 @@ bevy.workspace = true eyre.workspace = true futures-lite = "2.0.1" mint = "0.5.9" -wgpu = "0.19" -wgpu-core = { version = "0.19" } -wgpu-hal = "0.19" +wgpu = "0.20" +wgpu-core = "0.21" +wgpu-hal = "0.21" [target.'cfg(windows)'.dependencies] openxr = { workspace = true, features = [ "linked", "static", "mint" ] } winapi = { version = "0.3.9", optional = true } -d3d12 = { version = "0.19", features = ["libloading"], optional = true } +d3d12 = { version = "0.20", features = ["libloading"], optional = true } [target.'cfg(all(target_family = "unix", not(target_arch = "wasm32")) )'.dependencies] openxr = { workspace = true, features = [ "mint" ] } @@ -68,4 +68,4 @@ debug = true [package.metadata.docs.rs] rustdoc-args = ["-Zunstable-options", "--cfg", "docsrs"] all-features = true -cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"] \ No newline at end of file +cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"] diff --git a/examples/android/Cargo.toml b/examples/android/Cargo.toml index 11adab8b..1257a5df 100644 --- a/examples/android/Cargo.toml +++ b/examples/android/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["rlib", "cdylib"] [dependencies] -bevy = "0.13" +bevy.workspace = true bevy_oxr.path = "../.." openxr = { workspace = true, features = ["mint"] } diff --git a/examples/android/src/lib.rs b/examples/android/src/lib.rs index 4f90881e..9056b447 100644 --- a/examples/android/src/lib.rs +++ b/examples/android/src/lib.rs @@ -1,3 +1,4 @@ +use bevy::color::palettes; use bevy::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin}; use bevy::prelude::*; use bevy::transform::components::Transform; @@ -44,7 +45,12 @@ fn main() { fn debug_hand_render(query: Query<&GlobalTransform, With>, mut gizmos: Gizmos) { for transform in &query { - gizmos.sphere(transform.translation(), Quat::IDENTITY, 0.01, Color::RED); + gizmos.sphere( + transform.translation(), + Quat::IDENTITY, + 0.01, + palettes::css::RED, + ); } } @@ -56,21 +62,21 @@ fn setup( ) { // plane commands.spawn(PbrBundle { - mesh: meshes.add(Plane3d::new(Vec3::Y)), - material: materials.add(StandardMaterial::from(Color::rgb(0.3, 0.5, 0.3))), + mesh: meshes.add(Plane3d::new(Vec3::Y, Vec2::splat(2.5))), + material: materials.add(StandardMaterial::from(Color::srgb(0.3, 0.5, 0.3))), ..default() }); // cube commands.spawn(PbrBundle { mesh: meshes.add(Cuboid::from_size(Vec3::splat(0.1)).mesh()), - material: materials.add(StandardMaterial::from(Color::rgb(0.8, 0.7, 0.6))), + material: materials.add(StandardMaterial::from(Color::srgb(0.8, 0.7, 0.6))), transform: Transform::from_xyz(0.0, 0.5, 0.0), ..default() }); // cube commands.spawn(PbrBundle { mesh: meshes.add(Mesh::from(Cuboid::from_size(Vec3::splat(0.1)))), - material: materials.add(StandardMaterial::from(Color::rgb(0.8, 0.0, 0.0))), + material: materials.add(StandardMaterial::from(Color::srgb(0.8, 0.0, 0.0))), transform: Transform::from_xyz(0.0, 0.5, 1.0), ..default() }); diff --git a/examples/globe.rs b/examples/globe.rs index 9ee5e362..e57e3619 100644 --- a/examples/globe.rs +++ b/examples/globe.rs @@ -3,6 +3,7 @@ use bevy::prelude::*; use bevy::render::render_asset::RenderAssetUsages; use bevy::transform::components::Transform; use bevy_oxr::graphics::XrAppInfo; +use bevy_oxr::prelude::XrSystems; use bevy_oxr::resources::XrViews; use bevy_oxr::xr_input::hands::common::HandInputDebugRenderer; use bevy_oxr::xr_input::interactions::{ @@ -29,7 +30,7 @@ fn main() { }) .add_plugins(LogDiagnosticsPlugin::default()) .add_systems(Startup, setup) - .add_systems(Update, (proto_locomotion, pull_to_ground).chain()) + .add_systems(Update, (proto_locomotion, pull_to_ground).chain().xr_only()) .insert_resource(PrototypeLocomotionConfig::default()) .add_systems(Startup, spawn_controllers_example) .add_plugins(HandInputDebugRenderer) @@ -95,7 +96,7 @@ fn setup( // cube commands.spawn(PbrBundle { mesh: meshes.add(Cuboid::from_size(Vec3::splat(0.1)).mesh()), - material: materials.add(StandardMaterial::from(Color::rgb(0.8, 0.7, 0.6))), + material: materials.add(StandardMaterial::from(Color::srgb(0.8, 0.7, 0.6))), transform: Transform::from_xyz(0.0, 0.5, 0.0), ..default() }); diff --git a/examples/xr.rs b/examples/xr.rs index da056fe0..dd1ee542 100644 --- a/examples/xr.rs +++ b/examples/xr.rs @@ -92,14 +92,14 @@ fn setup( ) { // plane commands.spawn(PbrBundle { - mesh: meshes.add(Plane3d::new(Vec3::Y).mesh()), - material: materials.add(StandardMaterial::from(Color::rgb(0.3, 0.5, 0.3))), + mesh: meshes.add(Plane3d::new(Vec3::Y, Vec2::splat(2.5)).mesh()), + material: materials.add(StandardMaterial::from(Color::srgb(0.3, 0.5, 0.3))), ..default() }); // cube commands.spawn(PbrBundle { mesh: meshes.add(Cuboid::from_size(Vec3::splat(0.1)).mesh()), - material: materials.add(StandardMaterial::from(Color::rgb(0.8, 0.7, 0.6))), + material: materials.add(StandardMaterial::from(Color::srgb(0.8, 0.7, 0.6))), transform: Transform::from_xyz(0.0, 0.5, 0.0), ..default() }); diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index a24e707b..00000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,10 +0,0 @@ -[toolchain] -channel = "1.77.2" -components = ["rust-src"] -profile = "default" -targets = [ - "aarch64-apple-darwin", - "aarch64-linux-android", - "x86_64-pc-windows-msvc", - "x86_64-unknown-linux-gnu", -] diff --git a/src/graphics/d3d12.rs b/src/graphics/d3d12.rs index af7643e6..8746d391 100644 --- a/src/graphics/d3d12.rs +++ b/src/graphics/d3d12.rs @@ -4,7 +4,9 @@ use std::sync::{Arc, Mutex}; // use anyhow::Context; use bevy::math::uvec2; use bevy::prelude::*; -use bevy::render::renderer::{RenderAdapter, RenderAdapterInfo, RenderDevice, RenderQueue}; +use bevy::render::renderer::{ + RenderAdapter, RenderAdapterInfo, RenderDevice, RenderQueue, WgpuWrapper, +}; use bevy::window::RawHandleWrapper; use eyre::{Context, ContextCompat}; use openxr as xr; @@ -203,9 +205,9 @@ pub fn initialize_xr_instance( }), blend_mode.into(), wgpu_device.into(), - RenderQueue(wgpu_queue.into()), - RenderAdapterInfo(wgpu_adapter.get_info()), - RenderAdapter(wgpu_adapter.into()), + RenderQueue(Arc::new(WgpuWrapper::new(wgpu_queue))), + RenderAdapterInfo(WgpuWrapper::new(wgpu_adapter.get_info())), + RenderAdapter(Arc::new(WgpuWrapper::new(wgpu_adapter))), wgpu_instance.into(), )) } diff --git a/src/graphics/mod.rs b/src/graphics/mod.rs index c8976043..633c5631 100644 --- a/src/graphics/mod.rs +++ b/src/graphics/mod.rs @@ -5,11 +5,13 @@ mod d3d12; #[cfg(feature = "vulkan")] mod vulkan; +use std::sync::Arc; + use bevy::ecs::query::With; use bevy::ecs::system::{Query, SystemState}; use bevy::ecs::world::World; use bevy::render::renderer::{ - RenderAdapter, RenderAdapterInfo, RenderDevice, RenderInstance, RenderQueue, + RenderAdapter, RenderAdapterInfo, RenderDevice, RenderInstance, RenderQueue, WgpuWrapper, }; use bevy::window::{PrimaryWindow, RawHandleWrapper}; use wgpu::Instance; @@ -228,7 +230,7 @@ pub fn try_full_init( render_queue, render_adapter_info, render_adapter, - RenderInstance(wgpu_instance.into()), + RenderInstance(Arc::new(WgpuWrapper::new(wgpu_instance))), )) } diff --git a/src/graphics/vulkan.rs b/src/graphics/vulkan.rs index 441cc1d7..ce48db31 100644 --- a/src/graphics/vulkan.rs +++ b/src/graphics/vulkan.rs @@ -6,7 +6,9 @@ use std::sync::{Arc, Mutex}; use ash::vk::{self, Handle}; use bevy::math::uvec2; use bevy::prelude::*; -use bevy::render::renderer::{RenderAdapter, RenderAdapterInfo, RenderDevice, RenderQueue}; +use bevy::render::renderer::{ + RenderAdapter, RenderAdapterInfo, RenderDevice, RenderQueue, WgpuWrapper, +}; use bevy::window::RawHandleWrapper; use eyre::{Context, ContextCompat}; use openxr as xr; @@ -304,9 +306,9 @@ pub fn initialize_xr_instance( }), blend_mode.into(), wgpu_device.into(), - RenderQueue(wgpu_queue.into()), - RenderAdapterInfo(wgpu_adapter.get_info()), - RenderAdapter(wgpu_adapter.into()), + RenderQueue(Arc::new(WgpuWrapper::new(wgpu_queue))), + RenderAdapterInfo(WgpuWrapper::new(wgpu_adapter.get_info())), + RenderAdapter(Arc::new(WgpuWrapper::new(wgpu_adapter))), wgpu_instance.into(), )) } diff --git a/src/lib.rs b/src/lib.rs index 2b91971e..47f922f1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,6 +8,7 @@ pub mod xr_init; pub mod xr_input; use std::sync::atomic::AtomicBool; +use std::sync::Arc; use crate::xr_init::{StartXrSession, XrInitPlugin}; use crate::xr_input::oculus_touch::ActionSets; @@ -18,7 +19,7 @@ use bevy::ecs::system::SystemState; use bevy::prelude::*; use bevy::render::camera::{ManualTextureView, ManualTextureViewHandle, ManualTextureViews}; use bevy::render::pipelined_rendering::PipelinedRenderingPlugin; -use bevy::render::renderer::{render_system, RenderInstance}; +use bevy::render::renderer::{render_system, RenderInstance, WgpuWrapper}; use bevy::render::settings::RenderCreation; use bevy::render::{Render, RenderApp, RenderPlugin, RenderSet}; use bevy::window::{PresentMode, PrimaryWindow, RawHandleWrapper}; @@ -61,8 +62,8 @@ impl Plugin for OpenXrPlugin { #[cfg(not(target_arch = "wasm32"))] match graphics::initialize_xr_instance( &self.backend_preference, - SystemState::>>::new(&mut app.world) - .get(&app.world) + SystemState::>>::new(app.world_mut()) + .get(&app.world()) .get_single() .ok() .cloned(), @@ -89,7 +90,7 @@ impl Plugin for OpenXrPlugin { app.insert_resource(xr_instance); app.insert_resource(blend_mode); app.insert_non_send_resource(oxr_session_setup_info); - let render_instance = RenderInstance(instance.into()); + let render_instance = RenderInstance(Arc::new(WgpuWrapper::new(instance))); app.insert_resource(render_instance.clone()); app.add_plugins(RenderPlugin { render_creation: RenderCreation::Manual( diff --git a/src/passthrough.rs b/src/passthrough.rs index c6d67c81..22502b51 100644 --- a/src/passthrough.rs +++ b/src/passthrough.rs @@ -1,3 +1,4 @@ +use bevy::color::palettes; use bevy::render::extract_resource::ExtractResource; use bevy::{prelude::*, render::extract_resource::ExtractResourcePlugin}; use std::{marker::PhantomData, mem, ptr}; @@ -88,10 +89,7 @@ fn resume_passthrough( warn!("Unable to resume Passthrough: {}", e); return; } - clear_color.set_a(0.0); - clear_color.set_r(0.0); - clear_color.set_g(0.0); - clear_color.set_b(0.0); + **clear_color = Srgba::NONE.into(); *state = XrPassthroughState::Running; } fn pause_passthrough( @@ -103,7 +101,7 @@ fn pause_passthrough( warn!("Unable to resume Passthrough: {}", e); return; } - clear_color.set_a(1.0); + clear_color.set_alpha(1.0); *state = XrPassthroughState::Paused; } diff --git a/src/xr_input/debug_gizmos.rs b/src/xr_input/debug_gizmos.rs index cf5a90ec..562f7e94 100644 --- a/src/xr_input/debug_gizmos.rs +++ b/src/xr_input/debug_gizmos.rs @@ -1,9 +1,9 @@ +use bevy::color::palettes; use bevy::ecs::schedule::IntoSystemConfigs; use bevy::log::{debug, info}; -use bevy::math::primitives::Direction3d; +use bevy::math::Dir3; use bevy::prelude::{ - Color, Gizmos, GlobalTransform, Plugin, Quat, Query, Res, Transform, Update, Vec2, Vec3, With, - Without, + Gizmos, GlobalTransform, Plugin, Quat, Query, Res, Transform, Update, Vec2, Vec3, With, Without, }; use crate::xr_init::xr_only; @@ -74,7 +74,7 @@ pub fn draw_gizmos( // joint.position, // trans.forward(), // joint.radius, - // Color::ORANGE_RED, + // palettes::css::ORANGE_RED, // ); // } // } @@ -85,7 +85,7 @@ pub fn draw_gizmos( // joint.position, // trans.forward(), // joint.radius, - // Color::LIME_GREEN, + // palettes::css::LIME_GREEN, // ); // } // return; @@ -105,9 +105,9 @@ pub fn draw_gizmos( y: 0.01, z: 0.0, }, - Direction3d::Y, + Dir3::Y, 0.2, - Color::RED, + palettes::css::RED, ); } Err(_) => info!("too many tracking roots"), @@ -139,10 +139,10 @@ fn draw_hand_gizmo( ) { match hand { Hand::Left => { - let left_color = Color::YELLOW_GREEN; - let off_color = Color::BLUE; - let touch_color = Color::GREEN; - let pressed_color = Color::RED; + let left_color = palettes::css::YELLOW_GREEN; + let off_color = palettes::css::BLUE; + let touch_color = palettes::css::GREEN; + let pressed_color = palettes::css::RED; let grip_quat_offset = Quat::from_rotation_x(-1.4); let face_quat_offset = Quat::from_rotation_x(1.05); @@ -169,9 +169,9 @@ fn draw_hand_gizmo( //draw face gizmos.circle( face_translation_vec3, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.04, - Color::YELLOW_GREEN, + palettes::css::YELLOW_GREEN, ); //button b @@ -188,7 +188,7 @@ fn draw_hand_gizmo( face_translation_vec3 + b_offset_quat.mul_vec3(Vec3::new(0.025, -0.01, 0.0)); gizmos.circle( b_translation_vec3, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.0075, b_color, ); @@ -207,7 +207,7 @@ fn draw_hand_gizmo( face_translation_vec3 + a_offset_quat.mul_vec3(Vec3::new(0.025, 0.01, 0.0)); gizmos.circle( a_translation_vec3, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.0075, a_color, ); @@ -224,7 +224,7 @@ fn draw_hand_gizmo( //base gizmos.circle( joystick_base_vec, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.014, joystick_color, ); @@ -237,7 +237,7 @@ fn draw_hand_gizmo( //top gizmos.circle( joystick_top_vec, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.005, joystick_color, ); @@ -265,10 +265,10 @@ fn draw_hand_gizmo( } Hand::Right => { //get right controller - let right_color = Color::YELLOW_GREEN; - let off_color = Color::BLUE; - let touch_color = Color::GREEN; - let pressed_color = Color::RED; + let right_color = palettes::css::YELLOW_GREEN; + let off_color = palettes::css::BLUE; + let touch_color = palettes::css::GREEN; + let pressed_color = palettes::css::RED; let grip_quat_offset = Quat::from_rotation_x(-1.4); let face_quat_offset = Quat::from_rotation_x(1.05); @@ -298,9 +298,9 @@ fn draw_hand_gizmo( //draw face gizmos.circle( face_translation_vec3, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.04, - Color::YELLOW_GREEN, + palettes::css::YELLOW_GREEN, ); //button b @@ -317,7 +317,7 @@ fn draw_hand_gizmo( face_translation_vec3 + b_offset_quat.mul_vec3(Vec3::new(-0.025, -0.01, 0.0)); gizmos.circle( b_translation_vec3, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.0075, b_color, ); @@ -336,7 +336,7 @@ fn draw_hand_gizmo( face_translation_vec3 + a_offset_quat.mul_vec3(Vec3::new(-0.025, 0.01, 0.0)); gizmos.circle( a_translation_vec3, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.0075, a_color, ); @@ -353,7 +353,7 @@ fn draw_hand_gizmo( //base gizmos.circle( joystick_base_vec, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.014, joystick_color, ); @@ -366,7 +366,7 @@ fn draw_hand_gizmo( //top gizmos.circle( joystick_top_vec, - Direction3d::new_unchecked(face_quat_normal), + Dir3::new_unchecked(face_quat_normal), 0.005, joystick_color, ); diff --git a/src/xr_input/hands/common.rs b/src/xr_input/hands/common.rs index 7958e10a..265e61cc 100644 --- a/src/xr_input/hands/common.rs +++ b/src/xr_input/hands/common.rs @@ -1,4 +1,5 @@ use bevy::{ + color::{palettes, Srgba}, core::Name, prelude::{ default, Color, Commands, Component, Deref, DerefMut, Entity, Gizmos, Plugin, PostUpdate, @@ -225,33 +226,33 @@ pub fn draw_hand_entities( } } -pub(crate) fn get_bone_gizmo_style(hand_bone: &HandBone) -> (f32, Color) { +pub(crate) fn get_bone_gizmo_style(hand_bone: &HandBone) -> (f32, Srgba) { match hand_bone { - HandBone::Palm => (0.01, Color::WHITE), - HandBone::Wrist => (0.01, Color::GRAY), - HandBone::ThumbMetacarpal => (0.01, Color::RED), - HandBone::ThumbProximal => (0.008, Color::RED), - HandBone::ThumbDistal => (0.006, Color::RED), - HandBone::ThumbTip => (0.004, Color::RED), - HandBone::IndexMetacarpal => (0.01, Color::ORANGE), - HandBone::IndexProximal => (0.008, Color::ORANGE), - HandBone::IndexIntermediate => (0.006, Color::ORANGE), - HandBone::IndexDistal => (0.004, Color::ORANGE), - HandBone::IndexTip => (0.002, Color::ORANGE), - HandBone::MiddleMetacarpal => (0.01, Color::YELLOW), - HandBone::MiddleProximal => (0.008, Color::YELLOW), - HandBone::MiddleIntermediate => (0.006, Color::YELLOW), - HandBone::MiddleDistal => (0.004, Color::YELLOW), - HandBone::MiddleTip => (0.002, Color::YELLOW), - HandBone::RingMetacarpal => (0.01, Color::GREEN), - HandBone::RingProximal => (0.008, Color::GREEN), - HandBone::RingIntermediate => (0.006, Color::GREEN), - HandBone::RingDistal => (0.004, Color::GREEN), - HandBone::RingTip => (0.002, Color::GREEN), - HandBone::LittleMetacarpal => (0.01, Color::BLUE), - HandBone::LittleProximal => (0.008, Color::BLUE), - HandBone::LittleIntermediate => (0.006, Color::BLUE), - HandBone::LittleDistal => (0.004, Color::BLUE), - HandBone::LittleTip => (0.002, Color::BLUE), + HandBone::Palm => (0.01, palettes::css::WHITE), + HandBone::Wrist => (0.01, palettes::css::GRAY), + HandBone::ThumbMetacarpal => (0.01, palettes::css::RED), + HandBone::ThumbProximal => (0.008, palettes::css::RED), + HandBone::ThumbDistal => (0.006, palettes::css::RED), + HandBone::ThumbTip => (0.004, palettes::css::RED), + HandBone::IndexMetacarpal => (0.01, palettes::css::ORANGE), + HandBone::IndexProximal => (0.008, palettes::css::ORANGE), + HandBone::IndexIntermediate => (0.006, palettes::css::ORANGE), + HandBone::IndexDistal => (0.004, palettes::css::ORANGE), + HandBone::IndexTip => (0.002, palettes::css::ORANGE), + HandBone::MiddleMetacarpal => (0.01, palettes::css::YELLOW), + HandBone::MiddleProximal => (0.008, palettes::css::YELLOW), + HandBone::MiddleIntermediate => (0.006, palettes::css::YELLOW), + HandBone::MiddleDistal => (0.004, palettes::css::YELLOW), + HandBone::MiddleTip => (0.002, palettes::css::YELLOW), + HandBone::RingMetacarpal => (0.01, palettes::css::GREEN), + HandBone::RingProximal => (0.008, palettes::css::GREEN), + HandBone::RingIntermediate => (0.006, palettes::css::GREEN), + HandBone::RingDistal => (0.004, palettes::css::GREEN), + HandBone::RingTip => (0.002, palettes::css::GREEN), + HandBone::LittleMetacarpal => (0.01, palettes::css::BLUE), + HandBone::LittleProximal => (0.008, palettes::css::BLUE), + HandBone::LittleIntermediate => (0.006, palettes::css::BLUE), + HandBone::LittleDistal => (0.004, palettes::css::BLUE), + HandBone::LittleTip => (0.002, palettes::css::BLUE), } } diff --git a/src/xr_input/interactions.rs b/src/xr_input/interactions.rs index 789a8d10..1e265af5 100644 --- a/src/xr_input/interactions.rs +++ b/src/xr_input/interactions.rs @@ -1,5 +1,6 @@ use std::f32::consts::PI; +use bevy::color::palettes; use bevy::log::{info, warn}; use bevy::prelude::{ Color, Component, Entity, Event, EventReader, EventWriter, Gizmos, GlobalTransform, Quat, @@ -70,8 +71,8 @@ pub fn draw_socket_gizmos( let mut transform = global.compute_transform().clone(); transform.scale = Vec3::splat(0.1); let color = match state { - XRInteractorState::Idle => Color::BLUE, - XRInteractorState::Selecting => Color::PURPLE, + XRInteractorState::Idle => palettes::css::BLUE, + XRInteractorState::Selecting => palettes::css::PURPLE, }; gizmos.cuboid(transform, color) } @@ -102,9 +103,9 @@ pub fn draw_interaction_gizmos( for (global_transform, interactable_state) in interactable_query.iter() { let transform = global_transform.compute_transform(); let color = match interactable_state { - XRInteractableState::Idle => Color::RED, - XRInteractableState::Hover => Color::YELLOW, - XRInteractableState::Select => Color::GREEN, + XRInteractableState::Idle => palettes::css::RED, + XRInteractableState::Hover => palettes::css::YELLOW, + XRInteractableState::Select => palettes::css::GREEN, }; gizmos.sphere(transform.translation, transform.rotation, 0.1, color); } @@ -124,8 +125,8 @@ pub fn draw_interaction_gizmos( ); local.rotation = quat; let color = match interactor_state { - XRInteractorState::Idle => Color::BLUE, - XRInteractorState::Selecting => Color::PURPLE, + XRInteractorState::Idle => palettes::css::BLUE, + XRInteractorState::Selecting => palettes::css::PURPLE, }; gizmos.cuboid(local, color); } @@ -135,8 +136,8 @@ pub fn draw_interaction_gizmos( Some(_) => match aim { Some(aim) => { let color = match interactor_state { - XRInteractorState::Idle => Color::BLUE, - XRInteractorState::Selecting => Color::PURPLE, + XRInteractorState::Idle => palettes::css::BLUE, + XRInteractorState::Selecting => palettes::css::PURPLE, }; gizmos.ray( root.translation + root.rotation.mul_vec3(aim.0.translation), diff --git a/src/xr_input/prototype_locomotion.rs b/src/xr_input/prototype_locomotion.rs index 98e6e193..d70aacc7 100644 --- a/src/xr_input/prototype_locomotion.rs +++ b/src/xr_input/prototype_locomotion.rs @@ -1,6 +1,7 @@ use std::f32::consts::PI; use bevy::{ + color::palettes, prelude::*, time::{Time, Timer, TimerMode}, }; @@ -127,7 +128,7 @@ pub fn proto_locomotion( hmd_translation.y = 0.0; let local = position.translation; let global = position.rotation.mul_vec3(hmd_translation) + local; - gizmos.circle(global, position.up(), 0.1, Color::GREEN); + gizmos.circle(global, position.up(), 0.1, palettes::css::GREEN); position.rotate_around(global, smoth_rot); } None => return, @@ -159,7 +160,7 @@ pub fn proto_locomotion( hmd_translation.y = 0.0; let local = position.translation; let global = position.rotation.mul_vec3(hmd_translation) + local; - gizmos.circle(global, position.up(), 0.1, Color::GREEN); + gizmos.circle(global, position.up(), 0.1, palettes::css::GREEN); position.rotate_around(global, smoth_rot); } None => return, diff --git a/src/xr_input/xr_camera.rs b/src/xr_input/xr_camera.rs index 68de3812..01f96d32 100644 --- a/src/xr_input/xr_camera.rs +++ b/src/xr_input/xr_camera.rs @@ -4,7 +4,6 @@ use crate::xr_input::{QuatConv, Vec3Conv}; use crate::{locate_views, xr_wait_frame, LEFT_XR_TEXTURE_HANDLE, RIGHT_XR_TEXTURE_HANDLE}; use bevy::core_pipeline::core_3d::graph::Core3d; use bevy::core_pipeline::tonemapping::{DebandDither, Tonemapping}; -use bevy::ecs::system::lifetimeless::Read; use bevy::math::Vec3A; use bevy::prelude::*; use bevy::render::camera::{ @@ -13,13 +12,13 @@ use bevy::render::camera::{ }; use bevy::render::extract_component::{ExtractComponent, ExtractComponentPlugin}; use bevy::render::primitives::Frustum; +use bevy::render::render_resource::TextureUsages; use bevy::render::view::{ update_frusta, ColorGrading, ExtractedView, VisibilitySystems, VisibleEntities, }; use bevy::render::{Render, RenderApp, RenderSet}; use bevy::transform::TransformSystem; use openxr::Fovf; -use wgpu::TextureUsages; use super::trackers::{OpenXRLeftEye, OpenXRRightEye, OpenXRTracker, OpenXRTrackingRoot}; @@ -46,7 +45,7 @@ impl Plugin for XrCameraPlugin { PostUpdate, update_frusta:: .after(TransformSystem::TransformPropagate) - .before(VisibilitySystems::UpdatePerspectiveFrusta), + .before(VisibilitySystems::UpdateFrusta), ); app.add_systems( PostUpdate, @@ -250,7 +249,7 @@ impl CameraProjection for XRProjection { // Copyright (c) 2016 Oculus VR, LLC. // SPDX-License-Identifier: Apache-2.0 // ============================================================================= - fn get_projection_matrix(&self) -> Mat4 { + fn get_clip_from_view(&self) -> Mat4 { // symmetric perspective for debugging // let x_fov = (self.fov.angle_left.abs() + self.fov.angle_right.abs()); // let y_fov = (self.fov.angle_up.abs() + self.fov.angle_down.abs()); @@ -405,6 +404,6 @@ pub fn xr_camera_head_sync_render_world( let mut transform = Transform::IDENTITY; transform.rotation = view.pose.orientation.to_quat(); transform.translation = view.pose.position.to_vec3(); - extracted_view.transform = root.mul_transform(transform); + extracted_view.world_from_view = root.mul_transform(transform).into(); } }