diff --git a/Cargo.lock b/Cargo.lock
index f630092a0b8ebad722e786b8f507cd8241efdb34..bcbb830c2e39628dd980d878fb5ab045c0c6f089 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,24 +20,24 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
[[package]]
name = "accesskit"
-version = "0.11.2"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
+checksum = "ca8410747ed85a17c4a1e9ed3f5a74d3e7bdcc876cf9a18ff40ae21d645997b2"
[[package]]
name = "accesskit_consumer"
-version = "0.15.2"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00"
+checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6"
dependencies = [
"accesskit",
]
[[package]]
name = "accesskit_macos"
-version = "0.9.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56"
+checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
dependencies = [
"accesskit",
"accesskit_consumer",
@@ -47,23 +47,23 @@ dependencies = [
[[package]]
name = "accesskit_windows"
-version = "0.14.3"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31"
+checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b"
dependencies = [
"accesskit",
"accesskit_consumer",
- "arrayvec",
"once_cell",
"paste",
+ "static_assertions",
"windows 0.48.0",
]
[[package]]
name = "accesskit_winit"
-version = "0.14.4"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0"
+checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738"
dependencies = [
"accesskit",
"accesskit_macos",
@@ -118,12 +118,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "aliasable"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
-
[[package]]
name = "allocator-api2"
version = "0.2.16"
@@ -169,12 +163,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "anyhow"
-version = "1.0.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
-
[[package]]
name = "approx"
version = "0.5.1"
@@ -203,6 +191,12 @@ dependencies = [
"x11rb",
]
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
[[package]]
name = "arrayvec"
version = "0.7.4"
@@ -218,6 +212,16 @@ dependencies = [
"libloading 0.7.4",
]
+[[package]]
+name = "async-broadcast"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
+dependencies = [
+ "event-listener",
+ "futures-core",
+]
+
[[package]]
name = "async-channel"
version = "1.9.0"
@@ -238,11 +242,23 @@ dependencies = [
"async-lock",
"async-task",
"concurrent-queue",
- "fastrand",
+ "fastrand 1.9.0",
"futures-lite",
"slab",
]
+[[package]]
+name = "async-fs"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
+dependencies = [
+ "async-lock",
+ "autocfg",
+ "blocking",
+ "futures-lite",
+]
+
[[package]]
name = "async-lock"
version = "2.8.0"
@@ -258,6 +274,12 @@ version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
[[package]]
name = "autocfg"
version = "1.1.0"
@@ -287,18 +309,18 @@ checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
[[package]]
name = "bevy"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e71a9143ac21bed247c30129399af8be170309e7ff5983a1bd37e87d3da520"
+checksum = "329e344f835f5a9a4c46a6d1d57371f726aa2c482d1bd669b2b9c4eb1ee91fd7"
dependencies = [
"bevy_internal",
]
[[package]]
name = "bevy_a11y"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d87d5753cefaeb5f5c5d5e937844f5386eabaf9ab95f3013e86d8fb438d424e"
+checksum = "271b812e5734f5056a400f7d64592dd82d6c0e6179389c2f066f433ab8bc7692"
dependencies = [
"accesskit",
"bevy_app",
@@ -308,9 +330,9 @@ dependencies = [
[[package]]
name = "bevy_app"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb660188d5d4ceaead6d5861ce22ecedc08b68c385cc8edf0a3c0c0285560bf"
+checksum = "172d532ea812e5954fa814dae003c207f2a0b20c6e50431787c94a7159677ece"
dependencies = [
"bevy_derive",
"bevy_ecs",
@@ -324,25 +346,29 @@ dependencies = [
[[package]]
name = "bevy_asset"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6733d20a22bb10da928785fdbf6fad6cfb1c7da4a8c170ab3adbba5862c375d5"
+checksum = "ccb2b67984088b23e223cfe9ec1befd89a110665a679acb06839bc4334ed37d6"
dependencies = [
- "anyhow",
- "async-channel",
+ "async-broadcast",
+ "async-fs",
+ "async-lock",
"bevy_app",
- "bevy_diagnostic",
+ "bevy_asset_macros",
"bevy_ecs",
"bevy_log",
"bevy_reflect",
"bevy_tasks",
"bevy_utils",
"bevy_winit",
+ "blake3",
"crossbeam-channel",
"downcast-rs",
- "fastrand",
+ "futures-io",
+ "futures-lite",
"js-sys",
"parking_lot",
+ "ron",
"serde",
"thiserror",
"wasm-bindgen",
@@ -350,11 +376,23 @@ dependencies = [
"web-sys",
]
+[[package]]
+name = "bevy_asset_macros"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b3245193e90fc8abcf1059a467cb224501dcda083d114c67c10ac66b7171e3a"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
[[package]]
name = "bevy_core"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d47b435bdebeefedda95de98a419c4d3b4c160ed8ce3470ea358a16aad6038"
+checksum = "025e6800b73048092a55c3611e9327ad4c4c17b60517ec1c0086bb40b4b19ea8"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -367,15 +405,16 @@ dependencies = [
[[package]]
name = "bevy_core_pipeline"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01c2652f5a6d24e0ab465e6feca8a034dfb33dfefbcdc19e436fec879a362a8"
+checksum = "2e4b08a2d53ba62d9ec1fca3f7f4e0f556e9f59e1c8e63a4b7c2a18c0701152c"
dependencies = [
"bevy_app",
"bevy_asset",
"bevy_core",
"bevy_derive",
"bevy_ecs",
+ "bevy_log",
"bevy_math",
"bevy_reflect",
"bevy_render",
@@ -405,9 +444,9 @@ dependencies = [
[[package]]
name = "bevy_derive"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5cc78985f4d0ad1fd7b8ead06dcfaa192685775a7b1be158191c788c7d52298"
+checksum = "24bf40259be12a1a24d9fd536f5ff18d31eeb5665b77e2732899783be6edc5d6"
dependencies = [
"bevy_macro_utils",
"quote",
@@ -416,9 +455,9 @@ dependencies = [
[[package]]
name = "bevy_diagnostic"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4e366724d233fdc7e282e1415f4cd570e97fbb8443e5a8ff3f8cc5ae253ffd"
+checksum = "41b5a99a9fb6cd7d1eb1714fad193944a0317f0887a15cccb8309c8d37951132"
dependencies = [
"bevy_app",
"bevy_core",
@@ -431,9 +470,9 @@ dependencies = [
[[package]]
name = "bevy_ecs"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6fd0ec64cd32b8fcf16157173431ba0e675b29c4643a8d6c9a9eeef6f93c32"
+checksum = "ae11a1f467c372b50e9d4b55e78370f5420c9db7416200cc441cc84f08174dd3"
dependencies = [
"async-channel",
"bevy_ecs_macros",
@@ -452,9 +491,9 @@ dependencies = [
[[package]]
name = "bevy_ecs_macros"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13b0fd864433db6ff825efd0eb86b2690e208151905b184cc9bfd2c3ac66c3b"
+checksum = "f642c2b67c4d0daf8edf15074f6351457eb487a34b3de1290c760d8f3ac9ec16"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -464,9 +503,9 @@ dependencies = [
[[package]]
name = "bevy_encase_derive"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da8ffb3d214ee4d8b7e851bc8409768a0f18c872c3a25065c248611ff832180e"
+checksum = "65b9fb5a62c4e3ab70caaa839470d35fa932001b1b34b08bc7f7f1909bd2b3a7"
dependencies = [
"bevy_macro_utils",
"encase_derive_impl",
@@ -474,9 +513,9 @@ dependencies = [
[[package]]
name = "bevy_gizmos"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c08196fcb36b7175577443cbe2c1193d596a15eb0fa210bae378e6e1478876"
+checksum = "87d1cc978b91f416b23eb16f00e69f95c3a04582021827d8082e92d4725cc510"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -493,9 +532,9 @@ dependencies = [
[[package]]
name = "bevy_hierarchy"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402789ee53acf345243cf2c86a895d6cf8631e533780ed261c6ecf891eb050b8"
+checksum = "64fa240011fce8ee23f9b46e5a26a628a31d7860d6d2e4e0e361bb3ea6d5a703"
dependencies = [
"bevy_app",
"bevy_core",
@@ -508,9 +547,9 @@ dependencies = [
[[package]]
name = "bevy_input"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9dfd9c768cf153f3fc807661996b2db44b824299860ba198fb3b92dd731bdd8"
+checksum = "9e86e241b3a10b79f65a69205552546723b855d3d4c1bd8261637c076144d32f"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -522,9 +561,9 @@ dependencies = [
[[package]]
name = "bevy_internal"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1006f2c501bceb1aef5cc18ed07eb822f295763227b83ba6887e6743698af9f8"
+checksum = "55124e486814c4d3632d5cfad9c4f4e46d052c028593ec46fef5bfbfb0f840b1"
dependencies = [
"bevy_a11y",
"bevy_app",
@@ -556,9 +595,9 @@ dependencies = [
[[package]]
name = "bevy_log"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b1e5ca5b217dd384a3bf9186df0d0da757035f9f06d8eec0ebe62cffc05c34"
+checksum = "011417debf7868b45932bb97fc0d5bfdeaf9304e324aa94840e2f1e6deeed69d"
dependencies = [
"android_log-sys",
"bevy_app",
@@ -572,21 +611,22 @@ dependencies = [
[[package]]
name = "bevy_macro_utils"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd460205fe05634d58b32d9bb752b1b4eaf32b2d29cbd4161ba35eb44a2f8c"
+checksum = "cf6fba87c6d069fcbcd8a48625ca8ab4392ad40d2b260863ce7d641a0f42986d"
dependencies = [
+ "proc-macro2",
"quote",
"rustc-hash",
"syn 2.0.37",
- "toml_edit",
+ "toml_edit 0.20.7",
]
[[package]]
name = "bevy_math"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267f2ec44aa948051768b1320c2dbff0871799e0a3b746f5fe5b6ee7258fbaf5"
+checksum = "752764558a1f429c20704c3b836a019fa308961c43fdfef4f08e339d456c96be"
dependencies = [
"glam",
"serde",
@@ -594,24 +634,24 @@ dependencies = [
[[package]]
name = "bevy_mikktspace"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d98eaa7f40b97bb9b2d681ecf9fd439830a7eb88ad2846680d4f4acd285cf84"
+checksum = "b596c41a56f2268ec7cde560edc588bc7b5886e4b49c8b27c4dcc9f7c743424c"
dependencies = [
"glam",
]
[[package]]
name = "bevy_ptr"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15702dff420fac72c2ab92428a8600e079ae89c5845401c4e39b843665a3d2d0"
+checksum = "308a02679f6ce21ef71de20fae6d6a2016c07baa21d8e8d0558e6b7851e8adf2"
[[package]]
name = "bevy_reflect"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ac66cccbf1457c5cfc004a0e83569bd4ddc5d6310701f4af6aa81001fe2964a"
+checksum = "cdd56914a8ad57621d7a1a099f7e6b1f7482c9c76cedc9c3d4c175a203939c5d"
dependencies = [
"bevy_math",
"bevy_ptr",
@@ -620,8 +660,6 @@ dependencies = [
"downcast-rs",
"erased-serde",
"glam",
- "once_cell",
- "parking_lot",
"serde",
"smallvec",
"smol_str",
@@ -630,12 +668,11 @@ dependencies = [
[[package]]
name = "bevy_reflect_derive"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a2a1fa784e9a22560b9de350246a159cd59239eb61c7b66824031b3b28abb0"
+checksum = "25f627907c40ac552f798423447fc331fc1ddacd94c5f7a2a70942eb06bc8447"
dependencies = [
"bevy_macro_utils",
- "bit-set",
"proc-macro2",
"quote",
"syn 2.0.37",
@@ -644,11 +681,10 @@ dependencies = [
[[package]]
name = "bevy_render"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e125de06ffaed8100623843b447fb524dc16f2a2120adce81143d7307278be"
+checksum = "90d777f4c51bd58e9e40777c6cb8dde0778df7e2c5298b3f9e3455bd12a9856c"
dependencies = [
- "anyhow",
"async-channel",
"bevy_app",
"bevy_asset",
@@ -678,8 +714,6 @@ dependencies = [
"js-sys",
"naga",
"naga_oil",
- "parking_lot",
- "regex",
"serde",
"smallvec",
"thiserror",
@@ -687,14 +721,13 @@ dependencies = [
"wasm-bindgen",
"web-sys",
"wgpu",
- "wgpu-hal",
]
[[package]]
name = "bevy_render_macros"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e283eb4156285d0d4b85ce9b959d080b652165848f0b3f1a8770af6cfad41c34"
+checksum = "35b00c3d0abff94a729460fc9aa95c2ceac71b49b3041166bb5ba3098e9657e7"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -704,11 +737,10 @@ dependencies = [
[[package]]
name = "bevy_scene"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77172c572239e741283e585433e986dd7f1bfdd7f7489ff10933f59e93cbb04"
+checksum = "ba6294396a6375f0b14341d8003408c10aa040e3f833ac8bd49677170ec55d73"
dependencies = [
- "anyhow",
"bevy_app",
"bevy_asset",
"bevy_derive",
@@ -726,9 +758,9 @@ dependencies = [
[[package]]
name = "bevy_sprite"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7811ade4df81ffa6bae0e293c42d784ad88ce84d2b10fa05801e3c368714581"
+checksum = "b4f7d1f88a6e5497fdafd95c20984a1d1b5517bc39d51600b4988cd60c51837a"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -745,15 +777,16 @@ dependencies = [
"bytemuck",
"fixedbitset",
"guillotiere",
+ "radsort",
"rectangle-pack",
"thiserror",
]
[[package]]
name = "bevy_tasks"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9200e7b42d49c787d9a08675c425d8bd6393ba3beed2eac64be6027a44a01870"
+checksum = "3a45be906618192515bc613e46546150089adbb4a82178dc462045acd1e89e92"
dependencies = [
"async-channel",
"async-executor",
@@ -765,12 +798,11 @@ dependencies = [
[[package]]
name = "bevy_text"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822e2cdb1c46338b85b7648d866f0b631cab23bd8f24395bb8ee7842dde024f0"
+checksum = "c136af700af4f87c94f68d6e019528c371bf09ebf4a8ff7468bb3c73806b34f5"
dependencies = [
"ab_glyph",
- "anyhow",
"bevy_app",
"bevy_asset",
"bevy_ecs",
@@ -788,9 +820,9 @@ dependencies = [
[[package]]
name = "bevy_time"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba50bf25c4dc40296b744f77de10d39c8981b710d8dce609da9de5e54ef164b"
+checksum = "b29709cadf22d318a0b7c79f763e9c5ac414292bd0e850066fa935959021b276"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -802,22 +834,23 @@ dependencies = [
[[package]]
name = "bevy_transform"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86043ec5cc3cf406d33c0e4d6920171601e186b1288e9b4f5ae54682a0564032"
+checksum = "70262c51e915b6224129206d23823364e650cf5eb5f4b6ce3ee379f608c180d2"
dependencies = [
"bevy_app",
"bevy_ecs",
"bevy_hierarchy",
"bevy_math",
"bevy_reflect",
+ "thiserror",
]
[[package]]
name = "bevy_ui"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "105c82a79df1dfcdb75941fa1f58dbdbd8f702a740bc39e7bf719c3d51d55286"
+checksum = "cd5ecbf2dceaab118769dd870e34d780bfde556af561fd10d8d613b0f237297e"
dependencies = [
"bevy_a11y",
"bevy_app",
@@ -845,15 +878,16 @@ dependencies = [
[[package]]
name = "bevy_utils"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829eb8d0d06a0baeabc2e8bad74136ed3329b055aa1e11c5d9df09ebb9be3d85"
+checksum = "c8e75d4a34ef0b15dffd1ee9079ef1f0f5139527e192b9d5708b3e158777c753"
dependencies = [
"ahash 0.8.3",
"bevy_utils_proc_macros",
"getrandom",
"hashbrown 0.14.0",
"instant",
+ "nonmax",
"petgraph",
"thiserror",
"tracing",
@@ -862,9 +896,9 @@ dependencies = [
[[package]]
name = "bevy_utils_proc_macros"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d104f29e231123c703e8b394e2341d2425c33c5a2e9ab8cc8d0a554bdb62a41"
+checksum = "f7dfd3735a61a1b681ed1e176afe4eae731bbb03e51ad871e9eb39e76a2d170e"
dependencies = [
"proc-macro2",
"quote",
@@ -873,10 +907,11 @@ dependencies = [
[[package]]
name = "bevy_window"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a66f9963152093220fc5ffd2244cadcc7f79cf2c23dd02076f4d0cbb7f5162f"
+checksum = "e60d1830b3fbd7db5bfea7ac9fcd0f5e1d1af88c91ab469e697ab176d8b3140b"
dependencies = [
+ "bevy_a11y",
"bevy_app",
"bevy_ecs",
"bevy_input",
@@ -888,9 +923,9 @@ dependencies = [
[[package]]
name = "bevy_winit"
-version = "0.11.2"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "003e20cff652a364f1f98b0d5ba24f53140dc77643241afe4a9b848bdde66184"
+checksum = "7f8294e78c6a1f9c34d36501a377c5d20bf0fa23a0958187bb270187741448ba"
dependencies = [
"accesskit_winit",
"approx",
@@ -947,6 +982,19 @@ dependencies = [
"serde",
]
+[[package]]
+name = "blake3"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
[[package]]
name = "block"
version = "0.1.6"
@@ -972,6 +1020,22 @@ dependencies = [
"objc2-encode",
]
+[[package]]
+name = "blocking"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a"
+dependencies = [
+ "async-channel",
+ "async-lock",
+ "async-task",
+ "fastrand 2.0.1",
+ "futures-io",
+ "futures-lite",
+ "piper",
+ "tracing",
+]
+
[[package]]
name = "bumpalo"
version = "3.14.0"
@@ -1102,6 +1166,12 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
[[package]]
name = "constgebra"
version = "0.1.3"
@@ -1136,7 +1206,7 @@ dependencies = [
"bitflags 1.3.2",
"core-foundation",
"core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
"libc",
]
@@ -1153,16 +1223,17 @@ dependencies = [
[[package]]
name = "cosmic-text"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9"
+checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71"
dependencies = [
- "aliasable",
"fontdb",
"libm",
"log",
"rangemap",
+ "rustc-hash",
"rustybuzz",
+ "self_cell",
"swash",
"sys-locale",
"unicode-bidi",
@@ -1231,12 +1302,12 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "d3d12"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
+checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
dependencies = [
- "bitflags 1.3.2",
- "libloading 0.7.4",
+ "bitflags 2.4.0",
+ "libloading 0.8.0",
"winapi",
]
@@ -1367,6 +1438,12 @@ dependencies = [
"instant",
]
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
[[package]]
name = "fdeflate"
version = "0.3.0"
@@ -1405,17 +1482,27 @@ dependencies = [
"spin",
]
+[[package]]
+name = "fontconfig-parser"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4"
+dependencies = [
+ "roxmltree",
+]
+
[[package]]
name = "fontdb"
-version = "0.14.1"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e"
+checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38"
dependencies = [
+ "fontconfig-parser",
"log",
"memmap2",
"slotmap",
"tinyvec",
- "ttf-parser",
+ "ttf-parser 0.19.2",
]
[[package]]
@@ -1424,7 +1511,28 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
]
[[package]]
@@ -1433,6 +1541,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
[[package]]
name = "futures-core"
version = "0.3.28"
@@ -1451,7 +1565,7 @@ version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
"futures-core",
"futures-io",
"memchr",
@@ -1540,21 +1654,21 @@ dependencies = [
[[package]]
name = "gpu-alloc"
-version = "0.5.4"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
"gpu-alloc-types",
]
[[package]]
name = "gpu-alloc-types"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
]
[[package]]
@@ -1820,9 +1934,9 @@ dependencies = [
[[package]]
name = "libm"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
[[package]]
name = "linked-hash-map"
@@ -1872,9 +1986,9 @@ checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
[[package]]
name = "memmap2"
-version = "0.6.2"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872"
+checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
dependencies = [
"libc",
]
@@ -1899,16 +2013,17 @@ dependencies = [
[[package]]
name = "metal"
-version = "0.24.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
+checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
"block",
"core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
"log",
"objc",
+ "paste",
]
[[package]]
@@ -1935,12 +2050,12 @@ dependencies = [
[[package]]
name = "naga"
-version = "0.12.3"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
+checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
dependencies = [
"bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
"codespan-reporting",
"hexf-parse",
"indexmap 1.9.3",
@@ -1956,9 +2071,9 @@ dependencies = [
[[package]]
name = "naga_oil"
-version = "0.8.2"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b"
+checksum = "a1fa9518ff79ae8a98c3abe3897d873a85561d1b5642981c2245c1c4b9b2429d"
dependencies = [
"bit-set",
"codespan-reporting",
@@ -1967,7 +2082,7 @@ dependencies = [
"naga",
"once_cell",
"regex",
- "regex-syntax 0.6.29",
+ "regex-syntax 0.7.5",
"rustc-hash",
"thiserror",
"tracing",
@@ -2024,6 +2139,12 @@ dependencies = [
"memoffset 0.6.5",
]
+[[package]]
+name = "nonmax"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99756f5493e135528f0cd660ac67b4c3a542bb65a3565efe92bb2c2317eb3669"
+
[[package]]
name = "ntapi"
version = "0.4.1"
@@ -2226,7 +2347,7 @@ version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4"
dependencies = [
- "ttf-parser",
+ "ttf-parser 0.19.2",
]
[[package]]
@@ -2306,6 +2427,17 @@ version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+[[package]]
+name = "piper"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+dependencies = [
+ "atomic-waker",
+ "fastrand 2.0.1",
+ "futures-io",
+]
+
[[package]]
name = "pkg-config"
version = "0.3.27"
@@ -2341,7 +2473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
]
[[package]]
@@ -2391,9 +2523,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
[[package]]
name = "rangemap"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263"
+checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991"
[[package]]
name = "raw-window-handle"
@@ -2500,6 +2632,15 @@ dependencies = [
"serde_derive",
]
+[[package]]
+name = "roxmltree"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302"
+dependencies = [
+ "xmlparser",
+]
+
[[package]]
name = "rustc-demangle"
version = "0.1.23"
@@ -2514,18 +2655,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustybuzz"
-version = "0.8.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250"
+checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa"
dependencies = [
"bitflags 1.3.2",
"bytemuck",
"libm",
"smallvec",
- "ttf-parser",
+ "ttf-parser 0.20.0",
"unicode-bidi-mirroring",
"unicode-ccc",
- "unicode-general-category",
+ "unicode-properties",
"unicode-script",
]
@@ -2535,6 +2676,12 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+[[package]]
+name = "self_cell"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6"
+
[[package]]
name = "serde"
version = "1.0.188"
@@ -2783,9 +2930,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
[[package]]
name = "toml_edit"
@@ -2798,6 +2945,17 @@ dependencies = [
"winnow",
]
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.0.0",
+ "toml_datetime",
+ "winnow",
+]
+
[[package]]
name = "tracing"
version = "0.1.37"
@@ -2877,6 +3035,12 @@ version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
+[[package]]
+name = "ttf-parser"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
+
[[package]]
name = "unicode-bidi"
version = "0.3.13"
@@ -2895,12 +3059,6 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
-[[package]]
-name = "unicode-general-category"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
-
[[package]]
name = "unicode-ident"
version = "1.0.12"
@@ -2913,6 +3071,12 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+[[package]]
+name = "unicode-properties"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0"
+
[[package]]
name = "unicode-script"
version = "0.5.5"
@@ -3066,9 +3230,9 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
[[package]]
name = "wgpu"
-version = "0.16.3"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
+checksum = "ed547920565c56c7a29afb4538ac5ae5048865a5d2f05bff3ad4fbeb921a9a2c"
dependencies = [
"arrayvec",
"cfg-if",
@@ -3090,9 +3254,9 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "0.16.1"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
+checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
dependencies = [
"arrayvec",
"bit-vec",
@@ -3113,9 +3277,9 @@ dependencies = [
[[package]]
name = "wgpu-hal"
-version = "0.16.2"
+version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
+checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
dependencies = [
"android_system_properties",
"arrayvec",
@@ -3125,7 +3289,6 @@ dependencies = [
"block",
"core-graphics-types",
"d3d12",
- "foreign-types",
"glow",
"gpu-alloc",
"gpu-allocator",
@@ -3155,9 +3318,9 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "0.16.1"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
+checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
dependencies = [
"bitflags 2.4.0",
"js-sys",
@@ -3386,9 +3549,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winit"
-version = "0.28.6"
+version = "0.28.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196"
+checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
dependencies = [
"android-activity",
"bitflags 1.3.2",
@@ -3468,6 +3631,12 @@ version = "0.8.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a"
+[[package]]
+name = "xmlparser"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
+
[[package]]
name = "yaml-rust"
version = "0.4.5"
diff --git a/Cargo.toml b/Cargo.toml
index c777faeadb6e4489427842db0b6fded17b56f5ca..155a7e77abcc694371f4ed107a1cbe8ec4f05631 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ opt-level = 3
opt-level = 'z'
[dependencies]
-bevy = { version = "0.11", default-features = false, features = [
+bevy = { version = "0.12", default-features = false, features = [
"bevy_asset",
"bevy_core_pipeline",
"bevy_render",
@@ -35,7 +35,7 @@ bevy = { version = "0.11", default-features = false, features = [
"png",
"x11",
] }
-cosmic-text = { version = "0.9" }
+cosmic-text = { version = "0.10" }
# TODO: move crossbeam to wasm32, once input.rs has separate wasm copy/paste fn
crossbeam-channel = "0.5.8"
image = "0.24.6"
diff --git a/examples/bevy_api_testing.rs b/examples/bevy_api_testing.rs
index 742f5f2e2b302286b7bc796c68a565e8e7fa514e..2b7c26da09788eb30eeb04bbd429b106dcfddf48 100644
--- a/examples/bevy_api_testing.rs
+++ b/examples/bevy_api_testing.rs
@@ -116,13 +116,13 @@ fn ev_test(
mut evr_out: EventReader<TextHoverOut>,
mut evr_type: EventReader<CosmicTextChanged>,
) {
- for _ev in evr_on.iter() {
+ for _ev in evr_on.read() {
println!("IN");
}
- for _ev in evr_out.iter() {
+ for _ev in evr_out.read() {
println!("OUT");
}
- for _ev in evr_type.iter() {
+ for _ev in evr_type.read() {
println!("TYPE");
}
}
diff --git a/examples/login.rs b/examples/login.rs
index 1dbee608853aac9285c008fb9abb4856f8a031ae..cf237bdb0826f2a8c106622ba6070acb80cb3526 100644
--- a/examples/login.rs
+++ b/examples/login.rs
@@ -200,7 +200,7 @@ fn change_active_editor_ui(
}
fn print_changed_input(mut evr_type: EventReader<CosmicTextChanged>) {
- for ev in evr_type.iter() {
+ for ev in evr_type.read() {
println!("Changed: {}", ev.0 .1);
}
}
diff --git a/src/input.rs b/src/input.rs
index 94955cf03c1fd912d261614c19aa1519828b52e8..da5d75e375df6163cacc510918738b35a75e4b6e 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -196,7 +196,7 @@ pub(crate) fn input_mouse(
return;
}
- for ev in scroll_evr.iter() {
+ for ev in scroll_evr.read() {
match ev.unit {
MouseScrollUnit::Line => {
editor.0.action(
@@ -522,7 +522,7 @@ pub(crate) fn input_kb(
}
if !(is_clipboard || is_return || readonly) {
- for char_ev in char_evr.iter() {
+ for char_ev in char_evr.read() {
is_edit = true;
if *is_deleting {
editor.0.action(&mut font_system.0, Action::Backspace);
diff --git a/src/lib.rs b/src/lib.rs
index 0b3d479fe29dd539c443d1ef96c717e1e1837fe1..7186b4e8057a2b0c494fd20f80a8ba53439ac50e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -753,7 +753,6 @@ mod tests {
app.insert_resource(input);
let mouse_input: Input<MouseButton> = Input::<MouseButton>::default();
app.insert_resource(mouse_input);
- app.add_asset::<Image>();
app.add_event::<ReceivedCharacter>();
diff --git a/src/render.rs b/src/render.rs
index 39921911a73662289fe16a05b105ce80d7ec869b..33a238156ee535ad65faf40eb6870be4c926d12f 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -1,9 +1,8 @@
use std::time::Duration;
use bevy::{
- asset::HandleId,
prelude::*,
- render::{render_resource::Extent3d, texture::DEFAULT_IMAGE_HANDLE},
+ render::render_resource::Extent3d,
utils::HashMap,
window::{PrimaryWindow, WindowScaleFactorChanged},
};
@@ -149,7 +148,7 @@ pub(crate) fn render_texture(
if let Some(bg_image) = background_image.0.clone() {
if let Some(image) = images.get(&bg_image) {
let mut dynamic_image = image.clone().try_into_dynamic().unwrap();
- if image.size().x != size.0.x || image.size().y != size.0.y {
+ if image.size().x != size.0.x as u32 || image.size().y != size.0.y as u32 {
dynamic_image = dynamic_image.resize_to_fill(
size.0.x as u32,
size.0.y as u32,
@@ -220,15 +219,7 @@ pub(crate) fn new_image_from_default(
mut images: ResMut<Assets<Image>>,
) {
for mut canvas in query.iter_mut() {
- if let Some(prev_image) = images.get_mut(&canvas) {
- if *canvas == DEFAULT_IMAGE_HANDLE.typed() {
- let prev_image = prev_image.clone();
- let handle_id: HandleId = HandleId::random::<Image>();
- let new_handle: Handle<Image> = Handle::weak(handle_id);
- let new_handle = images.set(new_handle, prev_image);
- *canvas = new_handle;
- }
- }
+ *canvas = images.add(Image::default());
}
}
@@ -489,7 +480,7 @@ pub(crate) fn on_scale_factor_change(
mut font_system: ResMut<CosmicFontSystem>,
) {
if !scale_factor_changed.is_empty() {
- let new_scale_factor = scale_factor_changed.iter().last().unwrap().scale_factor as f32;
+ let new_scale_factor = scale_factor_changed.read().last().unwrap().scale_factor as f32;
for (mut editor, metrics, mut x_offset) in &mut cosmic_query.iter_mut() {
let font_system = &mut font_system.0;
let metrics =