diff --git a/Cargo.lock b/Cargo.lock index d6338bc9..3acbc75e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,57 +20,68 @@ checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" [[package]] name = "accesskit" -version = "0.21.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99" +checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320" dependencies = [ "enumn", "serde", + "uuid 1.21.0", ] [[package]] name = "accesskit_consumer" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db81010a6895d8707f9072e6ce98070579b43b717193d2614014abd5cb17dd43" +checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10" dependencies = [ "accesskit", - "hashbrown 0.15.5", + "hashbrown 0.16.1", +] + +[[package]] +name = "accesskit_consumer" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245" +dependencies = [ + "accesskit", + "hashbrown 0.16.1", ] [[package]] name = "accesskit_macos" -version = "0.22.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0089e5c0ac0ca281e13ea374773898d9354cc28d15af9f0f7394d44a495b575" +checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076" dependencies = [ "accesskit", - "accesskit_consumer", - "hashbrown 0.15.5", + "accesskit_consumer 0.38.0", + "hashbrown 0.16.1", "objc2 0.5.2", "objc2-app-kit", - "objc2-foundation", + "objc2-foundation 0.2.2", ] [[package]] name = "accesskit_windows" -version = "0.29.2" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d63dd5041e49c363d83f5419a896ecb074d309c414036f616dc0b04faca971" +checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21" dependencies = [ "accesskit", - "accesskit_consumer", - "hashbrown 0.15.5", + "accesskit_consumer 0.35.0", + "hashbrown 0.16.1", "static_assertions", - "windows 0.61.3", - "windows-core 0.61.2", + "windows", + "windows-core", ] [[package]] name = "accesskit_winit" -version = "0.29.2" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8cfabe59d0eaca7412bfb1f70198dd31e3b0496fee7e15b066f9c36a1a140a0" +checksum = "1fe9a94394896352cc4660ca2288bd4ef883d83238853c038b44070c8f134313" dependencies = [ "accesskit", "accesskit_macos", @@ -115,9 +126,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alsa" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" +checksum = "7c88dbbce13b232b26250e1e2e6ac18b6a891a646b8148285036ebce260ac5c3" dependencies = [ "alsa-sys", "bitflags 2.11.0", @@ -149,9 +160,9 @@ dependencies = [ "jni-sys", "libc", "log", - "ndk 0.9.0", + "ndk", "ndk-context", - "ndk-sys 0.6.0+11769913", + "ndk-sys", "num_enum", "thiserror 1.0.69", ] @@ -313,6 +324,24 @@ dependencies = [ "futures-lite", ] +[[package]] +name = "async-io" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" +dependencies = [ + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix 1.1.4", + "slab", + "windows-sys 0.61.2", +] + [[package]] name = "async-lock" version = "3.4.2" @@ -381,18 +410,18 @@ checksum = "1795ebc740ea791ffbe6685e0688ab1effec16c2864e0476db40bfdf0c02cb3d" [[package]] name = "bevy" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec689b5a79452b6f777b889bbff22d3216b82a8d2ab7814d4a0eb571e9938d97" +checksum = "950238d3049d81006a6fd6b898a34cfc01bb5462a7668795a54d640aed19fd0a" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_a11y" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef69b6d2dec07cbf407c63f6987e1746e4b735a9beea51f4bfc25ad49e344f75" +checksum = "e86f2cb45b000a9d121a5a7606f9af4a49e72b8b6a3885dc2acac2f0897a04f1" dependencies = [ "accesskit", "bevy_app", @@ -404,18 +433,18 @@ dependencies = [ [[package]] name = "bevy_android" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008133458cfe0d43a8870bfc4c5a729467cc5d9246611462add38bcf45ed896f" +checksum = "e6e5e2a949be318bf7184eb084622892afcc1e8b2af44973ac53ab53201756e0" dependencies = [ "android-activity", ] [[package]] name = "bevy_animation" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c852457843456c695ed22562969c83c3823454c3c40d359f92415371208ee7" +checksum = "7da2fcd94cc32ba1c875c62e88506c0ba4775555a413e34cd172ea95fa26098e" dependencies = [ "bevy_animation_macros", "bevy_app", @@ -446,9 +475,9 @@ dependencies = [ [[package]] name = "bevy_animation_macros" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac120bfd5a74e05f96013817d28318dc716afaa68864af069c7ffc3ccaf9d153" +checksum = "4fa3d816d7788e27da936b9c7ec27f9828906d53cb1d06e26c58cac5c5ee799f" dependencies = [ "bevy_macro_utils", "quote", @@ -457,9 +486,9 @@ dependencies = [ [[package]] name = "bevy_anti_alias" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418087f7c36a62c9886b55be6278e7b3d21c9943b107953aa2068000956a736" +checksum = "815414ea2e11afe1f2396d89279cfa0986907ef3ec673ec936d9fa695b2bfbf9" dependencies = [ "bevy_app", "bevy_asset", @@ -479,9 +508,9 @@ dependencies = [ [[package]] name = "bevy_app" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2271a0123a7cc355c3fe98754360c75aa84b29f2a6b1a9f8c00aac427570d174" +checksum = "671ae6f3a8d84f9ed696c531a138558596e041231a8414b6efeafa8469e841f9" dependencies = [ "bevy_derive", "bevy_ecs", @@ -489,7 +518,6 @@ dependencies = [ "bevy_reflect", "bevy_tasks", "bevy_utils", - "cfg-if", "console_error_panic_hook", "ctrlc", "downcast-rs 2.0.2", @@ -502,13 +530,14 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f7361669d1426a3359cb92f890ef9c62bd6e6b67f0190d2c5279d25ce24168" +checksum = "43a05907de6a362d2c609a7a1d1b4dca3b58b768f746b719ca1a3c7dfa87d391" dependencies = [ "async-broadcast", "async-channel", "async-fs", + "async-io", "async-lock", "atomicow", "bevy_android", @@ -545,9 +574,9 @@ dependencies = [ [[package]] name = "bevy_asset_macros" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288e1edf17069afe2e02a0c0e7e5936b3d22a67c7d2dc9201a27e4451875f909" +checksum = "c9444998cc37b51dfd1572c23a501865733ea65619a7d88b47aa654ae2290a4f" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -557,9 +586,9 @@ dependencies = [ [[package]] name = "bevy_audio" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3cbecfc6c5d3860f224f56d3152b14aa313168d35c16e847f5a0202a992c3af" +checksum = "06af3bd91de885f2a5c024569779a7fb43349df611d92f7b795c66c8797378db" dependencies = [ "bevy_app", "bevy_asset", @@ -567,17 +596,15 @@ dependencies = [ "bevy_math", "bevy_reflect", "bevy_transform", - "coreaudio-sys", - "cpal", "rodio", "tracing", ] [[package]] name = "bevy_camera" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c7e1f2a5da1755cd58e45c762f4ea2d72cef6c480f9c8ddbadbd2a4380c616" +checksum = "20105c3e77c2fb391bf3ded3a473d60e4058b837c9bf4e3412225833e524c75a" dependencies = [ "bevy_app", "bevy_asset", @@ -599,11 +626,26 @@ dependencies = [ "wgpu-types", ] +[[package]] +name = "bevy_clipboard" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dc5fb913f25c5a16a2a1aa2942ba3f1365a6d0f2db3c0ea5bc0be01f85dca5d" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_log", + "bevy_platform", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "bevy_color" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74727302424d7ffc23528a974dbb44a34708662926e1a3bfc5040493f858886e" +checksum = "7e2dfc0091be6eb62fec9158b2d3e6f21b002be7bdb42dd3b8322e949c8426b0" dependencies = [ "bevy_math", "bevy_reflect", @@ -617,9 +659,9 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e6bf0ba878bb5dd00ad4d70875b08eb11367829668c70d95785f5483ddb1cb" +checksum = "885d640bbff6c4fa3beadbb043d0d1ae53b2fda864da18a2bf2670fb90428865" dependencies = [ "bevy_app", "bevy_asset", @@ -629,6 +671,8 @@ dependencies = [ "bevy_diagnostic", "bevy_ecs", "bevy_image", + "bevy_light", + "bevy_log", "bevy_math", "bevy_platform", "bevy_reflect", @@ -638,18 +682,15 @@ dependencies = [ "bevy_utils", "bevy_window", "bitflags 2.11.0", + "indexmap", "nonmax", - "radsort", - "smallvec", - "thiserror 2.0.18", - "tracing", ] [[package]] name = "bevy_derive" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b6a05c31f54c83d681f1b8699bbaf581f06b25a40c9a6bb815625f731f5ba9" +checksum = "293df2b2f7ed65ef2ce02b2e7359faac1a9a92a8cc96c182c9de77eb06049ae0" dependencies = [ "bevy_macro_utils", "quote", @@ -658,19 +699,22 @@ dependencies = [ [[package]] name = "bevy_dev_tools" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3183daa165acce210c50c170c47433c90b1d55932ead9734ebca14b7cd242c4" +checksum = "db815000affd21545a6d6986f180a66393aee8c84330843e854d376c8537b10f" dependencies = [ "bevy_app", "bevy_asset", "bevy_camera", "bevy_color", + "bevy_core_pipeline", "bevy_diagnostic", "bevy_ecs", "bevy_image", "bevy_input", + "bevy_log", "bevy_math", + "bevy_pbr", "bevy_picking", "bevy_reflect", "bevy_render", @@ -687,9 +731,9 @@ dependencies = [ [[package]] name = "bevy_diagnostic" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca4caa8a9014a435dca382b1bdebaee4363e9be69882c598fc4ff4d7cd56e6a" +checksum = "a73e11555051f37c3e0e9ef7775e77108f2482310242996fb5bb6ef8b685b78e" dependencies = [ "atomic-waker", "bevy_app", @@ -705,9 +749,9 @@ dependencies = [ [[package]] name = "bevy_ecs" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24637a7c8643cab493f4085cda6bde4895f0e0816699c59006f18819da2ca0b8" +checksum = "4654b9b3535fa7813d2878a50e1b5ad80a361dc1c913b96ded57667f65d70a01" dependencies = [ "arrayvec", "bevy_ecs_macros", @@ -731,12 +775,25 @@ dependencies = [ "variadics_please", ] +[[package]] +name = "bevy_ecs_macro_logic" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee0b98a74141ce8dce4654c60020ebbaefab32646f42af6bbae55f282ae65ff7" +dependencies = [ + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "bevy_ecs_macros" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb14c18ca71e11c69fbae873c2db129064efac6d52e48d0127d37bfba1acfa8" +checksum = "4dc958a194d226d618404e0fea99a3c8b4146207a00a3ba07fa712bf71607240" dependencies = [ + "bevy_ecs_macro_logic", "bevy_macro_utils", "proc-macro2", "quote", @@ -745,19 +802,51 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f89146a8fcbfe47310fc929ee762dd3b08d4de3e3371c601529cfa8eeb861de" +checksum = "14dc5bf9e6cb46c4401a66625b5f7eb9654a7f3c8586423c428b79586a1c55cd" dependencies = [ "bevy_macro_utils", "encase_derive_impl", ] +[[package]] +name = "bevy_feathers" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e744e047f9328a9c072982569fabbbc837db0474fd902473b5f438f8688c30b6" +dependencies = [ + "accesskit", + "bevy_a11y", + "bevy_app", + "bevy_asset", + "bevy_camera", + "bevy_color", + "bevy_derive", + "bevy_ecs", + "bevy_input", + "bevy_input_focus", + "bevy_log", + "bevy_math", + "bevy_picking", + "bevy_platform", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_shader", + "bevy_text", + "bevy_ui", + "bevy_ui_render", + "bevy_ui_widgets", + "bevy_window", + "smol_str", +] + [[package]] name = "bevy_gilrs" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c76417261ff3cd7ecda532b58514224aee06e76fbd87636c3a80695be7c8192" +checksum = "7998fe83c89d527efa83c85c574a17f7bb6e34881d638ecb7f706d9d79e82f3c" dependencies = [ "bevy_app", "bevy_ecs", @@ -771,9 +860,9 @@ dependencies = [ [[package]] name = "bevy_gizmos" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc78a5699580c2dce078f4c099028d26525a5a38e8eb587a31854c660a3c5ff7" +checksum = "9c0cbd55cc33b6412777d60d8c24a96bee148c82a5731f35ac85b2df4a7cf957" dependencies = [ "bevy_app", "bevy_asset", @@ -781,19 +870,22 @@ dependencies = [ "bevy_color", "bevy_ecs", "bevy_gizmos_macros", - "bevy_light", + "bevy_input", + "bevy_log", "bevy_math", + "bevy_mesh", "bevy_reflect", "bevy_time", "bevy_transform", "bevy_utils", + "bevy_window", ] [[package]] name = "bevy_gizmos_macros" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60bb92e0ef80ff7c59429133244765515db3d313fae77ee67ffe94dab5b2725d" +checksum = "9903f2614f53bacacb92bef1e407afe3a27a4abddb500bfd479909c5d7b254df" dependencies = [ "bevy_macro_utils", "quote", @@ -802,20 +894,24 @@ dependencies = [ [[package]] name = "bevy_gizmos_render" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fde3172a31f81033b4f497dd9df84476f527fadb00936ede380fb646c402eb" +checksum = "dd569456c4b19bafa6d37c1bd9cc743fdadda3a2f23d79d2ceb0a088ea8d475f" dependencies = [ "bevy_app", "bevy_asset", "bevy_camera", + "bevy_color", "bevy_core_pipeline", "bevy_ecs", "bevy_gizmos", "bevy_image", + "bevy_log", + "bevy_material", "bevy_math", "bevy_mesh", "bevy_pbr", + "bevy_reflect", "bevy_render", "bevy_shader", "bevy_sprite_render", @@ -827,9 +923,9 @@ dependencies = [ [[package]] name = "bevy_gltf" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08372f222676dba313061fc71128209b82f9711e7c5cba222b5c34bf1c5c70fe" +checksum = "84e21ad83b7dc8d456491ea3d50057685d8c4cca8bc52a1b4a7161c86c369842" dependencies = [ "async-lock", "base64", @@ -841,31 +937,31 @@ dependencies = [ "bevy_ecs", "bevy_image", "bevy_light", + "bevy_material", "bevy_math", "bevy_mesh", - "bevy_pbr", "bevy_platform", "bevy_reflect", - "bevy_render", - "bevy_scene", "bevy_tasks", "bevy_transform", + "bevy_world_serialization", "fixedbitset 0.5.7", "gltf", - "itertools 0.14.0", + "itertools", "percent-encoding", "serde", "serde_json", "smallvec", "thiserror 2.0.18", "tracing", + "wgpu-types", ] [[package]] name = "bevy_image" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809101ebe678a76c4c5ba3ecad255cde9be3ae0af591cf0143ba2c157afb55e9" +checksum = "37bc41f69a0c6ade2e7961602517545b39ab8e42bc8c4a729bd24ffee3bcd904" dependencies = [ "bevy_app", "bevy_asset", @@ -892,9 +988,9 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2853993baf27b963a417d3603a73e02e39c5041913cd1ba7211b0a3037b191" +checksum = "fd221cf0732f5bf06caf594bdb233361ac735d4d416cf5849757b64bf4e8472a" dependencies = [ "bevy_app", "bevy_ecs", @@ -910,9 +1006,9 @@ dependencies = [ [[package]] name = "bevy_input_focus" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fc0fae5e4e081180f7f7bf8023a2b97dad13dcb5fa79eba50cda5bb95699a9" +checksum = "0e1a14f56c6e722048ec9dc20dbbc6f46b8037f61e319ea776829199278da166" dependencies = [ "bevy_app", "bevy_ecs", @@ -927,9 +1023,9 @@ dependencies = [ [[package]] name = "bevy_internal" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57463815630ea71221c0b8e7bff72d816a3071a89507c45f9e2686fbb5e1956b" +checksum = "d52a85632a749f956f92b7b391c31ce1f229e57b06de879d1b60a3bb91e4e240" dependencies = [ "bevy_a11y", "bevy_android", @@ -939,12 +1035,14 @@ dependencies = [ "bevy_asset", "bevy_audio", "bevy_camera", + "bevy_clipboard", "bevy_color", "bevy_core_pipeline", "bevy_derive", "bevy_dev_tools", "bevy_diagnostic", "bevy_ecs", + "bevy_feathers", "bevy_gilrs", "bevy_gizmos", "bevy_gizmos_render", @@ -954,6 +1052,7 @@ dependencies = [ "bevy_input_focus", "bevy_light", "bevy_log", + "bevy_material", "bevy_math", "bevy_mesh", "bevy_pbr", @@ -974,37 +1073,44 @@ dependencies = [ "bevy_transform", "bevy_ui", "bevy_ui_render", + "bevy_ui_widgets", "bevy_utils", "bevy_window", "bevy_winit", + "bevy_world_serialization", ] [[package]] name = "bevy_light" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9968b8f8a6a766a88b66144474c39d1415edc277d042fec1526eae85e1f8b4" +checksum = "bd7b5009e9cc765c30b21daf2277ea4423cbd347b05280ea0943b50c5a80cd42" dependencies = [ "bevy_app", "bevy_asset", "bevy_camera", "bevy_color", "bevy_ecs", + "bevy_gizmos", "bevy_image", + "bevy_log", "bevy_math", "bevy_mesh", "bevy_platform", "bevy_reflect", "bevy_transform", "bevy_utils", + "half", + "smallvec", "tracing", + "wgpu-types", ] [[package]] name = "bevy_log" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406304a9b867a2de98c3edf0cc9e5a608fad1a1ddc567e15e72c186a8273ef51" +checksum = "2017a5fe12ea230d00cfdca00c65c262924be26e0324f7e0033c64f8cc265888" dependencies = [ "android_log-sys", "bevy_app", @@ -1020,30 +1126,64 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7272fca0bf30d8ca2571a803598856104b63e5c596d52850f811ed37c5e1e3" +checksum = "746a19912c6dc1bbe79188778573e8a253d5832c696b2fcb95578c17b29ff7ba" dependencies = [ "proc-macro2", "quote", "syn 2.0.117", - "toml_edit", + "toml_edit 0.25.4+spec-1.1.0", +] + +[[package]] +name = "bevy_material" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "423710403b4a4d8e9ee872c6ac8108787f2396422b582d15a660a40731ddfbf0" +dependencies = [ + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_material_macros", + "bevy_mesh", + "bevy_platform", + "bevy_reflect", + "bevy_shader", + "bevy_utils", + "encase", + "smallvec", + "thiserror 2.0.18", + "tracing", + "variadics_please", + "wgpu-types", +] + +[[package]] +name = "bevy_material_macros" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6928e167592472f6ee900f80de199cc2dafd31d4f082a86e8d594b81b973e3d" +dependencies = [ + "bevy_macro_utils", + "quote", + "syn 2.0.117", ] [[package]] name = "bevy_math" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a815c514b8a6f7b11508cdc8b3a4bf0761e96a14227af40aa93cb1160989ce0" +checksum = "d7c280440d2a5bc07ea393b5346b5712eec73ea30f0133097b8b13dade385beb" dependencies = [ "approx", "arrayvec", "bevy_reflect", "derive_more", "glam", - "itertools 0.14.0", + "itertools", "libm", - "rand 0.9.2", + "rand 0.10.0", "rand_distr", "serde", "thiserror 2.0.18", @@ -1052,15 +1192,15 @@ dependencies = [ [[package]] name = "bevy_mesh" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aacf09d0ffd1a15baf8d201c4a34b918912a506395c2817aa55ab3d3776c09f2" +checksum = "c59863e6f37ef0ba1f37021bce9dd940f9dc31d15e03f548cda5fd3e674f409e" dependencies = [ "bevy_app", "bevy_asset", "bevy_derive", "bevy_ecs", - "bevy_image", + "bevy_encase_derive", "bevy_math", "bevy_mikktspace", "bevy_platform", @@ -1069,6 +1209,9 @@ dependencies = [ "bitflags 2.11.0", "bytemuck", "derive_more", + "encase", + "glam", + "half", "hexasphere", "serde", "thiserror 2.0.18", @@ -1078,16 +1221,17 @@ dependencies = [ [[package]] name = "bevy_mikktspace" -version = "0.17.0-dev" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef8e4b7e61dfe7719bb03c884dc270cd46a82efb40f93e9933b990c5c190c59" +checksum = "bff34eb29ff4b8a8688bc7299f14fb6b597461ca80fec03ed7d22939ab33e48f" [[package]] name = "bevy_pbr" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cc361c65035f7e531b592d99bce95b6ab3f643cae2abe97dfa7681363159a6" +checksum = "38ebc777de2d7f45888c68e8e04949bfb8a40aee62f700283fc340f525e67f52" dependencies = [ + "arrayvec", "bevy_app", "bevy_asset", "bevy_camera", @@ -1096,34 +1240,39 @@ dependencies = [ "bevy_derive", "bevy_diagnostic", "bevy_ecs", + "bevy_gltf", "bevy_image", "bevy_light", "bevy_log", + "bevy_material", "bevy_math", "bevy_mesh", "bevy_platform", "bevy_reflect", "bevy_render", "bevy_shader", + "bevy_tasks", "bevy_transform", "bevy_utils", "bitflags 2.11.0", "bytemuck", "derive_more", "fixedbitset 0.5.7", + "indexmap", "nonmax", "offset-allocator", "smallvec", "static_assertions", "thiserror 2.0.18", "tracing", + "wgpu-types", ] [[package]] name = "bevy_picking" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d10bb2a776087e1d8a9b87e8deb091d25bcedbe6160c613df2dc5fe069c3c5" +checksum = "93468ac5937f76be3af763d496f01e899edf6d9c1a1d39a87ae4ce8eba36f78b" dependencies = [ "bevy_app", "bevy_asset", @@ -1145,13 +1294,14 @@ dependencies = [ [[package]] name = "bevy_platform" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b29ea749a8e85f98186ab662f607b885b97c804bb14cdb0cdf838164496d474" +checksum = "3120670bb2308980f723477c9d82476fcda31f08be9b256c3f0acdee82a65094" dependencies = [ "critical-section", "foldhash 0.2.0", "futures-channel", + "futures-lite", "hashbrown 0.16.1", "js-sys", "portable-atomic", @@ -1161,13 +1311,14 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-time", + "windows-sys 0.61.2", ] [[package]] name = "bevy_post_process" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e1116cbc35637f267a29c7d2fe376e020f2b4402d6b525d328bae9c10460c7" +checksum = "57379b51aa0f1b2066c956263e1f12686d22cf8939cf9644eebf2ee42d3dd460" dependencies = [ "bevy_app", "bevy_asset", @@ -1182,12 +1333,7 @@ dependencies = [ "bevy_reflect", "bevy_render", "bevy_shader", - "bevy_transform", "bevy_utils", - "bevy_window", - "bitflags 2.11.0", - "nonmax", - "radsort", "smallvec", "thiserror 2.0.18", "tracing", @@ -1195,15 +1341,15 @@ dependencies = [ [[package]] name = "bevy_ptr" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f98cbc6d34bbdb58240b72ed1731931b4991a893b3a3238bb7c42ae054aa676" +checksum = "b511e89f7078fd21fdea77061a0ca3e737297c7011bb10c073e0aecb17c9fea6" [[package]] name = "bevy_reflect" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2a977e2b8dba65b6e9c11039c5f9ef108be428f036b3d1cac13ad86ec59f9c" +checksum = "92abd59cbba1524c1847e9a50f74d94e6b7836c80a8edfa9c47e59f7fd81021d" dependencies = [ "assert_type_match", "bevy_platform", @@ -1230,9 +1376,9 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "067af30072b1611fda1a577f1cb678b8ea2c9226133068be808dd49aac30cef0" +checksum = "90fa4e6b97fd2d582dd5ed96762a70d04505a477c833cf4f69d016dcd03d2d04" dependencies = [ "bevy_macro_utils", "indexmap", @@ -1244,9 +1390,9 @@ dependencies = [ [[package]] name = "bevy_render" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b2c9a276646bde8ba58a7e15711b459fb4a5cdf46c47059b7a310f97a70d9c" +checksum = "a89b2cc850a4c3fd12a6a088a4fc3e80118b2e1b569da8936f6d4d99ca1b6ee7" dependencies = [ "async-channel", "bevy_app", @@ -1258,6 +1404,9 @@ dependencies = [ "bevy_ecs", "bevy_encase_derive", "bevy_image", + "bevy_log", + "bevy_material", + "bevy_material_macros", "bevy_math", "bevy_mesh", "bevy_platform", @@ -1274,10 +1423,10 @@ dependencies = [ "derive_more", "downcast-rs 2.0.2", "encase", - "fixedbitset 0.5.7", "glam", "image", "indexmap", + "itertools", "js-sys", "naga", "nonmax", @@ -1285,18 +1434,19 @@ dependencies = [ "send_wrapper", "smallvec", "thiserror 2.0.18", - "tracing", "variadics_please", "wasm-bindgen", + "weak-table", "web-sys", "wgpu", + "wgpu-types", ] [[package]] name = "bevy_render_macros" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e16b8cac95b87021399ed19f6ab79c0b1e03101a448e3a0240934f78f66a56" +checksum = "e0eb5cffe5253a6ab4e4b84b2e40a6a2f4673deb16fd63ab9dfc4a015449873a" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1306,48 +1456,62 @@ dependencies = [ [[package]] name = "bevy_scene" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046bb071ee358619f2fa9409ccced47375502b098b4107ec3385f3a1acf6600" +checksum = "28a3c891148c40e1352fc41001c0e1894ba63fc4e2d3aca33447343c4122b782" dependencies = [ "bevy_app", "bevy_asset", - "bevy_camera", "bevy_derive", "bevy_ecs", + "bevy_log", "bevy_platform", "bevy_reflect", - "bevy_transform", + "bevy_scene_macros", "bevy_utils", - "derive_more", - "ron", - "serde", + "smallvec", "thiserror 2.0.18", - "uuid 1.21.0", + "tracing", + "variadics_please", +] + +[[package]] +name = "bevy_scene_macros" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4bc33a36a4e9e344985a96cd8b4abc816cf2c5d2fa002d72fd7bcd11396589c" +dependencies = [ + "bevy_ecs_macro_logic", + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.117", ] [[package]] name = "bevy_shader" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a14cb0991b2482a66b94728cbcf7482d1b74364be017197396435d3d542b8d3" +checksum = "fa0ac51378bb6a021165ee334f846b515cd06082e24ce962adce58ad7df1c39a" dependencies = [ "bevy_asset", "bevy_platform", "bevy_reflect", + "bevy_utils", "naga", "naga_oil", "serde", "thiserror 2.0.18", "tracing", + "wgpu-naga-bridge", "wgpu-types", ] [[package]] name = "bevy_sprite" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3921ce1a8ce801c29d9552cbc204548bfeb16b9b829045c9e82b5917d99cc" +checksum = "c679b88cc655881d403929bcdf02d30f688fd8916eb1635e6e7f8585d8ae6894" dependencies = [ "bevy_app", "bevy_asset", @@ -1356,6 +1520,7 @@ dependencies = [ "bevy_derive", "bevy_ecs", "bevy_image", + "bevy_log", "bevy_math", "bevy_mesh", "bevy_picking", @@ -1370,18 +1535,18 @@ dependencies = [ [[package]] name = "bevy_sprite3d" -version = "8.0.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d48211f81bf10733ae4b4e90311a62b3ec72f2a80d100ad24be78676d7ecc5" +checksum = "ed7d3bb3fe10dd18aad785f2743916ba07e187cd9adeb1321e75d579cd0a0b2e" dependencies = [ "bevy", ] [[package]] name = "bevy_sprite_render" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed40642fa0e1330df65b6a1bf0b14aa32fcd9d7f3306e08e0784c10362bd6265" +checksum = "e5a65ca9a286dd5815ca4d2d41d4f83bdbb22c8a639d10b4c33eac114b369c36" dependencies = [ "bevy_app", "bevy_asset", @@ -1391,6 +1556,7 @@ dependencies = [ "bevy_derive", "bevy_ecs", "bevy_image", + "bevy_material", "bevy_math", "bevy_mesh", "bevy_platform", @@ -1411,9 +1577,9 @@ dependencies = [ [[package]] name = "bevy_state" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9453325ca0c185a043f4515158daa15a8ab19139a60fd1edaf87fbe896cb7f83" +checksum = "8c22e694ea52e42994aea6ed2d0b378fa1e9d5a9b615db88626e33508bc03f35" dependencies = [ "bevy_app", "bevy_ecs", @@ -1427,9 +1593,9 @@ dependencies = [ [[package]] name = "bevy_state_macros" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d733081e57e49b3c43bdf3766d1de74c7df32e0f4db20c20437c85b1d18908de" +checksum = "835f45091fa0df1ff3cb10f4ca5a397d4e9249b550f1be6893b08a2a06d6eed7" dependencies = [ "bevy_macro_utils", "quote", @@ -1438,9 +1604,9 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990ffedd374dd2c4fe8f0fd4bcefd5617d1ee59164b6c3fcc356a69b48e26e8e" +checksum = "fa34e6b9b804851ec08a41c0346c859d82e2fa98c906d74b965ee61bbbb688e4" dependencies = [ "async-channel", "async-executor", @@ -1452,17 +1618,18 @@ dependencies = [ "derive_more", "futures-lite", "heapless", - "pin-project", + "web-task", ] [[package]] name = "bevy_text" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecbb6eeaa9a63d1f8aae8c0d79f8d5e14c584a962a4ef9f69115fd7d10941101" +checksum = "38e1d7eb8b10229f424b4fc56c864a26c32ac02b8cd184e2cc25eceea7b5e892" dependencies = [ "bevy_app", "bevy_asset", + "bevy_clipboard", "bevy_color", "bevy_derive", "bevy_ecs", @@ -1472,9 +1639,11 @@ dependencies = [ "bevy_platform", "bevy_reflect", "bevy_utils", - "cosmic-text", + "parley", "serde", "smallvec", + "smol_str", + "swash", "sys-locale", "thiserror 2.0.18", "tracing", @@ -1483,9 +1652,9 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c68b78e7ca1cc10c811cd1ded8350f53f2be11eb46946879a74c684026bff7" +checksum = "c21e3be2aa4426ea1e0a7036d3d1dbbded84c319459d9f3e2a616b33563372f2" dependencies = [ "bevy_app", "bevy_ecs", @@ -1498,13 +1667,12 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30e3957de42c2f7d88dfe8428e739b74deab8932d2a8bbb9d4eefbd64b6aa34" +checksum = "c95fefe69c9223d10e6b52a0fdf12811bab9d0c7dcb27570cb86824b451f180d" dependencies = [ "bevy_app", "bevy_ecs", - "bevy_log", "bevy_math", "bevy_reflect", "bevy_tasks", @@ -1516,9 +1684,9 @@ dependencies = [ [[package]] name = "bevy_ui" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "889c6892e9c5c308ab225a1322d07fb2358ccf39493526cda4d5f083d717773d" +checksum = "e5519c799ecf14e2eeece8b9b823250a00c9df14523e2638b647fccfe4ff0d20" dependencies = [ "accesskit", "bevy_a11y", @@ -1531,18 +1699,22 @@ dependencies = [ "bevy_image", "bevy_input", "bevy_input_focus", + "bevy_log", "bevy_math", "bevy_picking", "bevy_platform", "bevy_reflect", "bevy_sprite", "bevy_text", + "bevy_time", "bevy_transform", "bevy_utils", "bevy_window", "derive_more", + "parley", "serde", "smallvec", + "swash", "taffy", "thiserror 2.0.18", "tracing", @@ -1551,9 +1723,9 @@ dependencies = [ [[package]] name = "bevy_ui_render" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b649395e32a4761d4f17aeff37170a4421c94a14c505645397b8ee8510eb19e9" +checksum = "4f1d3921936d88bd2638dd4d87bff8fc3b9908a046a50658548045102249f93e" dependencies = [ "bevy_app", "bevy_asset", @@ -1563,6 +1735,7 @@ dependencies = [ "bevy_derive", "bevy_ecs", "bevy_image", + "bevy_input_focus", "bevy_math", "bevy_mesh", "bevy_platform", @@ -1577,25 +1750,52 @@ dependencies = [ "bevy_utils", "bytemuck", "derive_more", + "indexmap", "tracing", ] +[[package]] +name = "bevy_ui_widgets" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fc616ccc51b36dea5cb1de91ed82569b41649923388e5ba82cb7d2f1ef18d8" +dependencies = [ + "accesskit", + "bevy_a11y", + "bevy_app", + "bevy_camera", + "bevy_ecs", + "bevy_input", + "bevy_input_focus", + "bevy_log", + "bevy_math", + "bevy_picking", + "bevy_reflect", + "bevy_text", + "bevy_ui", + "bevy_window", + "parley", + "smol_str", +] + [[package]] name = "bevy_utils" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e258c44d869f9c41ac0f88a16815c67f2569eb9fff4716828a40273d127b6f84" +checksum = "3aceea6c7ffdd568f866d5ca4dfe50c33440c54f7bc230c13a9ba7ab0c91aed1" dependencies = [ + "async-channel", "bevy_platform", "disqualified", + "indexmap", "thread_local", ] [[package]] name = "bevy_window" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869a56f1da2544641734018e1f1caa660299cd6e3af794f3fa0df72293d8eed2" +checksum = "efcc255b43db156fba393b2ff8fa552aac5e7e02ae4c6298eacdbab655ddf988" dependencies = [ "bevy_app", "bevy_asset", @@ -1612,9 +1812,9 @@ dependencies = [ [[package]] name = "bevy_winit" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8142a3749fc491eeae481c30bb3830cf5a71d2fa3dba4d450a42792f6d39eb2d" +checksum = "308c9eb04f74f340593b3def6a7c1778fd42581d779c6db836d690c7d471f94c" dependencies = [ "accesskit", "accesskit_winit", @@ -1635,7 +1835,6 @@ dependencies = [ "bevy_tasks", "bevy_window", "bytemuck", - "cfg-if", "js-sys", "tracing", "wasm-bindgen", @@ -1644,6 +1843,28 @@ dependencies = [ "winit", ] +[[package]] +name = "bevy_world_serialization" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de58ae74410d4f940e3f00484f58603b4f1a53a7d84ebe3fca258d2a3aa96620" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_camera", + "bevy_derive", + "bevy_ecs", + "bevy_platform", + "bevy_reflect", + "bevy_transform", + "bevy_utils", + "derive_more", + "ron", + "serde", + "thiserror 2.0.18", + "uuid 1.21.0", +] + [[package]] name = "bevy_yarnspinner" version = "0.8.0" @@ -1681,24 +1902,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "bindgen" -version = "0.72.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" -dependencies = [ - "bitflags 2.11.0", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "proc-macro2", - "quote", - "regex", - "rustc-hash 2.1.1", - "shlex", - "syn 2.0.117", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -1710,11 +1913,11 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd" dependencies = [ - "bit-vec 0.8.0", + "bit-vec 0.9.1", ] [[package]] @@ -1725,9 +1928,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bit-vec" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" +checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51" [[package]] name = "bitflags" @@ -1759,12 +1962,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - [[package]] name = "block-buffer" version = "0.10.4" @@ -1912,15 +2109,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.4" @@ -1934,21 +2122,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] -name = "clang-sys" -version = "1.8.1" +name = "codespan-reporting" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" dependencies = [ - "glob", - "libc", - "libloading", + "serde", + "termcolor", + "unicode-width", ] [[package]] name = "codespan-reporting" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" +checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681" dependencies = [ "serde", "termcolor", @@ -2054,16 +2242,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-foundation" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -2077,8 +2255,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", + "core-foundation", + "core-graphics-types", "foreign-types", "libc", ] @@ -2090,18 +2268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation 0.9.4", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" -dependencies = [ - "bitflags 2.11.0", - "core-foundation 0.10.1", + "core-foundation", "libc", ] @@ -2116,69 +2283,46 @@ dependencies = [ [[package]] name = "coreaudio-rs" -version = "0.11.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +checksum = "1aae284fbaf7d27aa0e292f7677dfbe26503b0d555026f702940805a630eac17" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6" -dependencies = [ - "bindgen", -] - -[[package]] -name = "cosmic-text" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cadaea21e24c49c0c82116f2b465ae6a49d63c90e428b0f8d9ae1f638ac91f" -dependencies = [ - "bitflags 2.11.0", - "fontdb", - "harfrust", - "linebender_resource_handle", - "log", - "rangemap", - "rustc-hash 1.1.0", - "self_cell", - "skrifa 0.39.0", - "smol_str", - "swash", - "sys-locale", - "unicode-bidi", - "unicode-linebreak", - "unicode-script", - "unicode-segmentation", + "libc", + "objc2-audio-toolbox", + "objc2-core-audio", + "objc2-core-audio-types", + "objc2-core-foundation", ] [[package]] name = "cpal" -version = "0.15.3" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" +checksum = "5b1f9c7312f19fc2fa12fd7acaf38de54e8320ba10d1a02dcbe21038def51ccb" dependencies = [ "alsa", - "core-foundation-sys", "coreaudio-rs", "dasp_sample", "jni", "js-sys", "libc", "mach2", - "ndk 0.8.0", + "ndk", "ndk-context", - "oboe", + "num-derive", + "num-traits", + "objc2 0.6.4", + "objc2-audio-toolbox", + "objc2-avf-audio", + "objc2-core-audio", + "objc2-core-audio-types", + "objc2-core-foundation", + "objc2-foundation 0.3.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.54.0", + "windows", ] [[package]] @@ -2709,26 +2853,26 @@ dependencies = [ ] [[package]] -name = "fontconfig-parser" -version = "0.5.8" +name = "font-types" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646" +checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7" dependencies = [ - "roxmltree", + "bytemuck", ] [[package]] -name = "fontdb" -version = "0.23.0" +name = "fontique" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905" +checksum = "7c20b425addb8661e97fe1d51c4d8bcec3ec29ed6ad0db983976a7521276b8f7" dependencies = [ - "fontconfig-parser", - "log", + "hashbrown 0.17.1", + "linebender_resource_handle", "memmap2", - "slotmap", - "tinyvec", - "ttf-parser", + "parlance", + "read-fonts 0.39.2", + "smallvec", ] [[package]] @@ -2848,7 +2992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" dependencies = [ "rustix 1.1.4", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -2910,7 +3054,7 @@ dependencies = [ "vec_map", "wasm-bindgen", "web-sys", - "windows 0.62.2", + "windows", ] [[package]] @@ -2926,14 +3070,14 @@ dependencies = [ [[package]] name = "glam" -version = "0.30.10" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9" +checksum = "f70749695b063ecbf6b62949ccccde2e733ec3ecbbd71d467dca4e5c6c97cca0" dependencies = [ "bytemuck", "encase", "libm", - "rand 0.9.2", + "rand 0.10.0", "serde_core", ] @@ -2958,9 +3102,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" +checksum = "29038e1c483364cc6bb3cf78feee1816002e127c331a1eec55a4d202b9e1adb5" dependencies = [ "js-sys", "slotmap", @@ -3013,35 +3157,18 @@ dependencies = [ "gl_generator", ] -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.11.0", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.11.0", -] - [[package]] name = "gpu-allocator" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795" dependencies = [ + "ash", + "hashbrown 0.16.1", "log", "presser", - "thiserror 1.0.69", - "windows 0.58.0", + "thiserror 2.0.18", + "windows", ] [[package]] @@ -3086,22 +3213,24 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ + "bytemuck", "cfg-if", "crunchy", "num-traits", + "serde", "zerocopy", ] [[package]] name = "harfrust" -version = "0.4.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0caaee032384c10dd597af4579c67dee16650d862a9ccbe1233ff1a379abc07" +checksum = "551ed25397e4b444e89686602877d5cf3a7f6e3d548dcac37a8357d1e195f4df" dependencies = [ "bitflags 2.11.0", "bytemuck", "core_maths", - "read-fonts 0.36.0", + "read-fonts 0.39.2", "smallvec", ] @@ -3136,6 +3265,15 @@ dependencies = [ "serde_core", ] +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +dependencies = [ + "foldhash 0.2.0", +] + [[package]] name = "heapless" version = "0.9.2" @@ -3167,9 +3305,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexasphere" -version = "16.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a164ceff4500f2a72b1d21beaa8aa8ad83aec2b641844c659b190cb3ea2e0b" +checksum = "177ea6330876de4ef08e184f827b98acc037614a4ce409902c5b0d53a9c2e951" dependencies = [ "constgebra", "glam", @@ -3230,6 +3368,26 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831" +[[package]] +name = "icu_normalizer" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" + [[package]] name = "icu_plurals" version = "2.1.1" @@ -3249,6 +3407,26 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f018a98dccf7f0eb02ba06ac0ff67d102d8ded80734724305e924de304e12ff0" +[[package]] +name = "icu_properties" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" + [[package]] name = "icu_provider" version = "2.1.1" @@ -3266,6 +3444,27 @@ dependencies = [ "zerovec", ] +[[package]] +name = "icu_segmenter" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a807a7488f3f758629ae86d99d9d30dce24da2fb2945d74c80a4f4a62c71db73" +dependencies = [ + "icu_collections", + "icu_locale", + "icu_provider", + "icu_segmenter_data", + "potential_utf", + "utf8_iter", + "zerovec", +] + +[[package]] +name = "icu_segmenter_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ebbb7321d9e21d25f5660366cb6c08201d0175898a3a6f7a41ee9685af21c80" + [[package]] name = "id-arena" version = "2.3.0" @@ -3372,15 +3571,6 @@ dependencies = [ "rustversion", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -3488,9 +3678,9 @@ dependencies = [ [[package]] name = "ktx2" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff7f53bdf698e7aa7ec916411bbdc8078135da11b66db5182675b2227f6c0d07" +checksum = "1d50be8a24c37debdf3170be6ca396d5b5b165f37f94837891adac735ca416b8" dependencies = [ "bitflags 2.11.0", ] @@ -3537,7 +3727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -3643,18 +3833,9 @@ dependencies = [ [[package]] name = "mach2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44" -dependencies = [ - "libc", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea" dependencies = [ "libc", ] @@ -3698,21 +3879,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "metal" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" -dependencies = [ - "bitflags 2.11.0", - "block", - "core-graphics-types 0.2.0", - "foreign-types", - "log", - "objc", - "paste", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3768,16 +3934,16 @@ dependencies = [ [[package]] name = "naga" -version = "27.0.3" +version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8" +checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df" dependencies = [ "arrayvec", - "bit-set 0.8.0", + "bit-set 0.9.1", "bitflags 2.11.0", "cfg-if", "cfg_aliases", - "codespan-reporting", + "codespan-reporting 0.13.1", "half", "hashbrown 0.16.1", "hexf-parse", @@ -3787,7 +3953,7 @@ dependencies = [ "num-traits", "once_cell", "pp-rs", - "rustc-hash 1.1.0", + "rustc-hash", "spirv", "thiserror 2.0.18", "unicode-ident", @@ -3795,35 +3961,21 @@ dependencies = [ [[package]] name = "naga_oil" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310c347db1b30e69581f3b84dc9a5c311ed583f67851b39b77953cb7a066c97f" +checksum = "319f03062940ed85c03da020042618356bb8ca5263020322930883b05e30208e" dependencies = [ - "codespan-reporting", + "codespan-reporting 0.12.0", "data-encoding", "indexmap", "naga", "regex", - "rustc-hash 1.1.0", + "rustc-hash", "thiserror 2.0.18", "tracing", "unicode-ident", ] -[[package]] -name = "ndk" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" -dependencies = [ - "bitflags 2.11.0", - "jni-sys", - "log", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum", - "thiserror 1.0.69", -] - [[package]] name = "ndk" version = "0.9.0" @@ -3833,7 +3985,7 @@ dependencies = [ "bitflags 2.11.0", "jni-sys", "log", - "ndk-sys 0.6.0+11769913", + "ndk-sys", "num_enum", "raw-window-handle", "thiserror 1.0.69", @@ -3845,15 +3997,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.6.0+11769913" @@ -3936,9 +4079,9 @@ dependencies = [ [[package]] name = "notify-debouncer-full" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375bd3a138be7bfeff3480e4a623df4cbfb55b79df617c055cd810ba466fa078" +checksum = "c02b49179cfebc9932238d04d6079912d26de0379328872846118a0fa0dbb302" dependencies = [ "file-id", "log", @@ -3974,6 +4117,16 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "num-bigint" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-conv" version = "0.2.0" @@ -3991,6 +4144,26 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -4032,15 +4205,6 @@ dependencies = [ "libc", ] -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - [[package]] name = "objc-sys" version = "0.3.5" @@ -4078,8 +4242,33 @@ dependencies = [ "objc2 0.5.2", "objc2-core-data", "objc2-core-image", - "objc2-foundation", - "objc2-quartz-core", + "objc2-foundation 0.2.2", + "objc2-quartz-core 0.2.2", +] + +[[package]] +name = "objc2-audio-toolbox" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08" +dependencies = [ + "bitflags 2.11.0", + "libc", + "objc2 0.6.4", + "objc2-core-audio", + "objc2-core-audio-types", + "objc2-core-foundation", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-avf-audio" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13a380031deed8e99db00065c45937da434ca987c034e13b87e4441f9e4090be" +dependencies = [ + "objc2 0.6.4", + "objc2-foundation 0.3.2", ] [[package]] @@ -4092,7 +4281,7 @@ dependencies = [ "block2 0.5.1", "objc2 0.5.2", "objc2-core-location", - "objc2-foundation", + "objc2-foundation 0.2.2", ] [[package]] @@ -4103,7 +4292,30 @@ checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" dependencies = [ "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-core-audio" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2" +dependencies = [ + "dispatch2", + "objc2 0.6.4", + "objc2-core-audio-types", + "objc2-core-foundation", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-core-audio-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c" +dependencies = [ + "bitflags 2.11.0", + "objc2 0.6.4", ] [[package]] @@ -4115,7 +4327,7 @@ dependencies = [ "bitflags 2.11.0", "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation", + "objc2-foundation 0.2.2", ] [[package]] @@ -4125,6 +4337,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ "bitflags 2.11.0", + "block2 0.6.2", + "dispatch2", + "libc", + "objc2 0.6.4", ] [[package]] @@ -4135,8 +4351,8 @@ checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" dependencies = [ "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation", - "objc2-metal", + "objc2-foundation 0.2.2", + "objc2-metal 0.2.2", ] [[package]] @@ -4148,7 +4364,7 @@ dependencies = [ "block2 0.5.1", "objc2 0.5.2", "objc2-contacts", - "objc2-foundation", + "objc2-foundation 0.2.2", ] [[package]] @@ -4170,6 +4386,19 @@ dependencies = [ "objc2 0.5.2", ] +[[package]] +name = "objc2-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" +dependencies = [ + "bitflags 2.11.0", + "block2 0.6.2", + "libc", + "objc2 0.6.4", + "objc2-core-foundation", +] + [[package]] name = "objc2-io-kit" version = "0.3.2" @@ -4190,7 +4419,7 @@ dependencies = [ "block2 0.5.1", "objc2 0.5.2", "objc2-app-kit", - "objc2-foundation", + "objc2-foundation 0.2.2", ] [[package]] @@ -4202,7 +4431,19 @@ dependencies = [ "bitflags 2.11.0", "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-metal" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794" +dependencies = [ + "bitflags 2.11.0", + "block2 0.6.2", + "objc2 0.6.4", + "objc2-foundation 0.3.2", ] [[package]] @@ -4214,8 +4455,21 @@ dependencies = [ "bitflags 2.11.0", "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation", - "objc2-metal", + "objc2-foundation 0.2.2", + "objc2-metal 0.2.2", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" +dependencies = [ + "bitflags 2.11.0", + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-metal 0.3.2", ] [[package]] @@ -4225,7 +4479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" dependencies = [ "objc2 0.5.2", - "objc2-foundation", + "objc2-foundation 0.2.2", ] [[package]] @@ -4241,9 +4495,9 @@ dependencies = [ "objc2-core-data", "objc2-core-image", "objc2-core-location", - "objc2-foundation", + "objc2-foundation 0.2.2", "objc2-link-presentation", - "objc2-quartz-core", + "objc2-quartz-core 0.2.2", "objc2-symbols", "objc2-uniform-type-identifiers", "objc2-user-notifications", @@ -4257,7 +4511,7 @@ checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" dependencies = [ "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation", + "objc2-foundation 0.2.2", ] [[package]] @@ -4270,30 +4524,7 @@ dependencies = [ "block2 0.5.1", "objc2 0.5.2", "objc2-core-location", - "objc2-foundation", -] - -[[package]] -name = "oboe" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" -dependencies = [ - "jni", - "ndk 0.8.0", - "ndk-context", - "num-derive", - "num-traits", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" -dependencies = [ - "cc", + "objc2-foundation 0.2.2", ] [[package]] @@ -4409,14 +4640,41 @@ dependencies = [ "libc", "redox_syscall 0.5.18", "smallvec", - "windows-link 0.2.1", + "windows-link", +] + +[[package]] +name = "parlance" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6937eda350acc1a5d05872c3cbf99fe78619c269096e2be3d4a350058639d5" + +[[package]] +name = "parley" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fad031076f48f0d4d85ce1aea9b94b4e715a4d636a030a123038f8f5b5e4343" +dependencies = [ + "fontique", + "harfrust", + "hashbrown 0.17.1", + "icu_normalizer", + "icu_properties", + "icu_segmenter", + "linebender_resource_handle", + "parlance", + "parley_data", + "skrifa 0.42.1", ] [[package]] -name = "paste" -version = "1.0.15" +name = "parley_data" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +checksum = "19ab9ace3fad1b9ed603ddac5b595e69931fc50263d7e04e4055015b77b02da5" +dependencies = [ + "icu_properties", +] [[package]] name = "percent-encoding" @@ -4649,15 +4907,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - [[package]] name = "presser" version = "0.3.1" @@ -4680,7 +4929,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" dependencies = [ - "toml_edit", + "toml_edit 0.23.10+spec-1.0.0", ] [[package]] @@ -4715,7 +4964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.14.0", + "itertools", "log", "multimap", "petgraph", @@ -4734,7 +4983,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools", "proc-macro2", "quote", "syn 2.0.117", @@ -4794,16 +5043,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" -dependencies = [ - "rand_chacha", - "rand_core 0.9.5", -] - [[package]] name = "rand" version = "0.10.0" @@ -4814,31 +5053,12 @@ dependencies = [ "rand_core 0.10.0", ] -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.5", -] - [[package]] name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -[[package]] -name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] - [[package]] name = "rand_core" version = "0.10.0" @@ -4847,12 +5067,12 @@ checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" [[package]] name = "rand_distr" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463" +checksum = "4d431c2703ccf129de4d45253c03f49ebb22b97d6ad79ee3ecfc7e3f4862c1d8" dependencies = [ "num-traits", - "rand 0.9.2", + "rand 0.10.0", ] [[package]] @@ -4861,12 +5081,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08" -[[package]] -name = "rangemap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68" - [[package]] name = "ratatui" version = "0.30.0" @@ -4891,7 +5105,7 @@ dependencies = [ "compact_str", "hashbrown 0.16.1", "indoc", - "itertools 0.14.0", + "itertools", "kasuari", "lru", "strum", @@ -4943,7 +5157,7 @@ dependencies = [ "hashbrown 0.16.1", "indoc", "instability", - "itertools 0.14.0", + "itertools", "line-clipping", "ratatui-core", "strum", @@ -4958,6 +5172,18 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" +[[package]] +name = "raw-window-metal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135" +dependencies = [ + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", +] + [[package]] name = "read-fonts" version = "0.35.0" @@ -4965,18 +5191,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" dependencies = [ "bytemuck", - "font-types", + "font-types 0.10.1", ] [[package]] name = "read-fonts" -version = "0.36.0" +version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eaa2941a4c05443ee3a7b26ab076a553c343ad5995230cc2b1d3e993bdc6345" +checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81" dependencies = [ "bytemuck", - "core_maths", - "font-types", + "font-types 0.11.3", ] [[package]] @@ -5058,12 +5283,16 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "rodio" -version = "0.20.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ceb6607dd738c99bc8cb28eff249b7cd5c8ec88b9db96c0608c1480d140fb1" +checksum = "d0a536bb79db59098ef71a4dd4246c02eb87b316deceb1b68e0cde7167ec01eb" dependencies = [ "cpal", + "dasp_sample", "lewton", + "num-rational", + "thiserror 2.0.18", + "tracing", ] [[package]] @@ -5080,24 +5309,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - [[package]] name = "rustc-hash" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - [[package]] name = "rustc_version" version = "0.4.1" @@ -5188,12 +5405,6 @@ dependencies = [ "tiny-skia", ] -[[package]] -name = "self_cell" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" - [[package]] name = "semver" version = "1.0.27" @@ -5330,12 +5541,12 @@ dependencies = [ [[package]] name = "skrifa" -version = "0.39.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9eb0b904a04d09bd68c65d946617b8ff733009999050f3b851c32fb3cfb60e" +checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564" dependencies = [ "bytemuck", - "read-fonts 0.36.0", + "read-fonts 0.39.2", ] [[package]] @@ -5407,9 +5618,9 @@ dependencies = [ [[package]] name = "spirv" -version = "0.3.0+sdk-1.3.268.0" +version = "0.4.0+sdk-1.4.341.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f" dependencies = [ "bitflags 2.11.0", ] @@ -5529,23 +5740,23 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.37.2" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f" +checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f" dependencies = [ "libc", "memchr", "ntapi", "objc2-core-foundation", "objc2-io-kit", - "windows 0.61.3", + "windows", ] [[package]] name = "taffy" -version = "0.9.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ba83ebaf2954d31d05d67340fd46cebe99da2b7133b0dd68d70c65473a437b" +checksum = "aea22054047c16c3f34d3ac473a2170be1424b1115b2a3adcf28cfb067c88859" dependencies = [ "arrayvec", "grid", @@ -5768,6 +5979,15 @@ dependencies = [ "serde_core", ] +[[package]] +name = "toml_datetime" +version = "1.1.1+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" +dependencies = [ + "serde_core", +] + [[package]] name = "toml_edit" version = "0.23.10+spec-1.0.0" @@ -5775,7 +5995,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ "indexmap", - "toml_datetime", + "toml_datetime 0.7.5+spec-1.1.0", + "toml_parser", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.25.4+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2" +dependencies = [ + "indexmap", + "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", "winnow", ] @@ -5878,9 +6110,6 @@ name = "ttf-parser" version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" -dependencies = [ - "core_maths", -] [[package]] name = "twox-hash" @@ -5918,24 +6147,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" -[[package]] -name = "unicode-bidi" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" - [[package]] name = "unicode-ident" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - [[package]] name = "unicode-normalization" version = "0.1.25" @@ -5945,12 +6162,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-script" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" - [[package]] name = "unicode-segmentation" version = "1.12.0" @@ -5963,7 +6174,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5" dependencies = [ - "itertools 0.14.0", + "itertools", "unicode-segmentation", "unicode-width", ] @@ -5980,6 +6191,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -6275,9 +6492,16 @@ checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd" dependencies = [ "dlib", "log", + "once_cell", "pkg-config", ] +[[package]] +name = "weak-table" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" + [[package]] name = "web-sys" version = "0.3.91" @@ -6288,6 +6512,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-task" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdc136a53ccd64a1211f107ccc34404769fbcc0f165f1afa065f5d88ab93538" +dependencies = [ + "async-task", + "cfg-if", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "web-time" version = "1.1.0" @@ -6372,12 +6608,13 @@ dependencies = [ [[package]] name = "wgpu" -version = "27.0.1" +version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77" +checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07" dependencies = [ "arrayvec", "bitflags 2.11.0", + "bytemuck", "cfg-if", "cfg_aliases", "document-features", @@ -6399,13 +6636,13 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "27.0.3" +version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7" +checksum = "2f519832254e56965a9940c4af57dcb75f702b6f6fa4a0b172f685395843a4d7" dependencies = [ "arrayvec", - "bit-set 0.8.0", - "bit-vec 0.8.0", + "bit-set 0.9.1", + "bit-vec 0.9.1", "bitflags 2.11.0", "bytemuck", "cfg_aliases", @@ -6419,62 +6656,61 @@ dependencies = [ "portable-atomic", "profiling", "raw-window-handle", - "rustc-hash 1.1.0", + "rustc-hash", "smallvec", "thiserror 2.0.18", "wgpu-core-deps-apple", "wgpu-core-deps-wasm", "wgpu-core-deps-windows-linux-android", "wgpu-hal", + "wgpu-naga-bridge", "wgpu-types", ] [[package]] name = "wgpu-core-deps-apple" -version = "27.0.0" +version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" +checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-wasm" -version = "27.0.0" +version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1027dcf3b027a877e44819df7ceb0e2e98578830f8cd34cd6c3c7c2a7a50b7" +checksum = "af1fb1798be2a912497d4c224f72d39bb0cb34af50e8bcc29865bc339c943059" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-windows-linux-android" -version = "27.0.0" +version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3" +checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "27.0.4" +version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce" +checksum = "97ace1c17727311c22a46e4e3faf56ea6de81af99dcc839bdfb54857b94d448d" dependencies = [ "android_system_properties", "arrayvec", "ash", - "bit-set 0.8.0", + "bit-set 0.9.1", "bitflags 2.11.0", - "block", + "block2 0.6.2", "bytemuck", "cfg-if", "cfg_aliases", - "core-graphics-types 0.2.0", "glow", "glutin_wgl_sys", - "gpu-alloc", "gpu-allocator", "gpu-descriptor", "hashbrown 0.16.1", @@ -6483,10 +6719,13 @@ dependencies = [ "libc", "libloading", "log", - "metal", "naga", - "ndk-sys 0.6.0+11769913", - "objc", + "ndk-sys", + "objc2 0.6.4", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-metal 0.3.2", + "objc2-quartz-core 0.3.2", "once_cell", "ordered-float 5.1.0", "parking_lot 0.12.5", @@ -6495,28 +6734,42 @@ dependencies = [ "profiling", "range-alloc", "raw-window-handle", + "raw-window-metal", "renderdoc-sys", "smallvec", "thiserror 2.0.18", "wasm-bindgen", + "wayland-sys", "web-sys", + "wgpu-naga-bridge", + "wgpu-types", + "windows", + "windows-core", + "windows-result", +] + +[[package]] +name = "wgpu-naga-bridge" +version = "29.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161" +dependencies = [ + "naga", "wgpu-types", - "windows 0.58.0", - "windows-core 0.58.0", ] [[package]] name = "wgpu-types" -version = "27.0.1" +version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb" +checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5" dependencies = [ "bitflags 2.11.0", "bytemuck", "js-sys", "log", + "raw-window-handle", "serde", - "thiserror 2.0.18", "web-sys", ] @@ -6551,58 +6804,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.61.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" -dependencies = [ - "windows-collections 0.2.0", - "windows-core 0.61.2", - "windows-future 0.2.1", - "windows-link 0.1.3", - "windows-numerics 0.2.0", -] - [[package]] name = "windows" version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ - "windows-collections 0.3.2", - "windows-core 0.62.2", - "windows-future 0.3.2", - "windows-numerics 0.3.1", -] - -[[package]] -name = "windows-collections" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" -dependencies = [ - "windows-core 0.61.2", + "windows-collections", + "windows-core", + "windows-future", + "windows-numerics", ] [[package]] @@ -6611,43 +6822,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ - "windows-core 0.62.2", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement 0.58.0", - "windows-interface 0.58.0", - "windows-result 0.2.0", - "windows-strings 0.1.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" -dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", + "windows-core", ] [[package]] @@ -6656,22 +6831,11 @@ version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", -] - -[[package]] -name = "windows-future" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" -dependencies = [ - "windows-core 0.61.2", - "windows-link 0.1.3", - "windows-threading 0.1.0", + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] @@ -6680,20 +6844,9 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ - "windows-core 0.62.2", - "windows-link 0.2.1", - "windows-threading 0.2.1", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", + "windows-core", + "windows-link", + "windows-threading", ] [[package]] @@ -6707,17 +6860,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "windows-interface" version = "0.59.3" @@ -6729,63 +6871,20 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-numerics" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" -dependencies = [ - "windows-core 0.61.2", - "windows-link 0.1.3", -] - [[package]] name = "windows-numerics" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ - "windows-core 0.62.2", - "windows-link 0.2.1", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" -dependencies = [ - "windows-link 0.1.3", + "windows-core", + "windows-link", ] [[package]] @@ -6794,26 +6893,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" -dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -6822,7 +6902,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -6867,7 +6947,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -6907,7 +6987,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link 0.2.1", + "windows-link", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -6918,22 +6998,13 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] -[[package]] -name = "windows-threading" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" -dependencies = [ - "windows-link 0.1.3", -] - [[package]] name = "windows-threading" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -7089,17 +7160,17 @@ dependencies = [ "calloop", "cfg_aliases", "concurrent-queue", - "core-foundation 0.9.4", + "core-foundation", "core-graphics", "cursor-icon", "dpi", "js-sys", "libc", "memmap2", - "ndk 0.9.0", + "ndk", "objc2 0.5.2", "objc2-app-kit", - "objc2-foundation", + "objc2-foundation 0.2.2", "objc2-ui-kit", "orbclient", "percent-encoding", @@ -7474,6 +7545,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", + "yoke", + "zerofrom", ] [[package]] diff --git a/crates/bevy_plugin/Cargo.toml b/crates/bevy_plugin/Cargo.toml index eb5d3972..35953b2d 100644 --- a/crates/bevy_plugin/Cargo.toml +++ b/crates/bevy_plugin/Cargo.toml @@ -26,7 +26,7 @@ sha2 = "0.10" variadics_please = "1" [dependencies.bevy] -version = "0.18" +version = "0.19" default-features = false features = [ "bevy_asset", "multi_threaded", "bevy_log" ] @@ -35,7 +35,7 @@ tempfile = "3" static_assertions = "1.1.0" [dev-dependencies.bevy] -version = "0.18" +version = "0.19" default-features = false features = [ "bevy_core_pipeline", "bevy_audio" ] diff --git a/crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs b/crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs index ff8f08ba..0213af5d 100644 --- a/crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs +++ b/crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs @@ -38,7 +38,8 @@ fn continue_runtime( Commands, )> = SystemState::new(world); - let (mut dialogue_runners, loaded_untyped_assets, mut commands) = system_state.get_mut(world); + let (mut dialogue_runners, loaded_untyped_assets, mut commands) = + system_state.get_mut(world)?; let mut dialogues: HashMap<_, _, FixedHasher> = HashMap::default(); @@ -125,7 +126,7 @@ fn continue_runtime( Commands, )> = SystemState::new(world); - let (mut dialogue_runners, project, mut commands) = system_state.get_mut(world); + let (mut dialogue_runners, project, mut commands) = system_state.get_mut(world)?; for (source, mut dialogue_runner) in dialogue_runners.iter_mut() { if let Some((dialogue, is_sending_missed_events, _, Some(events))) = diff --git a/crates/bevy_plugin/src/line_provider/asset_provider/file_extension_asset_provider_plugin.rs b/crates/bevy_plugin/src/line_provider/asset_provider/file_extension_asset_provider_plugin.rs index 17e2f98c..c8873888 100644 --- a/crates/bevy_plugin/src/line_provider/asset_provider/file_extension_asset_provider_plugin.rs +++ b/crates/bevy_plugin/src/line_provider/asset_provider/file_extension_asset_provider_plugin.rs @@ -230,7 +230,7 @@ impl FileExtensionAssetProvider { ); let path = dir.join(file_name); let asset_path = path.to_string_lossy().replace('\\', "/"); - let handle = asset_server.load_untyped(asset_path); + let handle = asset_server.load_builder().load_untyped(asset_path); self.loading_handles.insert(path, handle); } } diff --git a/crates/bevy_plugin/src/localization/line_id_generation.rs b/crates/bevy_plugin/src/localization/line_id_generation.rs index adf4a8ee..e7389ba4 100644 --- a/crates/bevy_plugin/src/localization/line_id_generation.rs +++ b/crates/bevy_plugin/src/localization/line_id_generation.rs @@ -15,9 +15,10 @@ pub(crate) fn line_id_generation_plugin(app: &mut App) { ( handle_yarn_file_events .pipe(panic_on_err) - .run_if(in_development.and(has_localizations)), + .run_if(in_development.and_then(has_localizations)), handle_yarn_file_events_outside_development.run_if( - resource_exists::.and(not(in_development.and(has_localizations))), + resource_exists:: + .and_then(not(in_development.and_then(has_localizations))), ), ) .chain() @@ -135,7 +136,7 @@ fn handle_yarn_file_events( if is_watching { added_tags.insert(*id); } else { - let yarn_file = assets.get_mut(*id).unwrap(); + let mut yarn_file = assets.get_mut(*id).unwrap(); yarn_file.file.source = source_with_added_ids; let string_table = YarnCompiler::new() diff --git a/crates/bevy_plugin/src/localization/strings_file/asset.rs b/crates/bevy_plugin/src/localization/strings_file/asset.rs index 11173b0c..8942e8c7 100644 --- a/crates/bevy_plugin/src/localization/strings_file/asset.rs +++ b/crates/bevy_plugin/src/localization/strings_file/asset.rs @@ -109,7 +109,7 @@ impl StringsFile { && !record.text.starts_with(UPDATE_PREFIX) && !text_is_copied_from_base_language { - format!("{UPDATE_PREFIX}{}", &record.text) + format!("{UPDATE_PREFIX}{}", record.text) } else if !text_is_copied_from_base_language { // not `other_record` because that one might not contain (NEEDS UPDATE) record.text.clone() diff --git a/crates/bevy_plugin/src/localization/strings_file/updating.rs b/crates/bevy_plugin/src/localization/strings_file/updating.rs index fb63120b..6fceda2f 100644 --- a/crates/bevy_plugin/src/localization/strings_file/updating.rs +++ b/crates/bevy_plugin/src/localization/strings_file/updating.rs @@ -13,9 +13,9 @@ pub(crate) fn strings_file_updating_plugin(app: &mut App) { .in_set(YarnSpinnerSystemSet) .run_if( in_development - .and(has_localizations) - .and(resource_exists::) - .and(events_in_queue::()), + .and_then(has_localizations) + .and_then(resource_exists::) + .and_then(events_in_queue::()), ),) .chain(), ); @@ -77,9 +77,9 @@ fn update_all_strings_files_for_string_table( .collect(); let file_names = file_names.into_iter().collect::>().join(", "); for (language, strings_file_handle) in languages_to_handles.clone() { - let strings_file = strings_files.get_mut(&strings_file_handle).unwrap(); + let mut strings_file = strings_files.get_mut(&strings_file_handle).unwrap(); lint_strings_file( - strings_file, + &strings_file, &expected_file_names, &asset_server, &strings_file_handle, diff --git a/crates/bevy_plugin/tests/test_strings_tables.rs b/crates/bevy_plugin/tests/test_strings_tables.rs index 20659c69..5c2f1f73 100644 --- a/crates/bevy_plugin/tests/test_strings_tables.rs +++ b/crates/bevy_plugin/tests/test_strings_tables.rs @@ -174,6 +174,7 @@ fn appends_to_pre_existing_strings_file() -> anyhow::Result<()> { let handle = app .world() .resource::() + .load_builder() .load_untyped("dialogue/de-CH.strings.csv"); while app .world() @@ -241,16 +242,16 @@ fn replaces_entries_in_strings_file() -> anyhow::Result<()> { .world_mut() .get_resource_mut::>() .unwrap(); - let yarn_file = yarn_file_assets.get_mut(&handle).unwrap(); + let mut yarn_file = yarn_file_assets.get_mut(&handle).unwrap(); let strings_file_source = fs::read_to_string(&strings_file_path)?.replace("*third*", "*dritter*"); fs::write(&strings_file_path, strings_file_source)?; - let mut lines: Vec<_> = yarn_file.content().lines().collect(); - *lines.get_mut(2).unwrap() = "Changed line without translation #line:1"; - *lines.get_mut(3).unwrap() = "Changed line with prior translation#line:2"; - lines.insert(4, "Inserted line #line:13"); + let mut lines: Vec<_> = yarn_file.content().lines().map(str::to_owned).collect(); + *lines.get_mut(2).unwrap() = "Changed line without translation #line:1".to_owned(); + *lines.get_mut(3).unwrap() = "Changed line with prior translation#line:2".to_owned(); + lines.insert(4, "Inserted line #line:13".to_owned()); lines.remove(6); yarn_file.set_content(lines.join("\n"))?; } diff --git a/crates/bevy_plugin/tests/utils/mod.rs b/crates/bevy_plugin/tests/utils/mod.rs index 7fda42b2..b24b91f0 100644 --- a/crates/bevy_plugin/tests/utils/mod.rs +++ b/crates/bevy_plugin/tests/utils/mod.rs @@ -80,7 +80,7 @@ impl AppExt for App { } let mut system_state: SystemState<(Commands, Res)> = SystemState::new(self.world_mut()); - let (mut commands, yarn_project) = system_state.get_mut(self.world_mut()); + let (mut commands, yarn_project) = system_state.get_mut(self.world_mut()).unwrap(); yarn_project.build_dialogue_runner(&mut commands) } @@ -126,7 +126,7 @@ impl AppExt for App { self.load_project(); let mut system_state: SystemState<(Commands, Res)> = SystemState::new(self.world_mut()); - let (mut commands, yarn_project) = system_state.get_mut(self.world_mut()); + let (mut commands, yarn_project) = system_state.get_mut(self.world_mut()).unwrap(); let dialogue_runner = yarn_project.create_dialogue_runner(&mut commands); system_state.apply(self.world_mut()); self.world_mut().spawn(dialogue_runner).id() diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml index 5136d1bb..32ce0de0 100644 --- a/crates/compiler/Cargo.toml +++ b/crates/compiler/Cargo.toml @@ -23,7 +23,7 @@ yarnspinner_core = { path = "../core", version = "0.8.0" } annotate-snippets = "0.12" serde = { version = "1", features = [ "derive" ], optional = true } serde_json = { version = "1", optional = true } -bevy = { version = "0.18", default-features = false, optional = true } +bevy = { version = "0.19", default-features = false, optional = true } rand = { version = "0.10", default-features = false } crc32fast = "1.5" globset = "0.4" diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 9be589e7..6ce88c53 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -22,7 +22,7 @@ bevy = [ "dep:bevy" ] rand = { version = "0.10", default-features = false, features = [ "sys_rng" ] } prost = { version = "0.14", default-features = false, features = [ "derive" ] } serde = { version = "1", features = [ "derive" ], optional = true } -bevy = { version = "0.18", default-features = false, optional = true, features = [ "std" ] } +bevy = { version = "0.19", default-features = false, optional = true, features = [ "std" ] } variadics_please = "1.1.0" hashbrown = "0.16.1" yarnspinner_internal_shared = { path = "../internal_shared", version = "0.1.0" } diff --git a/crates/example_dialogue_view/Cargo.toml b/crates/example_dialogue_view/Cargo.toml index a6a36cd5..7a318e3a 100644 --- a/crates/example_dialogue_view/Cargo.toml +++ b/crates/example_dialogue_view/Cargo.toml @@ -18,7 +18,7 @@ bevy_yarnspinner = { path = "../bevy_plugin", version = "0.8.0" } unicode-segmentation = "1" [dependencies.bevy] -version = "0.18" +version = "0.19" default-features = false features = [ "bevy_ui", diff --git a/crates/example_dialogue_view/src/assets.rs b/crates/example_dialogue_view/src/assets.rs index b8b456b3..0f389adf 100644 --- a/crates/example_dialogue_view/src/assets.rs +++ b/crates/example_dialogue_view/src/assets.rs @@ -20,7 +20,7 @@ pub(crate) fn ui_assets_plugin(app: &mut App) { } fn load_font(bytes: &[u8], _path: String) -> Font { - Font::try_from_bytes(bytes.to_vec()).unwrap() + Font::from_bytes(bytes.to_vec()) } fn load_image(bytes: &[u8], _path: String) -> Image { diff --git a/crates/example_dialogue_view/src/option_selection.rs b/crates/example_dialogue_view/src/option_selection.rs index 94bd4343..77cfa79b 100644 --- a/crates/example_dialogue_view/src/option_selection.rs +++ b/crates/example_dialogue_view/src/option_selection.rs @@ -4,6 +4,7 @@ use crate::typewriter::{Typewriter, TypewriterFinishedEvent}; use bevy::color::palettes::css; use bevy::platform::collections::HashMap; use bevy::prelude::*; +use bevy::text::TextLayoutInfo; use bevy::window::{CursorIcon, PrimaryWindow, SystemCursorIcon}; use bevy_yarnspinner::{events::*, prelude::*}; @@ -12,9 +13,10 @@ pub(crate) fn option_selection_plugin(app: &mut App) { Update, ( create_options.run_if(resource_added::), + hack_sync_option_text_min_height.run_if(resource_exists::), show_options, select_option.run_if( - resource_exists::.and(any_with_component::), + resource_exists::.and_then(any_with_component::), ), ) .chain() @@ -65,6 +67,19 @@ fn create_options( } } +/// Looks like something is layouting the box for just one line instead of multiple ones +/// when text is wrapped. So let's force sync stuff. +fn hack_sync_option_text_min_height( + mut option_texts: Query<(&TextLayoutInfo, &mut Node), With>, +) { + for (layout_info, mut node) in &mut option_texts { + let min_height = Val::Px(layout_info.size.y); + if node.min_height != min_height { + node.min_height = min_height; + } + } +} + fn show_options( mut typewriter_finished_event: MessageReader, mut options_node: Single<&mut Visibility, With>, diff --git a/crates/example_dialogue_view/src/setup.rs b/crates/example_dialogue_view/src/setup.rs index b6e5ff08..cdad8dee 100644 --- a/crates/example_dialogue_view/src/setup.rs +++ b/crates/example_dialogue_view/src/setup.rs @@ -226,8 +226,8 @@ mod text_style { pub(crate) fn standard() -> (TextFont, TextColor) { ( TextFont { - font: font_handle::MEDIUM, - font_size: 20.0, + font: FontSource::Handle(font_handle::MEDIUM), + font_size: FontSize::Px(20.0), ..default() }, TextColor(Color::WHITE), @@ -236,8 +236,8 @@ mod text_style { pub(crate) fn name() -> (TextFont, TextColor) { ( TextFont { - font: font_handle::MEDIUM, - font_size: 18.0, + font: FontSource::Handle(font_handle::MEDIUM), + font_size: FontSize::Px(18.0), ..standard().0 }, standard().1, @@ -247,7 +247,7 @@ mod text_style { pub(crate) fn option_id() -> (TextFont, TextColor) { ( TextFont { - font: font_handle::MEDIUM, + font: FontSource::Handle(font_handle::MEDIUM), ..option_text().0 }, TextColor(css::ALICE_BLUE.into()), @@ -257,7 +257,7 @@ mod text_style { pub(crate) fn option_text() -> (TextFont, TextColor) { ( TextFont { - font_size: 18.0, + font_size: FontSize::Px(18.0), ..standard().0 }, TextColor(css::TOMATO.into()), diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml index 5219309a..382d0dbd 100644 --- a/crates/runtime/Cargo.toml +++ b/crates/runtime/Cargo.toml @@ -39,8 +39,8 @@ fixed_decimal = { version = "0.7", default-features = false, features = [ once_cell = "1" regex = "1" serde = { version = "1", features = ["derive"], optional = true } -bevy = { version = "0.18.0", default-features = false, features = ["bevy_log"], optional = true } -bevy_platform = { version = "0.18.0", features = ["alloc"] } +bevy = { version = "0.19.0", default-features = false, features = ["bevy_log"], optional = true } +bevy_platform = { version = "0.19.0", features = ["alloc"] } [lints.clippy] std_instead_of_core = "warn" diff --git a/crates/yarnspinner/Cargo.toml b/crates/yarnspinner/Cargo.toml index 46e81081..3ae2643b 100644 --- a/crates/yarnspinner/Cargo.toml +++ b/crates/yarnspinner/Cargo.toml @@ -32,9 +32,9 @@ yarnspinner_core = { path = "../core", version = "0.8.0" } yarnspinner_compiler = { path = "../compiler", version = "0.8.0" } yarnspinner_runtime = { path = "../runtime", version = "0.8.0" } log = { version = "0.4", features = ["std"] } -bevy = { version = "0.18", default-features = false, optional = true } +bevy = { version = "0.19", default-features = false, optional = true } [dev-dependencies] regex = "1" anyhow = "1" -bevy_platform = "0.18" +bevy_platform = "0.19" diff --git a/crates/yarnspinner/tests/test_base/step/reader.rs b/crates/yarnspinner/tests/test_base/step/reader.rs index c23ff1dc..f016b776 100644 --- a/crates/yarnspinner/tests/test_base/step/reader.rs +++ b/crates/yarnspinner/tests/test_base/step/reader.rs @@ -33,10 +33,7 @@ impl<'a> Reader<'a> { /// Parse the next T from this string, ignoring leading whitespace fn read_next_raw(&mut self) -> String { let mut string = String::new(); - loop { - let Some(character) = self.read_char() else { - break; - }; + while let Some(character) = self.read_char() { if character.is_whitespace() { // eat leading whitespace continue; diff --git a/crates/yarnspinner/tests/type_tests.rs b/crates/yarnspinner/tests/type_tests.rs index 48f9b20e..4ecbab9a 100644 --- a/crates/yarnspinner/tests/type_tests.rs +++ b/crates/yarnspinner/tests/type_tests.rs @@ -83,10 +83,7 @@ fn test_variable_declarations_parsed() { ]; let actual_declarations = result.declarations; - for (expected, actual) in expected_declarations - .iter() - .zip(actual_declarations.into_iter()) - { + for (expected, actual) in expected_declarations.iter().zip(actual_declarations) { assert_eq!(expected.name, actual.name); assert_eq!(expected.r#type, actual.r#type); assert_eq!(expected.default_value, actual.default_value); diff --git a/demo/Cargo.toml b/demo/Cargo.toml index f16ed866..c6ecbf6e 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -12,10 +12,10 @@ license = "MIT OR Apache-2.0" publish = false [dependencies] -bevy = { version = "0.18.0" } +bevy = { version = "0.19.0" } bevy_yarnspinner = { path = "../crates/bevy_plugin", version = "0.8.0" } bevy_yarnspinner_example_dialogue_view = { path = "../crates/example_dialogue_view", version = "0.8.0" } -bevy_sprite3d = "8.0.0" +bevy_sprite3d = "9.0.0" [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { version = "0.4", features = ["wasm_js"] } diff --git a/demo/src/main.rs b/demo/src/main.rs index b9208e99..36b1b65c 100644 --- a/demo/src/main.rs +++ b/demo/src/main.rs @@ -5,8 +5,8 @@ use self::{setup::*, visual_effects::*, yarnspinner_integration::*}; use bevy::asset::AssetMetaCheck; use bevy::color::palettes::css; use bevy::prelude::*; -use bevy::scene::SceneInstance; use bevy::window::PresentMode; +use bevy::world_serialization::WorldInstance; use bevy_sprite3d::Sprite3dPlugin; use bevy_yarnspinner::prelude::*; use bevy_yarnspinner_example_dialogue_view::prelude::*; @@ -45,7 +45,7 @@ fn main() { Update, ( spawn_dialogue_runner.run_if(resource_added::), - adapt_materials.run_if(any_with_component::), + adapt_materials.run_if(any_with_component::), spawn_sprites.run_if(sprites_have_loaded), ), ) diff --git a/demo/src/setup.rs b/demo/src/setup.rs index 5e3c8ba2..0eb91a59 100644 --- a/demo/src/setup.rs +++ b/demo/src/setup.rs @@ -4,7 +4,7 @@ use crate::yarnspinner_integration::{ show_bang, }; use crate::{CAMERA_TRANSLATION, CLIPPY_TRANSLATION, FERRIS_TRANSLATION, Sprites}; -use bevy::camera::Exposure; +use bevy::camera::{Exposure, Hdr}; use bevy::color::palettes::css; use bevy::core_pipeline::tonemapping::Tonemapping; use bevy::gltf::Gltf; @@ -12,7 +12,6 @@ use bevy::light::CascadeShadowConfigBuilder; #[cfg(not(target_arch = "wasm32"))] use bevy::post_process::bloom::Bloom; use bevy::prelude::*; -use bevy::render::view::Hdr; use bevy_sprite3d::prelude::*; use bevy_yarnspinner::prelude::*; @@ -35,14 +34,14 @@ pub(crate) fn setup(mut commands: Commands, asset_server: Res) { }, MainCamera, )); - commands.spawn(SceneRoot( + commands.spawn(WorldAssetRoot( asset_server.load("models/coffee_shop.glb#Scene0"), )); commands.spawn(( DirectionalLight { color: css::BISQUE.into(), illuminance: light_consts::lux::OVERCAST_DAY, - shadows_enabled: true, + shadow_maps_enabled: true, ..default() }, CascadeShadowConfigBuilder { @@ -64,7 +63,7 @@ pub(crate) fn setup(mut commands: Commands, asset_server: Res) { PointLight { color: Color::srgb(1.0, 0.78, 0.45), intensity: 10_000., - shadows_enabled: true, + shadow_maps_enabled: true, ..default() }, Transform::from_xyz(x, y, z), @@ -135,7 +134,13 @@ pub(crate) fn adapt_materials( return; }; let glass_handle = gltf.named_materials.get("Glass").unwrap(); - let glass_material = materials.get_mut(glass_handle).unwrap(); + let glass_path = asset_server + .get_path(glass_handle.id()) + .unwrap() + .into_owned(); + let std_label = format!("{}/std", glass_path.label().unwrap()); + let std_handle: Handle = asset_server.load(glass_path.with_label(std_label)); + let mut glass_material = materials.get_mut(&std_handle).unwrap(); // No way to export this from Blender, unfortunately glass_material.alpha_mode = AlphaMode::Add; *done = true; diff --git a/demo/src/visual_effects.rs b/demo/src/visual_effects.rs index 2b8bf897..ecd18f20 100644 --- a/demo/src/visual_effects.rs +++ b/demo/src/visual_effects.rs @@ -47,7 +47,7 @@ pub(crate) fn rotate_sprite( let rotation_half_way_done = output >= 0.5; if rotation_half_way_done && let Some(new_sprite) = sprite.take() { - let material = materials.get_mut(material).unwrap(); + let mut material = materials.get_mut(material).unwrap(); material.base_color_texture.replace(new_sprite); } if change.is_done() { @@ -126,7 +126,7 @@ pub(crate) fn ease_bang( mut commands: Commands, ) { for (entity, bang, mut transform, material) in bangs.iter_mut() { - let material = standard_materials.get_mut(material).unwrap(); + let mut material = standard_materials.get_mut(material).unwrap(); if bang.0.start_time.elapsed().as_secs_f32() >= bang.0.duration * 3.0 { commands.entity(entity).despawn(); material.base_color.set_alpha(0.0); diff --git a/examples/bevy_yarnspinner/Cargo.toml b/examples/bevy_yarnspinner/Cargo.toml index 94cd19df..051f65ec 100644 --- a/examples/bevy_yarnspinner/Cargo.toml +++ b/examples/bevy_yarnspinner/Cargo.toml @@ -10,7 +10,7 @@ authors = ["Jan Hohenheim "] publish = false [dependencies] -bevy = { version = "0.18", features = ["file_watcher"] } +bevy = { version = "0.19", features = ["file_watcher"] } bevy_yarnspinner = { path = "../../crates/bevy_plugin", version = "0.8" } bevy_yarnspinner_example_dialogue_view = { path = "../../crates/example_dialogue_view", version = "0.8" } diff --git a/readme.md b/readme.md index 8046c3ba..87b9d45c 100644 --- a/readme.md +++ b/readme.md @@ -137,6 +137,7 @@ cargo run | Bevy | Yarn Spinner for Rust | Yarn Spinner | |-------------|---------------------- |--------------| +| 0.19 | 0.9 | 2.5.0 | | 0.18 | 0.8 | 2.5.0 | | 0.18 | 0.7 | 2.3.0 | | 0.17 | 0.6 | 2.3.0 |