diff --git a/Cargo.lock b/Cargo.lock index 3b20b88..506bd01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,6 +168,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + [[package]] name = "allocator-api2" version = "0.2.16" @@ -300,6 +306,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + [[package]] name = "arboard" version = "3.3.2" @@ -308,7 +320,7 @@ checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" dependencies = [ "clipboard-win", "core-graphics", - "image", + "image 0.24.9", "log", "objc", "objc-foundation", @@ -319,6 +331,17 @@ dependencies = [ "x11rb", ] +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -580,6 +603,29 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec 0.7.4", + "log", + "nom 7.1.3", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec 0.7.4", +] + [[package]] name = "backtrace" version = "0.3.71" @@ -622,7 +668,8 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bevy" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea370412c322af887c9115442d8f2ec991b652f163a1d8920ecaf08cae63f2bc" dependencies = [ "bevy_internal", ] @@ -650,7 +697,7 @@ dependencies = [ "bevy_utils", "bevy_window", "egui", - "image", + "image 0.24.9", "once_cell", "pretty-type-name", "smallvec", @@ -679,7 +726,8 @@ dependencies = [ [[package]] name = "bevy_a11y" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6192db480a04d4a0ad5d89a2fbd78ccca5ce902829a49ec2d1dbc213222ed8b1" dependencies = [ "accesskit", "bevy_app", @@ -690,7 +738,8 @@ dependencies = [ [[package]] name = "bevy_animation" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef3bbaf9233c428d8dd4b66a41b5381e41c67da860d9dc2118a8e6610ec874c" dependencies = [ "bevy_app", "bevy_asset", @@ -708,7 +757,8 @@ dependencies = [ [[package]] name = "bevy_app" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b508824497f3a3a2fab8398dc3944a4d4adddcc30ee25cd6d45b0a57336549ce" dependencies = [ "bevy_derive", "bevy_ecs", @@ -723,7 +773,8 @@ dependencies = [ [[package]] name = "bevy_asset" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf224b57fb65e1cde921afe0b343c2d595531dbf882c41abad01bbc665a05c4" dependencies = [ "async-broadcast", "async-fs", @@ -777,7 +828,8 @@ dependencies = [ [[package]] name = "bevy_asset_macros" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c855651e7734740b76ada0e7daed116c46d393f9031cc45c4fe9ad5829548" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -788,7 +840,8 @@ dependencies = [ [[package]] name = "bevy_audio" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0af1796b7e56c2f49de5be72fb2aadb8f9310d6173d70040fd2eff1c7cb29009" dependencies = [ "bevy_app", "bevy_asset", @@ -818,7 +871,8 @@ dependencies = [ [[package]] name = "bevy_core" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1a8f4722fb978d308b6311f3dd61f6885165055ad05ce3dfc1b2fd001bb017e" dependencies = [ "bevy_app", "bevy_ecs", @@ -832,7 +886,8 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "568659c43c8f1805f434b5fc0f8e700c263391403f899312bb0e4bc8d8b9ca70" dependencies = [ "bevy_app", "bevy_asset", @@ -862,7 +917,8 @@ dependencies = [ [[package]] name = "bevy_derive" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de77523d154e220a740e568a89f52fac7de481374bdecbbbeb283a37580ba34" dependencies = [ "bevy_macro_utils", "quote", @@ -872,7 +928,8 @@ dependencies = [ [[package]] name = "bevy_diagnostic" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b5b031eeafc17bed997313ca15c8e4ed8b97fe2e9ef48e980833e4bf5cfa0e7" dependencies = [ "bevy_app", "bevy_core", @@ -887,7 +944,8 @@ dependencies = [ [[package]] name = "bevy_ecs" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a027175613f630a51273c0f8ae909dd54ea3ce72eb573f456056553f79918ac" dependencies = [ "async-channel 2.2.0", "bevy_ecs_macros", @@ -906,7 +964,8 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55dbbb6300f08cef5983497970db8545d3cbda6ee4f410a6c6742b7b6bbfd3af" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -931,7 +990,8 @@ dependencies = [ [[package]] name = "bevy_encase_derive" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df72ac1273fcdb8105736c42815442ae1291f1f577e34cb7e9d18f732103e2f0" dependencies = [ "bevy_macro_utils", "encase_derive_impl", @@ -964,7 +1024,8 @@ dependencies = [ [[package]] name = "bevy_gilrs" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02146d8a92ac322717185005a17b488e74b2ec08ca3f9eb8a7cadb7f0486cb70" dependencies = [ "bevy_app", "bevy_ecs", @@ -979,7 +1040,8 @@ dependencies = [ [[package]] name = "bevy_gizmos" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66e9965860d505e2ea4144850904cefd8b528f59477061df8563194dc954ad58" dependencies = [ "bevy_app", "bevy_asset", @@ -1000,7 +1062,8 @@ dependencies = [ [[package]] name = "bevy_gizmos_macros" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e689be764256a5a0d1f01c5f1dbaa3439e98a1338bf88b496db184d28e00c9" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1011,7 +1074,8 @@ dependencies = [ [[package]] name = "bevy_gltf" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0cd8fd1c1ce3a57ca96eaee05f406ad65865efd02606e5f288b5f7767d8c6f" dependencies = [ "base64 0.21.7", "bevy_animation", @@ -1040,7 +1104,8 @@ dependencies = [ [[package]] name = "bevy_hierarchy" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b2999d1e5bb877b475c9b2d17643d5fb47fc4cc49ea48ba3ab5a6b00ed850a6" dependencies = [ "bevy_app", "bevy_core", @@ -1053,7 +1118,8 @@ dependencies = [ [[package]] name = "bevy_input" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c22481e4290e2eca68b0c1f5f0a826f185d8f5e40e05c86bb6044dcfe3a04b3" dependencies = [ "bevy_app", "bevy_ecs", @@ -1067,7 +1133,8 @@ dependencies = [ [[package]] name = "bevy_internal" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ac9275cc7f4bce41dff1e62b853933e242f9e5c076d89f06156cf743097d6a0" dependencies = [ "bevy_a11y", "bevy_animation", @@ -1105,7 +1172,8 @@ dependencies = [ [[package]] name = "bevy_log" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c7b4e2443654d68b6f8c54e5f1ce3a16c8a9af10f4832390dcae36c1323307" dependencies = [ "android_log-sys", "bevy_app", @@ -1120,19 +1188,21 @@ dependencies = [ [[package]] name = "bevy_macro_utils" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bbbf88fc577a21ee9994feed2253ee9838b63fb976783b7a549edfbe07c6764" dependencies = [ "proc-macro2", "quote", "rustc-hash", "syn 2.0.55", - "toml_edit", + "toml_edit 0.21.1", ] [[package]] name = "bevy_math" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d30721f36a0b5f9ad39deb140c50b85cbbaefebab8d10bd20d9de1c9572f968" dependencies = [ "glam", "serde", @@ -1141,7 +1211,8 @@ dependencies = [ [[package]] name = "bevy_mikktspace" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc081a695c3513f09fdc640bf7f66cd73c47eb479da50312bf9710ee6927729d" dependencies = [ "glam", ] @@ -1231,7 +1302,8 @@ dependencies = [ [[package]] name = "bevy_pbr" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d90401eb58acb1c9627f11f75b076bfdeab2af9a4aea4540cb525efc5782b613" dependencies = [ "bevy_app", "bevy_asset", @@ -1390,7 +1462,8 @@ dependencies = [ [[package]] name = "bevy_ptr" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea003584000ef02b73800cc7cb62ee74792fff431e6a8df36863c43bf56fb491" [[package]] name = "bevy_rapier3d" @@ -1408,7 +1481,8 @@ dependencies = [ [[package]] name = "bevy_reflect" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1101dbd44ae35e5c66802e46cfba1182e49f6163c824bee380d4acab5b2f640" dependencies = [ "bevy_math", "bevy_ptr", @@ -1425,7 +1499,8 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2a8791d5841a6db862571f709d7ee70c2a5eb1634c3a4329817d04f0e307c2d" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1437,7 +1512,8 @@ dependencies = [ [[package]] name = "bevy_render" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75bbb48471f8cd06f5253e271f9b793695f5b821fc9d39a875497905578d9867" dependencies = [ "async-channel 2.2.0", "bevy_app", @@ -1464,7 +1540,7 @@ dependencies = [ "encase", "futures-lite 2.3.0", "hexasphere", - "image", + "image 0.24.9", "js-sys", "ktx2", "naga", @@ -1481,7 +1557,8 @@ dependencies = [ [[package]] name = "bevy_render_macros" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffd61a89e7a1b55c78a0aef1fcadd0247fe74a101c00f831791db73d63465051" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -1492,7 +1569,8 @@ dependencies = [ [[package]] name = "bevy_scene" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368b989251241efb590976e309e4778ed9d04eb896c37ea6b874a374432a0b3e" dependencies = [ "bevy_app", "bevy_asset", @@ -1511,7 +1589,8 @@ dependencies = [ [[package]] name = "bevy_sprite" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f52d807086d2c92bc37ee770aa6dbb442b62cdc5665b9c6dd32629b8fae05e4" dependencies = [ "bevy_app", "bevy_asset", @@ -1536,7 +1615,8 @@ dependencies = [ [[package]] name = "bevy_tasks" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40be36aeec06b8f0eb87894922c6a7fbd8f2a5c8e77dcb9dcbf77641046988c0" dependencies = [ "async-channel 2.2.0", "async-executor", @@ -1549,7 +1629,8 @@ dependencies = [ [[package]] name = "bevy_text" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48f0e51919e13c0c39ecdffcf843e8a8d95fd8861023b02b3ee486d3fa4b6003" dependencies = [ "ab_glyph", "bevy_app", @@ -1570,7 +1651,8 @@ dependencies = [ [[package]] name = "bevy_time" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fc48cf59acd2b1c52e61787b5bb3db1a0f923cc6ccc68c0d8ab2b5894cfd28" dependencies = [ "bevy_app", "bevy_ecs", @@ -1583,7 +1665,8 @@ dependencies = [ [[package]] name = "bevy_transform" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b962ae4253f5413b64a839ab8e8d63bc3e3db45f41d06b6ddc7886acdcb5d0f5" dependencies = [ "bevy_app", "bevy_ecs", @@ -1596,7 +1679,8 @@ dependencies = [ [[package]] name = "bevy_ui" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3449b963573a56b484cf4f8883f1b5b8eaccaaeda8f28a70c006e3291450f77" dependencies = [ "bevy_a11y", "bevy_app", @@ -1623,7 +1707,8 @@ dependencies = [ [[package]] name = "bevy_utils" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac758c2e8509a4a260b7a91f920be3beee6ab9e76e388494240ac5d672779159" dependencies = [ "ahash", "bevy_utils_proc_macros", @@ -1641,7 +1726,8 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "014c80f466ed01821a2e602d63cd5076915c1af5de5fa3c074cc4a9ca898ada7" dependencies = [ "proc-macro2", "quote", @@ -1666,7 +1752,8 @@ dependencies = [ [[package]] name = "bevy_window" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0c2a1e580b3b0ad0c928a5e250c8375c6a8a70d8b0f483b23d3bf5b670cc1a" dependencies = [ "bevy_a11y", "bevy_app", @@ -1682,7 +1769,8 @@ dependencies = [ [[package]] name = "bevy_winit" version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2c408d459172758a4cfa37e3452d4ea0898101ec2b6d92aa3eb698511bef389" dependencies = [ "accesskit_winit", "approx", @@ -1792,6 +1880,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bitstream-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" + [[package]] name = "bitvec" version = "0.19.6" @@ -1897,6 +1991,12 @@ dependencies = [ "regex-automata 0.1.10", ] +[[package]] +name = "built" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" + [[package]] name = "bumpalo" version = "3.15.4" @@ -1986,6 +2086,16 @@ dependencies = [ "nom 7.1.3", ] +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", + "target-lexicon", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -2612,7 +2722,7 @@ dependencies = [ "egui", "ehttp", "enum-map", - "image", + "image 0.24.9", "log", "mime_guess2", "resvg", @@ -3388,9 +3498,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.25" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" +checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" dependencies = [ "bytes", "fnv", @@ -3506,9 +3616,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -3517,12 +3627,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", "pin-project-lite", ] @@ -3573,47 +3695,60 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "hyper" -version = "0.14.28" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -3655,12 +3790,51 @@ dependencies = [ "tiff", ] +[[package]] +name = "image" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4f005360d32e9325029b38ba47ebd7a56f3316df09249368939562d518645" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +dependencies = [ + "byteorder", + "thiserror", +] + [[package]] name = "imagesize" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + [[package]] name = "indexmap" version = "2.2.6" @@ -3715,6 +3889,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.55", +] + [[package]] name = "interpolation" version = "0.3.0" @@ -3914,6 +4099,17 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + [[package]] name = "libloading" version = "0.7.4" @@ -3998,6 +4194,15 @@ dependencies = [ "value-bag", ] +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + [[package]] name = "mach2" version = "0.4.2" @@ -4035,6 +4240,16 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + [[package]] name = "memchr" version = "2.7.1" @@ -4241,6 +4456,12 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + [[package]] name = "nix" version = "0.28.0" @@ -4299,6 +4520,12 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + [[package]] name = "ntapi" version = "0.4.1" @@ -4318,6 +4545,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-complex" version = "0.4.5" @@ -4354,6 +4592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", + "num-bigint", "num-integer", "num-traits", ] @@ -4828,7 +5067,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit", + "toml_edit 0.21.1", ] [[package]] @@ -4875,6 +5114,19 @@ name = "profiling" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.55", +] [[package]] name = "qoi" @@ -4885,6 +5137,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quick-xml" version = "0.31.0" @@ -5013,6 +5271,56 @@ dependencies = [ "simba", ] +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec 0.7.4", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand 0.8.5", + "rand_chacha 0.3.1", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + [[package]] name = "raw-window-handle" version = "0.5.2" @@ -5133,9 +5441,9 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338" dependencies = [ "base64 0.21.7", "bytes", @@ -5145,8 +5453,10 @@ dependencies = [ "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -5558,6 +5868,15 @@ dependencies = [ "syn 2.0.55", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -5632,6 +5951,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + [[package]] name = "simplecss" version = "0.2.1" @@ -5827,7 +6155,7 @@ dependencies = [ "bevy-inspector-egui", "egui-toast", "egui_file", - "image", + "image 0.24.9", ] [[package]] @@ -5973,7 +6301,7 @@ dependencies = [ "futures", "futures-intrusive", "futures-lite 2.3.0", - "image", + "image 0.25.0", "itertools", "js-sys", "parking_lot", @@ -5985,6 +6313,7 @@ dependencies = [ "space_editor", "studio-bvh", "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", "wgpu", ] @@ -6106,6 +6435,19 @@ dependencies = [ "libc", ] +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml", + "version-compare", +] + [[package]] name = "taffy" version = "0.3.18" @@ -6124,6 +6466,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + [[package]] name = "tempfile" version = "3.10.1" @@ -6304,11 +6652,26 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.9", +] + [[package]] name = "toml_datetime" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -6318,9 +6681,44 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.5", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -6333,6 +6731,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -6596,6 +6995,17 @@ dependencies = [ "serde", ] +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + [[package]] name = "valuable" version = "0.1.0" @@ -6620,6 +7030,12 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + [[package]] name = "version_check" version = "0.9.4" @@ -7408,6 +7824,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" @@ -7519,6 +7944,12 @@ dependencies = [ "syn 2.0.55", ] +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + [[package]] name = "zune-inflate" version = "0.2.54" @@ -7528,12 +7959,11 @@ dependencies = [ "simd-adler32", ] -[[patch.unused]] -name = "bevy_dylib" -version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" - -[[patch.unused]] -name = "bevy_dynamic_plugin" -version = "0.13.1" -source = "git+https://github.com/rewin123/bevy.git?branch=fix-wasm-fetch#ae34fccd57b143ab527a3e0aefc6331ade050d38" +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] diff --git a/Cargo.toml b/Cargo.toml index 2a88e59..6b712fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,50 +11,6 @@ anyhow = "1.0.75" [workspace.dependencies.bevy] version = "0.13.1" features = ["tonemapping_luts"] -git = "https://github.com/rewin123/bevy.git" -branch = "fix-wasm-fetch" - - -[patch.crates-io] -bevy = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_a11y = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_animation = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_app = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_asset = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_audio = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_core = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_core_pipeline = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_derive = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_diagnostic = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_dylib = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_dynamic_plugin = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_ecs = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_encase_derive = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_gilrs = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_gizmos = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_gltf = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_hierarchy = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_input = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_internal = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_log = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_macro_utils = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_math = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_mikktspace = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_pbr = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_ptr = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_reflect = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_reflect_derive = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_render = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_scene = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_sprite = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_tasks = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_text = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_time = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_transform = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_ui = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_utils = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_window = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } -bevy_winit = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } [profile.dev-custom] inherits = "dev" @@ -64,4 +20,4 @@ opt-level = 1 opt-level = 3 [profile.release] -opt-level = "s" +opt-level = 3 diff --git a/studio/Cargo.toml b/studio/Cargo.toml index 79907d3..dea451a 100644 --- a/studio/Cargo.toml +++ b/studio/Cargo.toml @@ -31,36 +31,35 @@ serde = "1.0.192" serde-wasm-bindgen = { version = "0.6.1", optional = true } serde_json = "1.0.108" studio-bvh = { path = "../studio-bvh" } -wasm-bindgen = "0.2.84" -web-sys = { version = "0.3.40", optional = true, features = [ +wasm-bindgen = "0.2" +web-sys = { version = "0.3", optional = true, features = [ "CustomEvent", "CustomEventInit", "Document", "HtmlElement", "Window", + "WorkerGlobalScope" ] } clap = { version = "4.4.18", features = ["derive"] } futures-intrusive = "0.5.0" wgpu = "0.19.3" futures-lite = "2.2.0" futures = "0.3.30" -image = "0.24.8" +image = "0.25.0" bytemuck = "1.14.1" space_editor = {git = "https://github.com/rewin123/space_editor", rev = "7b93e21ee1eb8a42418890b6cd525eaa7db43b95"} anyhow.workspace = true serde_repr = "0.1.18" +wasm-bindgen-futures = "0.4" [dependencies.reqwest] -version = "0.11.24" +version = "0.12.2" features = [ "default", "json", "stream", ] -[patch.crates-io] -bevy = { git = "https://github.com/rewin123/bevy.git", branch = "fix-wasm-fetch", version = "0.13.1" } - [features] wasm = [ "dep:console_error_panic_hook", diff --git a/studio/scripts/build-web.mjs b/studio/scripts/build-web.mjs index 10b0c47..b24aab3 100644 --- a/studio/scripts/build-web.mjs +++ b/studio/scripts/build-web.mjs @@ -20,7 +20,7 @@ async function main() { } /** @type import("node:child_process").StdioOptions */ - const stdio = ["ignore", "inherit", "inherit"]; + const stdio = ["inherit", "inherit", "inherit"]; const outDir = path.join(workspaceRoot, "dist/studio"); diff --git a/studio/src/bvh/mod.rs b/studio/src/bvh/mod.rs index cd859d2..7e2af01 100644 --- a/studio/src/bvh/mod.rs +++ b/studio/src/bvh/mod.rs @@ -1,4 +1,4 @@ -use std::ops::{Deref, DerefMut}; + use bevy::{ app::{App, Plugin, PostUpdate, Update}, diff --git a/studio/src/debug.rs b/studio/src/debug.rs index 86a8b19..ec484f7 100644 --- a/studio/src/debug.rs +++ b/studio/src/debug.rs @@ -1,11 +1,11 @@ use std::fmt; use bevy::{prelude::*, window::PrimaryWindow}; -use bevy_inspector_egui::{bevy_egui::EguiPlugin, DefaultInspectorConfigPlugin}; +use bevy_inspector_egui::{DefaultInspectorConfigPlugin}; use bevy_mod_picking::debug::DebugPickingMode; use space_editor::{ prelude::*, - space_editor_ui::{tools::gizmo::GizmoToolPlugin, EditorGizmoConfigPlugin, EditorPluginGroup}, + space_editor_ui::{tools::gizmo::GizmoToolPlugin, EditorPluginGroup}, }; use crate::{ @@ -118,7 +118,7 @@ fn update_gizmo_line_thickness( mut config_store: ResMut, q_window: Query<&Window, (Changed, With)>, ) { - if let Ok(scale_factor) = q_window.get_single().map(|win| win.scale_factor() as f32) { + if let Ok(scale_factor) = q_window.get_single().map(|win| win.scale_factor()) { let (config, _) = config_store.config_mut::(); config.line_width = 2. * scale_factor; } diff --git a/studio/src/headless.rs b/studio/src/headless.rs index 27fb117..eb0be17 100644 --- a/studio/src/headless.rs +++ b/studio/src/headless.rs @@ -76,7 +76,7 @@ pub fn start_headless( Startup, move |mut cmd: Commands, mut ew: EventWriter, - mut asset_server: Res| { + asset_server: Res| { cmd.insert_resource(SkyboxHolder(Some(Skybox { image: asset_server.load(skybox.clone()), brightness: 1.0, diff --git a/studio/src/input.rs b/studio/src/input.rs index 372347f..d5cd61e 100644 --- a/studio/src/input.rs +++ b/studio/src/input.rs @@ -237,7 +237,7 @@ fn translate_fps_camera_events( mut input: EventWriter, ) { // Camera Translation (FPS-like) - use KeyCode::*; + let wasd_keys = [ KeyCode::KeyW, KeyCode::KeyA, diff --git a/studio/src/interaction/gizmos/rotation.rs b/studio/src/interaction/gizmos/rotation.rs index a095617..259c0e7 100644 --- a/studio/src/interaction/gizmos/rotation.rs +++ b/studio/src/interaction/gizmos/rotation.rs @@ -288,7 +288,7 @@ pub(super) fn on_rotate( early_exit_test: &early_exit_test, ..default() }; - let hits = raycast.cast_ray(ray.into(), &settings); + let hits = raycast.cast_ray(ray, &settings); // If the pointer is no longer in the vicinity of the sphere, we'll // invoke this closure to extrapolate additional rotation from the diff --git a/studio/src/lib.rs b/studio/src/lib.rs index 6125879..0a80f46 100644 --- a/studio/src/lib.rs +++ b/studio/src/lib.rs @@ -1,6 +1,9 @@ #![allow(clippy::type_complexity, clippy::too_many_arguments)] -use bevy::{app::PluginGroupBuilder, prelude::*}; +use bevy::{ + app::PluginGroupBuilder, + prelude::*, +}; use bevy_mod_picking::DefaultPickingPlugins; use bevy_web_asset::WebAssetPlugin; use scene::ImportSceneEvent; diff --git a/studio/src/scene.rs b/studio/src/scene.rs index 7d3a3d1..8e17907 100644 --- a/studio/src/scene.rs +++ b/studio/src/scene.rs @@ -111,7 +111,7 @@ pub struct SkyboxHolder(pub Option); fn attach_skybox( mut cmd: Commands, - mut skybox_holder: ResMut, + skybox_holder: ResMut, mut q_camera: Query, Without)>, ) { let Some(skybox) = skybox_holder.0.as_ref() else { diff --git a/studio/src/screenshot.rs b/studio/src/screenshot.rs index 0e204f3..977f11a 100644 --- a/studio/src/screenshot.rs +++ b/studio/src/screenshot.rs @@ -1,4 +1,4 @@ -use bevy::render::render_graph::RenderSubGraph; + use bevy::{ app::AppExit, core_pipeline::{core_3d, prepass::ViewPrepassTextures}, diff --git a/studio/src/skybox.rs b/studio/src/skybox.rs index 9e386ad..8e63e72 100644 --- a/studio/src/skybox.rs +++ b/studio/src/skybox.rs @@ -2,9 +2,7 @@ use core::fmt; use bevy::{ asset::LoadState, - core_pipeline::Skybox, prelude::*, - render::render_resource::{TextureViewDescriptor, TextureViewDimension}, }; use crate::MainCamera; @@ -38,7 +36,7 @@ struct SkyboxAssets { env_specular: Handle, } -fn load_skybox(mut cmd: Commands, assets: Res, id: Res) { +fn load_skybox(mut cmd: Commands, _assets: Res, id: Res) { let id = &**id; if let Ok(color) = Color::hex(id) { cmd.insert_resource(ClearColor(color)); @@ -47,7 +45,6 @@ fn load_skybox(mut cmd: Commands, assets: Res, id: Res) { brightness: 1.0, }) } else { - let color = Color::hex("AAAAAA").unwrap(); cmd.insert_resource(ClearColor(color)); cmd.insert_resource(AmbientLight { @@ -89,10 +86,10 @@ fn skybox_assets_loaded( } fn spawn_skybox( - mut cmd: Commands, - mut images: ResMut>, - skybox_assets: Res, - q_camera: Query>, + _cmd: Commands, + _images: ResMut>, + _skybox_assets: Res, + _q_camera: Query>, ) { // // Configure the skybox texture as a cubemap // let image = images.get_mut(&skybox_assets.cubemap).unwrap(); diff --git a/studio/src/ui/fps.rs b/studio/src/ui/fps.rs index afd98de..e8c1793 100644 --- a/studio/src/ui/fps.rs +++ b/studio/src/ui/fps.rs @@ -1,5 +1,4 @@ use bevy::{ - a11y::accesskit::TextAlign, diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin}, prelude::*, }; diff --git a/studio/src/wasm/screenshot.rs b/studio/src/wasm/screenshot.rs index b450883..bc2946a 100644 --- a/studio/src/wasm/screenshot.rs +++ b/studio/src/wasm/screenshot.rs @@ -153,7 +153,7 @@ fn take_screenshots( src_buffer, img.width(), img.height(), - ColorType::Rgb8, + ColorType::Rgb8.into(), ) { error!("{err}"); return;