diff --git a/.cargo/config.toml b/.cargo/config.toml
index 20ec8a5..ccc35e4 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,3 +1,6 @@
[target.x86_64-unknown-linux-gnu]
linker = "clang"
-rustflags = ["-C", "link-arg=-use-ld="]
\ No newline at end of file
+rustflags = ["-C", "link-arg=-use-ld="]
+
+[target.wasm32-unknown-unknown]
+rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 564729e..f84f090 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,9 +62,9 @@ dependencies = [
"accesskit",
"accesskit_consumer",
"hashbrown",
- "objc2",
+ "objc2 0.5.2",
"objc2-app-kit",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
]
[[package]]
@@ -133,15 +133,14 @@ dependencies = [
[[package]]
name = "actix-http"
-version = "3.9.0"
+version = "3.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48f96fc3003717aeb9856ca3d02a8c7de502667ad76eeacd830b48d2e91fac4"
+checksum = "0fa882656b67966045e4152c634051e70346939fced7117d5f0b52146a7c74c9"
dependencies = [
"actix-codec",
"actix-rt",
"actix-service",
"actix-utils",
- "ahash",
"base64 0.22.1",
"bitflags 2.9.0",
"brotli",
@@ -150,6 +149,7 @@ dependencies = [
"derive_more",
"encoding_rs",
"flate2",
+ "foldhash",
"futures-core",
"h2 0.3.26",
"http 0.2.12",
@@ -161,7 +161,7 @@ dependencies = [
"mime",
"percent-encoding",
"pin-project-lite",
- "rand",
+ "rand 0.9.0",
"sha1",
"smallvec",
"tokio",
@@ -207,9 +207,9 @@ dependencies = [
[[package]]
name = "actix-server"
-version = "2.5.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca2549781d8dd6d75c40cf6b6051260a2cc2f3c62343d761a969a0640646894"
+checksum = "6398974fd4284f4768af07965701efbbb5fdc0616bff20cade1bb14b77675e24"
dependencies = [
"actix-rt",
"actix-service",
@@ -224,12 +224,11 @@ dependencies = [
[[package]]
name = "actix-service"
-version = "2.0.2"
+version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a"
+checksum = "9e46f36bf0e5af44bdc4bdb36fbbd421aa98c79a9bce724e1edeb3894e10dc7f"
dependencies = [
"futures-core",
- "paste",
"pin-project-lite",
]
@@ -245,9 +244,9 @@ dependencies = [
[[package]]
name = "actix-web"
-version = "4.9.0"
+version = "4.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9180d76e5cc7ccbc4d60a506f2c727730b154010262df5b910eb17dbe4b8cb38"
+checksum = "f2e3b15b3dc6c6ed996e4032389e9849d4ab002b1e92fbfe85b5f307d1479b4d"
dependencies = [
"actix-codec",
"actix-http",
@@ -258,13 +257,13 @@ dependencies = [
"actix-service",
"actix-utils",
"actix-web-codegen",
- "ahash",
"bytes",
"bytestring",
"cfg-if",
"cookie",
"derive_more",
"encoding_rs",
+ "foldhash",
"futures-core",
"futures-util",
"impl-more",
@@ -282,6 +281,7 @@ dependencies = [
"smallvec",
"socket2",
"time",
+ "tracing",
"url",
]
@@ -319,11 +319,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
"once_cell",
"serde",
"version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
]
[[package]]
@@ -394,9 +394,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.95"
+version = "1.0.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
[[package]]
name = "approx"
@@ -423,9 +423,9 @@ dependencies = [
"core-graphics",
"image",
"log",
- "objc2",
+ "objc2 0.5.2",
"objc2-app-kit",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
"parking_lot",
"windows-sys 0.48.0",
"x11rb",
@@ -530,7 +530,7 @@ dependencies = [
"futures-lite",
"parking",
"polling",
- "rustix",
+ "rustix 0.38.44",
"slab",
"tracing",
"windows-sys 0.59.0",
@@ -562,7 +562,7 @@ dependencies = [
"cfg-if",
"event-listener",
"futures-lite",
- "rustix",
+ "rustix 0.38.44",
"tracing",
]
@@ -589,7 +589,7 @@ dependencies = [
"cfg-if",
"futures-core",
"futures-io",
- "rustix",
+ "rustix 0.38.44",
"signal-hook-registry",
"slab",
"windows-sys 0.59.0",
@@ -603,9 +603,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.87"
+version = "0.1.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
dependencies = [
"proc-macro2",
"quote",
@@ -691,9 +691,9 @@ dependencies = [
[[package]]
name = "avif-serialize"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e335041290c43101ca215eed6f43ec437eb5a42125573f600fc3fa42b9bddd62"
+checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e"
dependencies = [
"arrayvec",
]
@@ -788,7 +788,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
dependencies = [
- "objc2",
+ "objc2 0.5.2",
]
[[package]]
@@ -806,9 +806,9 @@ dependencies = [
[[package]]
name = "brotli"
-version = "6.0.0"
+version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
@@ -817,9 +817,9 @@ dependencies = [
[[package]]
name = "brotli-decompressor"
-version = "4.0.1"
+version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
+checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
@@ -827,15 +827,15 @@ dependencies = [
[[package]]
name = "built"
-version = "0.7.5"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b"
+checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b"
[[package]]
name = "bumpalo"
-version = "3.16.0"
+version = "3.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
[[package]]
name = "bytemuck"
@@ -848,21 +848,15 @@ dependencies = [
[[package]]
name = "bytemuck_derive"
-version = "1.8.1"
+version = "1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a"
+checksum = "2ff22c2722516255d1823ce3cc4bc0b154dbc9364be5c905d6baa6eccbbc8774"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
[[package]]
name = "byteorder-lite"
version = "0.1.0"
@@ -871,15 +865,15 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]]
name = "bytes"
-version = "1.7.2"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
[[package]]
name = "bytestring"
-version = "1.3.1"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72"
+checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f"
dependencies = [
"bytes",
]
@@ -893,7 +887,7 @@ dependencies = [
"bitflags 2.9.0",
"log",
"polling",
- "rustix",
+ "rustix 0.38.44",
"slab",
"thiserror 1.0.69",
]
@@ -905,16 +899,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
dependencies = [
"calloop",
- "rustix",
+ "rustix 0.38.44",
"wayland-backend",
"wayland-client",
]
[[package]]
name = "cc"
-version = "1.1.28"
+version = "1.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
dependencies = [
"jobserver",
"libc",
@@ -1010,14 +1004,14 @@ dependencies = [
[[package]]
name = "console"
-version = "0.15.8"
+version = "0.15.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
dependencies = [
"encode_unicode",
- "lazy_static",
"libc",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -1030,12 +1024,6 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
[[package]]
name = "cookie"
version = "0.16.2"
@@ -1099,9 +1087,9 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
dependencies = [
"libc",
]
@@ -1117,9 +1105,9 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
@@ -1136,15 +1124,15 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
[[package]]
name = "crunchy"
-version = "0.2.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
[[package]]
name = "crypto-common"
@@ -1164,24 +1152,32 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
[[package]]
name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
dependencies = [
"powerfmt",
]
[[package]]
name = "derive_more"
-version = "0.99.18"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
dependencies = [
- "convert_case",
"proc-macro2",
"quote",
- "rustc_version",
"syn",
+ "unicode-xid",
]
[[package]]
@@ -1200,6 +1196,17 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "dlib"
version = "0.5.2"
@@ -1262,9 +1269,9 @@ dependencies = [
"image",
"js-sys",
"log",
- "objc2",
+ "objc2 0.5.2",
"objc2-app-kit",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
"parking_lot",
"percent-encoding",
"profiling",
@@ -1410,9 +1417,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.13.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
[[package]]
name = "emath"
@@ -1426,15 +1433,15 @@ dependencies = [
[[package]]
name = "encode_unicode"
-version = "0.3.6"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
[[package]]
name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
dependencies = [
"cfg-if",
]
@@ -1525,9 +1532,9 @@ checksum = "fc7e7a64c02cf7a5b51e745a9e45f60660a286f151c238b9d397b3e923f5082f"
[[package]]
name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "errno"
@@ -1583,24 +1590,24 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.1"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
[[package]]
name = "fdeflate"
-version = "0.3.5"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
dependencies = [
"simd-adler32",
]
[[package]]
name = "flate2"
-version = "1.0.34"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -1614,9 +1621,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "foreign-types"
@@ -1771,7 +1778,21 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+ "wasm-bindgen",
]
[[package]]
@@ -1828,9 +1849,9 @@ dependencies = [
"glutin_glx_sys",
"glutin_wgl_sys",
"libloading",
- "objc2",
+ "objc2 0.5.2",
"objc2-app-kit",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
"once_cell",
"raw-window-handle",
"wayland-sys",
@@ -1939,16 +1960,16 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.4.6"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
dependencies = [
"atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
- "http 1.1.0",
+ "http 1.3.1",
"indexmap",
"slab",
"tokio",
@@ -1958,9 +1979,9 @@ dependencies = [
[[package]]
name = "half"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
dependencies = [
"cfg-if",
"crunchy",
@@ -1968,9 +1989,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.15.0"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
dependencies = [
"foldhash",
]
@@ -1981,12 +2002,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
[[package]]
name = "hermit-abi"
version = "0.4.0"
@@ -2027,9 +2042,9 @@ dependencies = [
[[package]]
name = "http"
-version = "1.1.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
dependencies = [
"bytes",
"fnv",
@@ -2043,27 +2058,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
dependencies = [
"bytes",
- "http 1.1.0",
+ "http 1.3.1",
]
[[package]]
name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
dependencies = [
"bytes",
- "futures-util",
- "http 1.1.0",
+ "futures-core",
+ "http 1.3.1",
"http-body",
"pin-project-lite",
]
[[package]]
name = "httparse"
-version = "1.9.5"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
[[package]]
name = "httpdate"
@@ -2073,15 +2088,15 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "hyper"
-version = "1.4.1"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "h2 0.4.6",
- "http 1.1.0",
+ "h2 0.4.8",
+ "http 1.3.1",
"http-body",
"httparse",
"itoa",
@@ -2093,12 +2108,12 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.27.3"
+version = "0.27.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
dependencies = [
"futures-util",
- "http 1.1.0",
+ "http 1.3.1",
"hyper",
"hyper-util",
"rustls",
@@ -2126,14 +2141,14 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "http 1.1.0",
+ "http 1.3.1",
"http-body",
"hyper",
"pin-project-lite",
@@ -2144,13 +2159,142 @@ dependencies = [
]
[[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
]
[[package]]
@@ -2178,9 +2322,9 @@ dependencies = [
[[package]]
name = "image-webp"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
+checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
dependencies = [
"byteorder-lite",
"quick-error",
@@ -2203,15 +2347,15 @@ dependencies = [
[[package]]
name = "impl-more"
-version = "0.1.6"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d"
+checksum = "e8a5a9a0ff0086c7a148acb942baaabeadf9504d10400b5a05645853729b9cd2"
[[package]]
name = "indexmap"
-version = "2.6.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
dependencies = [
"equivalent",
"hashbrown",
@@ -2219,13 +2363,14 @@ dependencies = [
[[package]]
name = "insta"
-version = "1.40.0"
+version = "1.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60"
+checksum = "50259abbaa67d11d2bcafc7ba1d094ed7a0c70e3ce893f0d0997f73558cb3084"
dependencies = [
"console",
- "lazy_static",
"linked-hash-map",
+ "once_cell",
+ "pin-project",
"similar",
]
@@ -2242,9 +2387,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.10.1"
+version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
[[package]]
name = "itertools"
@@ -2257,9 +2402,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.11"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jni"
@@ -2300,9 +2445,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
[[package]]
name = "js-sys"
-version = "0.3.76"
+version = "0.3.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
dependencies = [
"once_cell",
"wasm-bindgen",
@@ -2345,15 +2490,15 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]]
name = "libc"
-version = "0.2.170"
+version = "0.2.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
[[package]]
name = "libfuzzer-sys"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa"
+checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
dependencies = [
"arbitrary",
"cc",
@@ -2377,7 +2522,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.9.0",
"libc",
- "redox_syscall 0.5.7",
+ "redox_syscall 0.5.10",
]
[[package]]
@@ -2388,9 +2533,21 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+
+[[package]]
+name = "litemap"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
[[package]]
name = "litrs"
@@ -2427,9 +2584,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.22"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
[[package]]
name = "loop9"
@@ -2532,9 +2689,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
dependencies = [
"adler2",
"simd-adler32",
@@ -2542,14 +2699,13 @@ dependencies = [
[[package]]
name = "mio"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
dependencies = [
- "hermit-abi 0.3.9",
"libc",
"log",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys 0.52.0",
]
@@ -2571,7 +2727,7 @@ dependencies = [
"spirv",
"strum",
"termcolor",
- "thiserror 2.0.9",
+ "thiserror 2.0.12",
"unicode-xid",
]
@@ -2604,9 +2760,9 @@ dependencies = [
[[package]]
name = "native-tls"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
dependencies = [
"libc",
"log",
@@ -2820,6 +2976,15 @@ dependencies = [
"objc2-encode",
]
+[[package]]
+name = "objc2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3531f65190d9cff863b77a99857e74c314dd16bf56c538c4b57c7cbc3f3a6e59"
+dependencies = [
+ "objc2-encode",
+]
+
[[package]]
name = "objc2-app-kit"
version = "0.2.2"
@@ -2829,10 +2994,10 @@ dependencies = [
"bitflags 2.9.0",
"block2",
"libc",
- "objc2",
+ "objc2 0.5.2",
"objc2-core-data",
"objc2-core-image",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
"objc2-quartz-core",
]
@@ -2844,9 +3009,9 @@ checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
dependencies = [
"bitflags 2.9.0",
"block2",
- "objc2",
+ "objc2 0.5.2",
"objc2-core-location",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
]
[[package]]
@@ -2856,8 +3021,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
dependencies = [
"block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
]
[[package]]
@@ -2868,8 +3033,8 @@ checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
"bitflags 2.9.0",
"block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
]
[[package]]
@@ -2879,8 +3044,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
dependencies = [
"block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
"objc2-metal",
]
@@ -2891,9 +3056,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
dependencies = [
"block2",
- "objc2",
+ "objc2 0.5.2",
"objc2-contacts",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
]
[[package]]
@@ -2912,7 +3077,17 @@ dependencies = [
"block2",
"dispatch",
"libc",
- "objc2",
+ "objc2 0.5.2",
+]
+
+[[package]]
+name = "objc2-foundation"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a21c6c9014b82c39515db5b396f91645182611c97d24637cf56ac01e5f8d998"
+dependencies = [
+ "bitflags 2.9.0",
+ "objc2 0.6.0",
]
[[package]]
@@ -2922,9 +3097,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
dependencies = [
"block2",
- "objc2",
+ "objc2 0.5.2",
"objc2-app-kit",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
]
[[package]]
@@ -2935,8 +3110,8 @@ checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
dependencies = [
"bitflags 2.9.0",
"block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
]
[[package]]
@@ -2947,8 +3122,8 @@ checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
"bitflags 2.9.0",
"block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
"objc2-metal",
]
@@ -2958,8 +3133,8 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
dependencies = [
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
]
[[package]]
@@ -2970,12 +3145,12 @@ checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
dependencies = [
"bitflags 2.9.0",
"block2",
- "objc2",
+ "objc2 0.5.2",
"objc2-cloud-kit",
"objc2-core-data",
"objc2-core-image",
"objc2-core-location",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
"objc2-link-presentation",
"objc2-quartz-core",
"objc2-symbols",
@@ -2990,8 +3165,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
dependencies = [
"block2",
- "objc2",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
]
[[package]]
@@ -3002,31 +3177,31 @@ checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
dependencies = [
"bitflags 2.9.0",
"block2",
- "objc2",
+ "objc2 0.5.2",
"objc2-core-location",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
]
[[package]]
name = "object"
-version = "0.36.5"
+version = "0.36.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.20.2"
+version = "1.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
[[package]]
name = "openssl"
-version = "0.10.66"
+version = "0.10.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
dependencies = [
"bitflags 2.9.0",
"cfg-if",
@@ -3050,15 +3225,15 @@ dependencies = [
[[package]]
name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
[[package]]
name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
dependencies = [
"cc",
"libc",
@@ -3077,9 +3252,9 @@ dependencies = [
[[package]]
name = "ordered-float"
-version = "4.3.0"
+version = "4.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
dependencies = [
"num-traits",
]
@@ -3133,7 +3308,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.7",
+ "redox_syscall 0.5.10",
"smallvec",
"windows-targets 0.52.6",
]
@@ -3172,9 +3347,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
[[package]]
name = "pin-utils"
@@ -3195,15 +3370,15 @@ dependencies = [
[[package]]
name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "png"
-version = "0.17.14"
+version = "0.17.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
dependencies = [
"bitflags 1.3.2",
"crc32fast",
@@ -3230,9 +3405,9 @@ checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
dependencies = [
"cfg-if",
"concurrent-queue",
- "hermit-abi 0.4.0",
+ "hermit-abi",
"pin-project-lite",
- "rustix",
+ "rustix 0.38.44",
"tracing",
"windows-sys 0.59.0",
]
@@ -3245,11 +3420,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
- "zerocopy",
+ "zerocopy 0.8.23",
]
[[package]]
@@ -3263,9 +3438,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
dependencies = [
"unicode-ident",
]
@@ -3325,13 +3500,19 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.37"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
dependencies = [
"proc-macro2",
]
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
[[package]]
name = "rand"
version = "0.8.5"
@@ -3339,8 +3520,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+ "zerocopy 0.8.23",
]
[[package]]
@@ -3350,7 +3542,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[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.3",
]
[[package]]
@@ -3359,7 +3561,16 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.2",
]
[[package]]
@@ -3388,8 +3599,8 @@ dependencies = [
"once_cell",
"paste",
"profiling",
- "rand",
- "rand_chacha",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
"simd_helpers",
"system-deps",
"thiserror 1.0.69",
@@ -3455,18 +3666,18 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
dependencies = [
"bitflags 2.9.0",
]
[[package]]
name = "regex"
-version = "1.11.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
@@ -3476,9 +3687,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
dependencies = [
"aho-corasick",
"memchr",
@@ -3505,17 +3716,17 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
[[package]]
name = "reqwest"
-version = "0.12.8"
+version = "0.12.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
dependencies = [
"base64 0.22.1",
"bytes",
"encoding_rs",
"futures-core",
"futures-util",
- "h2 0.4.6",
- "http 1.1.0",
+ "h2 0.4.8",
+ "http 1.3.1",
"http-body",
"http-body-util",
"hyper",
@@ -3538,6 +3749,7 @@ dependencies = [
"system-configuration",
"tokio",
"tokio-native-tls",
+ "tower",
"tower-service",
"url",
"wasm-bindgen",
@@ -3554,15 +3766,14 @@ checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
[[package]]
name = "ring"
-version = "0.17.8"
+version = "0.17.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
dependencies = [
"cc",
"cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
"libc",
- "spin",
"untrusted",
"windows-sys 0.52.0",
]
@@ -3591,15 +3802,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
[[package]]
name = "rustix"
version = "0.38.44"
@@ -3609,15 +3811,28 @@ dependencies = [
"bitflags 2.9.0",
"errno",
"libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
+dependencies = [
+ "bitflags 2.9.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.3",
"windows-sys 0.59.0",
]
[[package]]
name = "rustls"
-version = "0.23.14"
+version = "0.23.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
+checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
dependencies = [
"log",
"once_cell",
@@ -3639,15 +3854,15 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
[[package]]
name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "0aa4eeac2588ffff23e9d7a7e9b3f971c5fb5b7ebc9452745e0c232c64f83b2f"
dependencies = [
"ring",
"rustls-pki-types",
@@ -3662,9 +3877,9 @@ checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
[[package]]
name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
[[package]]
name = "safe_arch"
@@ -3686,9 +3901,9 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.26"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
dependencies = [
"windows-sys 0.59.0",
]
@@ -3733,34 +3948,28 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.12.0"
+version = "2.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
dependencies = [
"core-foundation-sys",
"libc",
]
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
[[package]]
name = "serde"
-version = "1.0.210"
+version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",
@@ -3769,9 +3978,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.128"
+version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
dependencies = [
"itoa",
"memchr",
@@ -3876,9 +4085,9 @@ dependencies = [
[[package]]
name = "similar"
-version = "2.6.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
+checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
[[package]]
name = "slab"
@@ -3900,9 +4109,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.13.2"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
[[package]]
name = "smithay-client-toolkit"
@@ -3917,7 +4126,7 @@ dependencies = [
"libc",
"log",
"memmap2",
- "rustix",
+ "rustix 0.38.44",
"thiserror 1.0.69",
"wayland-backend",
"wayland-client",
@@ -3951,20 +4160,14 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
dependencies = [
"libc",
"windows-sys 0.52.0",
]
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
[[package]]
name = "spirv"
version = "0.3.0+sdk-1.3.268.0"
@@ -3974,6 +4177,12 @@ dependencies = [
"bitflags 2.9.0",
]
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
[[package]]
name = "static_assertions"
version = "1.1.0"
@@ -4016,9 +4225,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
-version = "2.0.93"
+version = "2.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
dependencies = [
"proc-macro2",
"quote",
@@ -4027,13 +4236,24 @@ dependencies = [
[[package]]
name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
dependencies = [
"futures-core",
]
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "system-configuration"
version = "0.6.1"
@@ -4076,14 +4296,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
-version = "3.13.0"
+version = "3.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
dependencies = [
- "cfg-if",
"fastrand",
+ "getrandom 0.3.2",
"once_cell",
- "rustix",
+ "rustix 1.0.3",
"windows-sys 0.59.0",
]
@@ -4107,11 +4327,11 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "2.0.9"
+version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
dependencies = [
- "thiserror-impl 2.0.9",
+ "thiserror-impl 2.0.12",
]
[[package]]
@@ -4127,9 +4347,9 @@ dependencies = [
[[package]]
name = "thiserror-impl"
-version = "2.0.9"
+version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
dependencies = [
"proc-macro2",
"quote",
@@ -4179,9 +4399,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.36"
+version = "0.3.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
dependencies = [
"deranged",
"itoa",
@@ -4194,15 +4414,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.2"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
[[package]]
name = "time-macros"
-version = "0.2.18"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
dependencies = [
"num-conv",
"time-core",
@@ -4234,25 +4454,20 @@ dependencies = [
]
[[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
]
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
[[package]]
name = "tokio"
-version = "1.40.0"
+version = "1.44.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
dependencies = [
"backtrace",
"bytes",
@@ -4277,20 +4492,19 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
dependencies = [
"rustls",
- "rustls-pki-types",
"tokio",
]
[[package]]
name = "tokio-util"
-version = "0.7.12"
+version = "0.7.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
dependencies = [
"bytes",
"futures-core",
@@ -4301,9 +4515,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.8.19"
+version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
dependencies = [
"serde",
"serde_spanned",
@@ -4333,6 +4547,27 @@ dependencies = [
"winnow",
]
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
[[package]]
name = "tower-service"
version = "0.3.3"
@@ -4341,9 +4576,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
dependencies = [
"log",
"pin-project-lite",
@@ -4364,9 +4599,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
dependencies = [
"once_cell",
"valuable",
@@ -4433,9 +4668,9 @@ dependencies = [
[[package]]
name = "typenum"
-version = "1.17.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
[[package]]
name = "uds_windows"
@@ -4454,26 +4689,11 @@ version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
[[package]]
name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
name = "unicode-segmentation"
@@ -4507,9 +4727,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "ureq"
-version = "2.10.1"
+version = "2.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
dependencies = [
"base64 0.22.1",
"flate2",
@@ -4523,15 +4743,27 @@ dependencies = [
[[package]]
name = "url"
-version = "2.5.2"
+version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
dependencies = [
"form_urlencoded",
"idna",
"percent-encoding",
]
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
[[package]]
name = "v_frame"
version = "0.3.8"
@@ -4545,9 +4777,9 @@ dependencies = [
[[package]]
name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
[[package]]
name = "vcpkg"
@@ -4593,21 +4825,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
-name = "wasm-bindgen"
-version = "0.2.99"
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
dependencies = [
"cfg-if",
"once_cell",
+ "rustversion",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
dependencies = [
"bumpalo",
"log",
@@ -4619,9 +4861,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.49"
+version = "0.4.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
dependencies = [
"cfg-if",
"js-sys",
@@ -4632,9 +4874,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -4642,9 +4884,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [
"proc-macro2",
"quote",
@@ -4655,9 +4897,12 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
[[package]]
name = "wayland-backend"
@@ -4667,7 +4912,7 @@ checksum = "b7208998eaa3870dad37ec8836979581506e0c5c64c20c9e79e9d2a10d6f47bf"
dependencies = [
"cc",
"downcast-rs",
- "rustix",
+ "rustix 0.38.44",
"scoped-tls",
"smallvec",
"wayland-sys",
@@ -4680,7 +4925,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2120de3d33638aaef5b9f4472bff75f07c56379cf76ea320bd3a3d65ecaf73f"
dependencies = [
"bitflags 2.9.0",
- "rustix",
+ "rustix 0.38.44",
"wayland-backend",
"wayland-scanner",
]
@@ -4702,7 +4947,7 @@ version = "0.31.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a93029cbb6650748881a00e4922b076092a6a08c11e7fbdb923f064b23968c5d"
dependencies = [
- "rustix",
+ "rustix 0.38.44",
"wayland-client",
"xcursor",
]
@@ -4770,9 +5015,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.76"
+version = "0.3.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4790,18 +5035,17 @@ dependencies = [
[[package]]
name = "webbrowser"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9fe1ebb156110ff855242c1101df158b822487e4957b0556d9ffce9db0f535"
+checksum = "d5df295f8451142f1856b1bd86a606dfe9587d439bc036e319c827700dbd555e"
dependencies = [
- "block2",
"core-foundation 0.10.0",
"home",
"jni",
"log",
"ndk-context",
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
"url",
"web-sys",
]
@@ -4823,9 +5067,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]]
name = "wgpu"
-version = "24.0.1"
+version = "24.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47f55718f85c2fa756edffa0e7f0e0a60aba463d1362b57e23123c58f035e4b6"
+checksum = "35904fb00ba2d2e0a4d002fcbbb6e1b89b574d272a50e5fc95f6e81cf281c245"
dependencies = [
"arrayvec",
"bitflags 2.9.0",
@@ -4866,7 +5110,7 @@ dependencies = [
"raw-window-handle",
"rustc-hash",
"smallvec",
- "thiserror 2.0.9",
+ "thiserror 2.0.12",
"wgpu-hal",
"wgpu-types",
]
@@ -4905,7 +5149,7 @@ dependencies = [
"renderdoc-sys",
"rustc-hash",
"smallvec",
- "thiserror 2.0.9",
+ "thiserror 2.0.12",
"wasm-bindgen",
"web-sys",
"wgpu-types",
@@ -4983,8 +5227,8 @@ checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
dependencies = [
"windows-implement",
"windows-interface",
- "windows-result",
- "windows-strings",
+ "windows-result 0.2.0",
+ "windows-strings 0.1.0",
"windows-targets 0.52.6",
]
@@ -5011,14 +5255,20 @@ dependencies = [
]
[[package]]
-name = "windows-registry"
-version = "0.2.0"
+name = "windows-link"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+
+[[package]]
+name = "windows-registry"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
dependencies = [
- "windows-result",
- "windows-strings",
- "windows-targets 0.52.6",
+ "windows-result 0.3.2",
+ "windows-strings 0.3.1",
+ "windows-targets 0.53.0",
]
[[package]]
@@ -5030,16 +5280,34 @@ dependencies = [
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-result"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+dependencies = [
+ "windows-link",
+]
+
[[package]]
name = "windows-strings"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
dependencies = [
- "windows-result",
+ "windows-result 0.2.0",
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-strings"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+dependencies = [
+ "windows-link",
+]
+
[[package]]
name = "windows-sys"
version = "0.45.0"
@@ -5115,13 +5383,29 @@ dependencies = [
"windows_aarch64_gnullvm 0.52.6",
"windows_aarch64_msvc 0.52.6",
"windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
"windows_i686_msvc 0.52.6",
"windows_x86_64_gnu 0.52.6",
"windows_x86_64_gnullvm 0.52.6",
"windows_x86_64_msvc 0.52.6",
]
+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
@@ -5140,6 +5424,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
@@ -5158,6 +5448,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
@@ -5176,12 +5472,24 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
@@ -5200,6 +5508,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
@@ -5218,6 +5532,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
@@ -5236,6 +5556,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
@@ -5254,6 +5580,12 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
[[package]]
name = "winit"
version = "0.30.9"
@@ -5277,16 +5609,16 @@ dependencies = [
"libc",
"memmap2",
"ndk",
- "objc2",
+ "objc2 0.5.2",
"objc2-app-kit",
- "objc2-foundation",
+ "objc2-foundation 0.2.2",
"objc2-ui-kit",
"orbclient",
"percent-encoding",
"pin-project",
"raw-window-handle",
"redox_syscall 0.4.1",
- "rustix",
+ "rustix 0.38.44",
"sctk-adwaita",
"smithay-client-toolkit",
"smol_str",
@@ -5308,13 +5640,34 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
dependencies = [
"memchr",
]
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.9.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
[[package]]
name = "wxbox-client"
version = "0.1.0"
@@ -5328,10 +5681,12 @@ dependencies = [
"egui_extras",
"egui_glow",
"ehttp",
+ "getrandom 0.3.2",
"glow",
"image",
"nalgebra-glm",
"poll-promise",
+ "rand 0.9.0",
"serde",
"toml",
"tracing",
@@ -5354,7 +5709,7 @@ version = "0.1.0"
dependencies = [
"image",
"png",
- "thiserror 2.0.9",
+ "thiserror 2.0.12",
"tracing",
]
@@ -5414,7 +5769,7 @@ dependencies = [
"libc",
"libloading",
"once_cell",
- "rustix",
+ "rustix 0.38.44",
"x11rb-protocol",
]
@@ -5465,6 +5820,30 @@ version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4"
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
[[package]]
name = "zbus"
version = "4.4.0"
@@ -5489,7 +5868,7 @@ dependencies = [
"hex",
"nix",
"ordered-stream",
- "rand",
+ "rand 0.8.5",
"serde",
"serde_repr",
"sha1",
@@ -5570,8 +5949,16 @@ version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
dependencies = [
- "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+dependencies = [
+ "zerocopy-derive 0.8.23",
]
[[package]]
@@ -5585,6 +5972,38 @@ dependencies = [
"syn",
]
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
[[package]]
name = "zeroize"
version = "1.8.1"
@@ -5592,28 +6011,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
[[package]]
-name = "zstd"
-version = "0.13.2"
+name = "zerovec"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
dependencies = [
"zstd-safe",
]
[[package]]
name = "zstd-safe"
-version = "7.2.1"
+version = "7.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
dependencies = [
"zstd-sys",
]
[[package]]
name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
+version = "2.0.15+zstd.1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
dependencies = [
"cc",
"pkg-config",
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index ca720ed..66aad00 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -15,6 +15,8 @@ ehttp = "0.5"
image = "0.25"
bytemuck = "1.22"
nalgebra-glm = "0.19"
+rand = "0.9"
+getrandom = { version = "0.3", features = ["wasm_js"] }
serde = { version = "1", features = ["derive"] }
toml = "0.8"
egui_extras = { version = "0.31", features = ["serde"] }
diff --git a/crates/client/dist/index.html b/crates/client/dist/index.html
index fe21979..b4f0069 100644
--- a/crates/client/dist/index.html
+++ b/crates/client/dist/index.html
@@ -94,7 +94,7 @@
}
}
</style>
-<link rel="modulepreload" href="/wxbox-client-96cce58fa4aaba7a.js" crossorigin="anonymous" integrity="sha384-rOwE8Z+dDRuQLsg/fUPw7V9/GJ3Oifopq6b88/pPM7xq2QmCD54SJdnx/SgS1/R1"><link rel="preload" href="/wxbox-client-96cce58fa4aaba7a_bg.wasm" crossorigin="anonymous" integrity="sha384-Rw805YQqcRKZ9iiDhDqyezvRhVu5nQt+IPPnlZCFQ+bPI7pIaxw5QmFJ4EuhBRVf" as="fetch" type="application/wasm"></head>
+<link rel="modulepreload" href="/wxbox-client-d12479fc5b6a11f2.js" crossorigin="anonymous" integrity="sha384-aCfm9OVd/TH2L9v1Uxwdt7G/eHUDCXYq8UquzFFkRjWK794kAfYG4RWiDDu/i5DW"><link rel="preload" href="/wxbox-client-d12479fc5b6a11f2_bg.wasm" crossorigin="anonymous" integrity="sha384-tXCe7d8yqYuqyhU/Tu9i3EBZGCugKf3HuhaPOamXrdvv7vV2oawP1qwlsWmrEL68" as="fetch" type="application/wasm"></head>
<body>
<!-- The WASM code will resize the canvas dynamically -->
@@ -111,8 +111,8 @@
<script type="module">
-import init, * as bindings from '/wxbox-client-96cce58fa4aaba7a.js';
-const wasm = await init({ module_or_path: '/wxbox-client-96cce58fa4aaba7a_bg.wasm' });
+import init, * as bindings from '/wxbox-client-d12479fc5b6a11f2.js';
+const wasm = await init({ module_or_path: '/wxbox-client-d12479fc5b6a11f2_bg.wasm' });
window.wasmBindings = bindings;
diff --git a/crates/client/dist/wxbox-client-96cce58fa4aaba7a.js b/crates/client/dist/wxbox-client-d12479fc5b6a11f2.js
similarity index 71%
rename from crates/client/dist/wxbox-client-96cce58fa4aaba7a.js
rename to crates/client/dist/wxbox-client-d12479fc5b6a11f2.js
index 1fbfddb..981d258 100644
--- a/crates/client/dist/wxbox-client-96cce58fa4aaba7a.js
+++ b/crates/client/dist/wxbox-client-d12479fc5b6a11f2.js
@@ -102,6 +102,11 @@ function getDataViewMemory0() {
return cachedDataViewMemory0;
}
+function getArrayU8FromWasm0(ptr, len) {
+ ptr = ptr >>> 0;
+ return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
+}
+
const CLOSURE_DTORS = (typeof FinalizationRegistry === 'undefined')
? { register: () => {}, unregister: () => {} }
: new FinalizationRegistry(state => {
@@ -198,7 +203,7 @@ function debugString(val) {
return className;
}
function __wbg_adapter_30(arg0, arg1, arg2) {
- wasm.closure791_externref_shim(arg0, arg1, arg2);
+ wasm.closure786_externref_shim(arg0, arg1, arg2);
}
function takeFromExternrefTable0(idx) {
@@ -207,14 +212,14 @@ function takeFromExternrefTable0(idx) {
return value;
}
function __wbg_adapter_35(arg0, arg1) {
- const ret = wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2d82504a7fc00ac2_multivalue_shim(arg0, arg1);
+ const ret = wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he3535e387ff3d727_multivalue_shim(arg0, arg1);
if (ret[1]) {
throw takeFromExternrefTable0(ret[0]);
}
}
function __wbg_adapter_38(arg0, arg1, arg2) {
- wasm.closure1294_externref_shim(arg0, arg1, arg2);
+ wasm.closure1302_externref_shim(arg0, arg1, arg2);
}
/**
@@ -276,355 +281,355 @@ async function __wbg_load(module, imports) {
function __wbg_get_imports() {
const imports = {};
imports.wbg = {};
- imports.wbg.__wbg_activeElement_ea31ecc5423c6046 = function(arg0) {
+ imports.wbg.__wbg_activeElement_367599fdfa7ad115 = function(arg0) {
const ret = arg0.activeElement;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_activeTexture_446c979476d36a40 = function(arg0, arg1) {
+ imports.wbg.__wbg_activeTexture_0f19d8acfa0a14c2 = function(arg0, arg1) {
arg0.activeTexture(arg1 >>> 0);
};
- imports.wbg.__wbg_activeTexture_aec8c249ceb838d2 = function(arg0, arg1) {
+ imports.wbg.__wbg_activeTexture_460f2e367e813fb0 = function(arg0, arg1) {
arg0.activeTexture(arg1 >>> 0);
};
- imports.wbg.__wbg_addEventListener_37872d53aeb4c65a = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_addEventListener_84ae3eac6e15480a = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
arg0.addEventListener(getStringFromWasm0(arg1, arg2), arg3, arg4);
}, arguments) };
- imports.wbg.__wbg_altKey_d5409f5ddaa29593 = function(arg0) {
+ imports.wbg.__wbg_altKey_c33c03aed82e4275 = function(arg0) {
const ret = arg0.altKey;
return ret;
};
- imports.wbg.__wbg_altKey_d54599b3b6b6cf22 = function(arg0) {
+ imports.wbg.__wbg_altKey_d7495666df921121 = function(arg0) {
const ret = arg0.altKey;
return ret;
};
- imports.wbg.__wbg_appendChild_d22bc7af6b96b3f1 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_appendChild_8204974b7328bf98 = function() { return handleError(function (arg0, arg1) {
const ret = arg0.appendChild(arg1);
return ret;
}, arguments) };
- imports.wbg.__wbg_arrayBuffer_1be504e3eb62daa4 = function(arg0) {
+ imports.wbg.__wbg_arrayBuffer_f18c144cd0125f07 = function(arg0) {
const ret = arg0.arrayBuffer();
return ret;
};
- imports.wbg.__wbg_at_479807bfddde3a33 = function(arg0, arg1) {
+ imports.wbg.__wbg_at_7d852dd9f194d43e = function(arg0, arg1) {
const ret = arg0.at(arg1);
return ret;
};
- imports.wbg.__wbg_attachShader_4dc5977795b5d865 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_attachShader_3d4eb6af9e3e7bd1 = function(arg0, arg1, arg2) {
arg0.attachShader(arg1, arg2);
};
- imports.wbg.__wbg_attachShader_9b79a4896fee779d = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_attachShader_94e758c8b5283eb2 = function(arg0, arg1, arg2) {
arg0.attachShader(arg1, arg2);
};
- imports.wbg.__wbg_bindBuffer_e9412cc77f8130d6 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_bindBuffer_309c9a6c21826cf5 = function(arg0, arg1, arg2) {
arg0.bindBuffer(arg1 >>> 0, arg2);
};
- imports.wbg.__wbg_bindBuffer_ff7c55f1062014bc = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_bindBuffer_f32f587f1c2962a7 = function(arg0, arg1, arg2) {
arg0.bindBuffer(arg1 >>> 0, arg2);
};
- imports.wbg.__wbg_bindTexture_8b97cf7511a725d0 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_bindTexture_a6e795697f49ebd1 = function(arg0, arg1, arg2) {
arg0.bindTexture(arg1 >>> 0, arg2);
};
- imports.wbg.__wbg_bindTexture_f65d2e377e3de352 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_bindTexture_bc8eb316247f739d = function(arg0, arg1, arg2) {
arg0.bindTexture(arg1 >>> 0, arg2);
};
- imports.wbg.__wbg_bindVertexArrayOES_19ed43bbe1241f7a = function(arg0, arg1) {
+ imports.wbg.__wbg_bindVertexArrayOES_da8e7059b789629e = function(arg0, arg1) {
arg0.bindVertexArrayOES(arg1);
};
- imports.wbg.__wbg_bindVertexArray_67a807a1cd64976a = function(arg0, arg1) {
+ imports.wbg.__wbg_bindVertexArray_6b4b88581064b71f = function(arg0, arg1) {
arg0.bindVertexArray(arg1);
};
- imports.wbg.__wbg_blendEquationSeparate_26681d98390d0057 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_blendEquationSeparate_c1aa26a9a5c5267e = function(arg0, arg1, arg2) {
arg0.blendEquationSeparate(arg1 >>> 0, arg2 >>> 0);
};
- imports.wbg.__wbg_blendEquationSeparate_e81d45aebb0a6f22 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_blendEquationSeparate_f3d422e981d86339 = function(arg0, arg1, arg2) {
arg0.blendEquationSeparate(arg1 >>> 0, arg2 >>> 0);
};
- imports.wbg.__wbg_blendFuncSeparate_0031130a17fd5eb8 = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_blendFuncSeparate_483be8d4dd635340 = function(arg0, arg1, arg2, arg3, arg4) {
arg0.blendFuncSeparate(arg1 >>> 0, arg2 >>> 0, arg3 >>> 0, arg4 >>> 0);
};
- imports.wbg.__wbg_blendFuncSeparate_4d5cc402dcf7389f = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_blendFuncSeparate_dafeabfc1680b2ee = function(arg0, arg1, arg2, arg3, arg4) {
arg0.blendFuncSeparate(arg1 >>> 0, arg2 >>> 0, arg3 >>> 0, arg4 >>> 0);
};
- imports.wbg.__wbg_blendFunc_3fa0c1671c2d6442 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_blendFunc_9454884a3cfd2911 = function(arg0, arg1, arg2) {
arg0.blendFunc(arg1 >>> 0, arg2 >>> 0);
};
- imports.wbg.__wbg_blendFunc_57545f7f7240fd88 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_blendFunc_c3b74be5a39c665f = function(arg0, arg1, arg2) {
arg0.blendFunc(arg1 >>> 0, arg2 >>> 0);
};
- imports.wbg.__wbg_blockSize_6464e214800294a9 = function(arg0) {
+ imports.wbg.__wbg_blockSize_1490803190b57a34 = function(arg0) {
const ret = arg0.blockSize;
return ret;
};
- imports.wbg.__wbg_blur_51f415004ecbe327 = function() { return handleError(function (arg0) {
+ imports.wbg.__wbg_blur_c2ad8cc71bac3974 = function() { return handleError(function (arg0) {
arg0.blur();
}, arguments) };
- imports.wbg.__wbg_body_8d7d8c4aa91dcad8 = function(arg0) {
+ imports.wbg.__wbg_body_942ea927546a04ba = function(arg0) {
const ret = arg0.body;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_bottom_72e7516e4f4e156a = function(arg0) {
+ imports.wbg.__wbg_bottom_79b03e9c3d6f4e1e = function(arg0) {
const ret = arg0.bottom;
return ret;
};
- imports.wbg.__wbg_bufferData_0643498950a2292f = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_bufferData_3261d3e1dd6fc903 = function(arg0, arg1, arg2, arg3) {
arg0.bufferData(arg1 >>> 0, arg2, arg3 >>> 0);
};
- imports.wbg.__wbg_bufferData_7e2b6059c35c9291 = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_bufferData_33c59bf909ea6fd3 = function(arg0, arg1, arg2, arg3) {
arg0.bufferData(arg1 >>> 0, arg2, arg3 >>> 0);
};
- imports.wbg.__wbg_buffer_61b7ce01341d7f88 = function(arg0) {
+ imports.wbg.__wbg_buffer_609cc3eee51ed158 = function(arg0) {
const ret = arg0.buffer;
return ret;
};
- imports.wbg.__wbg_button_12b22015f2d5993d = function(arg0) {
+ imports.wbg.__wbg_button_f75c56aec440ea04 = function(arg0) {
const ret = arg0.button;
return ret;
};
- imports.wbg.__wbg_call_b0d8e36992d9900d = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_call_672a4d21634d4a24 = function() { return handleError(function (arg0, arg1) {
const ret = arg0.call(arg1);
return ret;
}, arguments) };
- imports.wbg.__wbg_cancelAnimationFrame_5f7904867f6ab804 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_cancelAnimationFrame_089b48301c362fde = function() { return handleError(function (arg0, arg1) {
arg0.cancelAnimationFrame(arg1);
}, arguments) };
- imports.wbg.__wbg_cancel_32c379e69f397185 = function(arg0) {
+ imports.wbg.__wbg_cancel_ec9f8196f0b0eb21 = function(arg0) {
arg0.cancel();
};
- imports.wbg.__wbg_changedTouches_86448a1d3a872098 = function(arg0) {
+ imports.wbg.__wbg_changedTouches_3654bea4294f2e86 = function(arg0) {
const ret = arg0.changedTouches;
return ret;
};
- imports.wbg.__wbg_clearColor_7e5806f100e4cd7a = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_clearColor_d39507085c98a678 = function(arg0, arg1, arg2, arg3, arg4) {
arg0.clearColor(arg1, arg2, arg3, arg4);
};
- imports.wbg.__wbg_clearColor_d58166c97d5eef07 = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_clearColor_f0fa029dfbcc1982 = function(arg0, arg1, arg2, arg3, arg4) {
arg0.clearColor(arg1, arg2, arg3, arg4);
};
- imports.wbg.__wbg_clearInterval_998151d924a72ab2 = function(arg0, arg1) {
+ imports.wbg.__wbg_clearInterval_ad2594253cc39c4b = function(arg0, arg1) {
arg0.clearInterval(arg1);
};
- imports.wbg.__wbg_clear_16ffdcc1a1d6f0c9 = function(arg0, arg1) {
+ imports.wbg.__wbg_clear_62b9037b892f6988 = function(arg0, arg1) {
arg0.clear(arg1 >>> 0);
};
- imports.wbg.__wbg_clear_c182acb53176ea8b = function(arg0, arg1) {
+ imports.wbg.__wbg_clear_f8d5f3c348d37d95 = function(arg0, arg1) {
arg0.clear(arg1 >>> 0);
};
- imports.wbg.__wbg_clientX_18c5fbacc6398ad8 = function(arg0) {
+ imports.wbg.__wbg_clientX_5eb380a5f1fec6fd = function(arg0) {
const ret = arg0.clientX;
return ret;
};
- imports.wbg.__wbg_clientX_f73b86b8aba3591d = function(arg0) {
+ imports.wbg.__wbg_clientX_687c1a16e03e1f58 = function(arg0) {
const ret = arg0.clientX;
return ret;
};
- imports.wbg.__wbg_clientY_0974153484cf0d09 = function(arg0) {
+ imports.wbg.__wbg_clientY_78d0605ac74642c2 = function(arg0) {
const ret = arg0.clientY;
return ret;
};
- imports.wbg.__wbg_clientY_af033356579f2b9c = function(arg0) {
+ imports.wbg.__wbg_clientY_d8b9c7f0c4e2e677 = function(arg0) {
const ret = arg0.clientY;
return ret;
};
- imports.wbg.__wbg_clipboardData_d188aa1b339f8637 = function(arg0) {
+ imports.wbg.__wbg_clipboardData_04bd9c1b0935d7e6 = function(arg0) {
const ret = arg0.clipboardData;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_clipboard_b634c08b310bca2e = function(arg0) {
+ imports.wbg.__wbg_clipboard_93f8aa8cc426db44 = function(arg0) {
const ret = arg0.clipboard;
return ret;
};
- imports.wbg.__wbg_colorMask_04bc7392c9d1b568 = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_colorMask_5e7c60b9c7a57a2e = function(arg0, arg1, arg2, arg3, arg4) {
arg0.colorMask(arg1 !== 0, arg2 !== 0, arg3 !== 0, arg4 !== 0);
};
- imports.wbg.__wbg_colorMask_401f99e62155b996 = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_colorMask_6dac12039c7145ae = function(arg0, arg1, arg2, arg3, arg4) {
arg0.colorMask(arg1 !== 0, arg2 !== 0, arg3 !== 0, arg4 !== 0);
};
- imports.wbg.__wbg_compileShader_afcc43901f14a922 = function(arg0, arg1) {
+ imports.wbg.__wbg_compileShader_0ad770bbdbb9de21 = function(arg0, arg1) {
arg0.compileShader(arg1);
};
- imports.wbg.__wbg_compileShader_fab2df50ae89c5e1 = function(arg0, arg1) {
+ imports.wbg.__wbg_compileShader_2307c9d370717dd5 = function(arg0, arg1) {
arg0.compileShader(arg1);
};
- imports.wbg.__wbg_contentBoxSize_c8dcd6b272f821ba = function(arg0) {
+ imports.wbg.__wbg_contentBoxSize_638692469db816f2 = function(arg0) {
const ret = arg0.contentBoxSize;
return ret;
};
- imports.wbg.__wbg_contentRect_6fadfee6731ac5df = function(arg0) {
+ imports.wbg.__wbg_contentRect_81407eb60e52248f = function(arg0) {
const ret = arg0.contentRect;
return ret;
};
- imports.wbg.__wbg_createBuffer_567b536a03db30d2 = function(arg0) {
+ imports.wbg.__wbg_createBuffer_7a9ec3d654073660 = function(arg0) {
const ret = arg0.createBuffer();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_createBuffer_8692729b8ac9caaf = function(arg0) {
+ imports.wbg.__wbg_createBuffer_9886e84a67b68c89 = function(arg0) {
const ret = arg0.createBuffer();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_createElement_89923fcb809656b7 = function() { return handleError(function (arg0, arg1, arg2) {
+ imports.wbg.__wbg_createElement_8c9931a732ee2fea = function() { return handleError(function (arg0, arg1, arg2) {
const ret = arg0.createElement(getStringFromWasm0(arg1, arg2));
return ret;
}, arguments) };
- imports.wbg.__wbg_createProgram_b8f69529220fb50b = function(arg0) {
+ imports.wbg.__wbg_createProgram_8ff56c485f3233d0 = function(arg0) {
const ret = arg0.createProgram();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_createProgram_e2141127012594b0 = function(arg0) {
+ imports.wbg.__wbg_createProgram_da203074cafb1038 = function(arg0) {
const ret = arg0.createProgram();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_createShader_442f69b8f536a786 = function(arg0, arg1) {
+ imports.wbg.__wbg_createShader_4a256a8cc9c1ce4f = function(arg0, arg1) {
const ret = arg0.createShader(arg1 >>> 0);
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_createShader_809bd3abe629ad7a = function(arg0, arg1) {
+ imports.wbg.__wbg_createShader_983150fb1243ee56 = function(arg0, arg1) {
const ret = arg0.createShader(arg1 >>> 0);
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_createTexture_3c9e731e954515fa = function(arg0) {
+ imports.wbg.__wbg_createTexture_9c536c79b635fdef = function(arg0) {
const ret = arg0.createTexture();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_createTexture_677a150f3f985ce0 = function(arg0) {
+ imports.wbg.__wbg_createTexture_bfaa54c0cd22e367 = function(arg0) {
const ret = arg0.createTexture();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_createVertexArrayOES_950dd712f273bb06 = function(arg0) {
+ imports.wbg.__wbg_createVertexArrayOES_991b44f100f93329 = function(arg0) {
const ret = arg0.createVertexArrayOES();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_createVertexArray_68ae270682fc14aa = function(arg0) {
+ imports.wbg.__wbg_createVertexArray_e435029ae2660efd = function(arg0) {
const ret = arg0.createVertexArray();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_create_861381d799b454bc = function(arg0) {
+ imports.wbg.__wbg_create_cfe43ccc88c64e0a = function(arg0) {
const ret = Object.create(arg0);
return ret;
};
- imports.wbg.__wbg_ctrlKey_5a324c8556fbce1c = function(arg0) {
+ imports.wbg.__wbg_ctrlKey_1e826e468105ac11 = function(arg0) {
const ret = arg0.ctrlKey;
return ret;
};
- imports.wbg.__wbg_ctrlKey_5c308955b0d5492d = function(arg0) {
+ imports.wbg.__wbg_ctrlKey_cdbe8154dfb00d1f = function(arg0) {
const ret = arg0.ctrlKey;
return ret;
};
- imports.wbg.__wbg_dataTransfer_c29d7d69c9576def = function(arg0) {
+ imports.wbg.__wbg_dataTransfer_86283b0702a1aff1 = function(arg0) {
const ret = arg0.dataTransfer;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_data_8980cafa6731c6b5 = function(arg0, arg1) {
+ imports.wbg.__wbg_data_e77bd5c125ecc8a8 = function(arg0, arg1) {
const ret = arg1.data;
var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_debug_156ca727dbc3150f = function(arg0) {
+ imports.wbg.__wbg_debug_3cb59063b29f58c1 = function(arg0) {
console.debug(arg0);
};
- imports.wbg.__wbg_debug_19114f11037e4658 = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_debug_e17b51583ca6a632 = function(arg0, arg1, arg2, arg3) {
console.debug(arg0, arg1, arg2, arg3);
};
- imports.wbg.__wbg_deleteBuffer_783d60e842697847 = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteBuffer_7ed96e1bf7c02e87 = function(arg0, arg1) {
arg0.deleteBuffer(arg1);
};
- imports.wbg.__wbg_deleteBuffer_bf5a34580654a42a = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteBuffer_a7822433fc95dfb8 = function(arg0, arg1) {
arg0.deleteBuffer(arg1);
};
- imports.wbg.__wbg_deleteProgram_3ca13ed49ca24a48 = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteProgram_3fa626bbc0001eb7 = function(arg0, arg1) {
arg0.deleteProgram(arg1);
};
- imports.wbg.__wbg_deleteProgram_47e8c8c7f0923d3d = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteProgram_71a133c6d053e272 = function(arg0, arg1) {
arg0.deleteProgram(arg1);
};
- imports.wbg.__wbg_deleteShader_e1f71043508b6951 = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteShader_8d42f169deda58ac = function(arg0, arg1) {
arg0.deleteShader(arg1);
};
- imports.wbg.__wbg_deleteShader_e4fe2574d9c3afab = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteShader_c65a44796c5004d8 = function(arg0, arg1) {
arg0.deleteShader(arg1);
};
- imports.wbg.__wbg_deleteTexture_36653aa53d4a29e9 = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteTexture_a30f5ca0163c4110 = function(arg0, arg1) {
arg0.deleteTexture(arg1);
};
- imports.wbg.__wbg_deleteTexture_eaf729f97b59aaf4 = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteTexture_bb82c9fec34372ba = function(arg0, arg1) {
arg0.deleteTexture(arg1);
};
- imports.wbg.__wbg_deleteVertexArrayOES_0de32bd8adddeecb = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteVertexArrayOES_1ee7a06a4b23ec8c = function(arg0, arg1) {
arg0.deleteVertexArrayOES(arg1);
};
- imports.wbg.__wbg_deleteVertexArray_cff2c6ab55f2c8b6 = function(arg0, arg1) {
+ imports.wbg.__wbg_deleteVertexArray_77fe73664a3332ae = function(arg0, arg1) {
arg0.deleteVertexArray(arg1);
};
- imports.wbg.__wbg_deltaMode_b2e9bb0dca5cf196 = function(arg0) {
+ imports.wbg.__wbg_deltaMode_9bfd9fe3f6b4b240 = function(arg0) {
const ret = arg0.deltaMode;
return ret;
};
- imports.wbg.__wbg_deltaX_5c26d3b55d406732 = function(arg0) {
+ imports.wbg.__wbg_deltaX_5c1121715746e4b7 = function(arg0) {
const ret = arg0.deltaX;
return ret;
};
- imports.wbg.__wbg_deltaY_1683a859ce933add = function(arg0) {
+ imports.wbg.__wbg_deltaY_f9318542caea0c36 = function(arg0) {
const ret = arg0.deltaY;
return ret;
};
- imports.wbg.__wbg_detachShader_17ec388351e24b61 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_detachShader_ab39d8a19811cfa6 = function(arg0, arg1, arg2) {
arg0.detachShader(arg1, arg2);
};
- imports.wbg.__wbg_detachShader_444b29fa4e93147e = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_detachShader_cd3ab294e635ff90 = function(arg0, arg1, arg2) {
arg0.detachShader(arg1, arg2);
};
- imports.wbg.__wbg_devicePixelContentBoxSize_f91b326c21f7e3d5 = function(arg0) {
+ imports.wbg.__wbg_devicePixelContentBoxSize_a6de82cb30d70825 = function(arg0) {
const ret = arg0.devicePixelContentBoxSize;
return ret;
};
- imports.wbg.__wbg_devicePixelRatio_973abafaa5e8254b = function(arg0) {
+ imports.wbg.__wbg_devicePixelRatio_68c391265f05d093 = function(arg0) {
const ret = arg0.devicePixelRatio;
return ret;
};
- imports.wbg.__wbg_disableVertexAttribArray_1bf5b473f133c8ab = function(arg0, arg1) {
+ imports.wbg.__wbg_disableVertexAttribArray_452cc9815fced7e4 = function(arg0, arg1) {
arg0.disableVertexAttribArray(arg1 >>> 0);
};
- imports.wbg.__wbg_disableVertexAttribArray_f49780d5b42e6b0d = function(arg0, arg1) {
+ imports.wbg.__wbg_disableVertexAttribArray_afd097fb465dc100 = function(arg0, arg1) {
arg0.disableVertexAttribArray(arg1 >>> 0);
};
- imports.wbg.__wbg_disable_2f09f593bf0f5573 = function(arg0, arg1) {
+ imports.wbg.__wbg_disable_2702df5b5da5dd21 = function(arg0, arg1) {
arg0.disable(arg1 >>> 0);
};
- imports.wbg.__wbg_disable_302597eacd491d44 = function(arg0, arg1) {
+ imports.wbg.__wbg_disable_8b53998501a7a85b = function(arg0, arg1) {
arg0.disable(arg1 >>> 0);
};
- imports.wbg.__wbg_disconnect_6e7f07912b7a73c6 = function(arg0) {
+ imports.wbg.__wbg_disconnect_ac3f4ba550970c76 = function(arg0) {
arg0.disconnect();
};
- imports.wbg.__wbg_document_f11bc4f7c03e1745 = function(arg0) {
+ imports.wbg.__wbg_document_d249400bd7bd996d = function(arg0) {
const ret = arg0.document;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_drawElements_28e4f5037fe8c665 = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_drawElements_16199ef1cc58b16a = function(arg0, arg1, arg2, arg3, arg4) {
arg0.drawElements(arg1 >>> 0, arg2, arg3 >>> 0, arg4);
};
- imports.wbg.__wbg_drawElements_3d61ffb17b84bc9d = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_drawElements_65cb4b099bd7d4ac = function(arg0, arg1, arg2, arg3, arg4) {
arg0.drawElements(arg1 >>> 0, arg2, arg3 >>> 0, arg4);
};
- imports.wbg.__wbg_elementFromPoint_4d710989dedbb0f3 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_elementFromPoint_be6286b8ec1ae1a2 = function(arg0, arg1, arg2) {
const ret = arg0.elementFromPoint(arg1, arg2);
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_enableVertexAttribArray_211547224fc25327 = function(arg0, arg1) {
+ imports.wbg.__wbg_enableVertexAttribArray_607be07574298e5e = function(arg0, arg1) {
arg0.enableVertexAttribArray(arg1 >>> 0);
};
- imports.wbg.__wbg_enableVertexAttribArray_60827f2a43782639 = function(arg0, arg1) {
+ imports.wbg.__wbg_enableVertexAttribArray_93c3d406a41ad6c7 = function(arg0, arg1) {
arg0.enableVertexAttribArray(arg1 >>> 0);
};
- imports.wbg.__wbg_enable_2bacfac56e802b11 = function(arg0, arg1) {
+ imports.wbg.__wbg_enable_51114837e05ee280 = function(arg0, arg1) {
arg0.enable(arg1 >>> 0);
};
- imports.wbg.__wbg_enable_a7767e03f7973ca8 = function(arg0, arg1) {
+ imports.wbg.__wbg_enable_d183fef39258803f = function(arg0, arg1) {
arg0.enable(arg1 >>> 0);
};
- imports.wbg.__wbg_error_483d659117b6f3f6 = function(arg0, arg1, arg2, arg3) {
- console.error(arg0, arg1, arg2, arg3);
+ imports.wbg.__wbg_error_524f506f44df1645 = function(arg0) {
+ console.error(arg0);
};
imports.wbg.__wbg_error_7534b8e9a36f1ab4 = function(arg0, arg1) {
let deferred0_0;
@@ -637,6 +642,9 @@ function __wbg_get_imports() {
wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
}
};
+ imports.wbg.__wbg_error_80de38b3f7cc3c3c = function(arg0, arg1, arg2, arg3) {
+ console.error(arg0, arg1, arg2, arg3);
+ };
imports.wbg.__wbg_error_bbc7e5d1a0911165 = function(arg0, arg1) {
let deferred0_0;
let deferred0_1;
@@ -648,233 +656,233 @@ function __wbg_get_imports() {
wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
}
};
- imports.wbg.__wbg_error_fab41a42d22bf2bc = function(arg0) {
- console.error(arg0);
- };
- imports.wbg.__wbg_files_95d9491da88a54b5 = function(arg0) {
+ imports.wbg.__wbg_files_5f07ac9b6f9116a7 = function(arg0) {
const ret = arg0.files;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_focus_35fe945f7268dd62 = function() { return handleError(function (arg0) {
+ imports.wbg.__wbg_focus_7d08b55eba7b368d = function() { return handleError(function (arg0) {
arg0.focus();
}, arguments) };
- imports.wbg.__wbg_force_82b5a32305812290 = function(arg0) {
+ imports.wbg.__wbg_force_6e5acfdea2af0a4f = function(arg0) {
const ret = arg0.force;
return ret;
};
- imports.wbg.__wbg_generateMipmap_82e271fcb6f70fdc = function(arg0, arg1) {
+ imports.wbg.__wbg_generateMipmap_13d3d6406de35b14 = function(arg0, arg1) {
arg0.generateMipmap(arg1 >>> 0);
};
- imports.wbg.__wbg_generateMipmap_b78fb575f19cb920 = function(arg0, arg1) {
+ imports.wbg.__wbg_generateMipmap_e3b21a330b500089 = function(arg0, arg1) {
arg0.generateMipmap(arg1 >>> 0);
};
- imports.wbg.__wbg_getAttribLocation_a3fffeb134874426 = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_getAttribLocation_959c0150cdd39cac = function(arg0, arg1, arg2, arg3) {
const ret = arg0.getAttribLocation(arg1, getStringFromWasm0(arg2, arg3));
return ret;
};
- imports.wbg.__wbg_getAttribLocation_e104a96119fd0bbd = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_getAttribLocation_9db82d01924fa43d = function(arg0, arg1, arg2, arg3) {
const ret = arg0.getAttribLocation(arg1, getStringFromWasm0(arg2, arg3));
return ret;
};
- imports.wbg.__wbg_getBoundingClientRect_05c4b9e3701bb372 = function(arg0) {
+ imports.wbg.__wbg_getBoundingClientRect_9073b0ff7574d76b = function(arg0) {
const ret = arg0.getBoundingClientRect();
return ret;
};
- imports.wbg.__wbg_getComputedStyle_8e58bbd76370e2b1 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_getComputedStyle_046dd6472f8e7f1d = function() { return handleError(function (arg0, arg1) {
const ret = arg0.getComputedStyle(arg1);
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
}, arguments) };
- imports.wbg.__wbg_getContext_5eaf5645cd6acb46 = function() { return handleError(function (arg0, arg1, arg2) {
+ imports.wbg.__wbg_getContext_e9cf379449413580 = function() { return handleError(function (arg0, arg1, arg2) {
const ret = arg0.getContext(getStringFromWasm0(arg1, arg2));
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
}, arguments) };
- imports.wbg.__wbg_getData_a7e2258d0a97ce17 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_getData_84cc441a50843727 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
const ret = arg1.getData(getStringFromWasm0(arg2, arg3));
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_getElementById_dcc9f1f3cfdca0bc = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_getElementById_f827f0d6648718a8 = function(arg0, arg1, arg2) {
const ret = arg0.getElementById(getStringFromWasm0(arg1, arg2));
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_getError_440987efeb6b80e1 = function(arg0) {
+ imports.wbg.__wbg_getError_578ee28e31637d2f = function(arg0) {
const ret = arg0.getError();
return ret;
};
- imports.wbg.__wbg_getError_74cd1cb3c131ece0 = function(arg0) {
+ imports.wbg.__wbg_getError_d749701e28a45150 = function(arg0) {
const ret = arg0.getError();
return ret;
};
- imports.wbg.__wbg_getExtension_b96fdd5b9c1f7271 = function() { return handleError(function (arg0, arg1, arg2) {
+ imports.wbg.__wbg_getExtension_e6c97409b224b5dc = function() { return handleError(function (arg0, arg1, arg2) {
const ret = arg0.getExtension(getStringFromWasm0(arg1, arg2));
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
}, arguments) };
- imports.wbg.__wbg_getExtension_f31653ddc3f1cef9 = function() { return handleError(function (arg0, arg1, arg2) {
+ imports.wbg.__wbg_getExtension_ff0fb1398bcf28c3 = function() { return handleError(function (arg0, arg1, arg2) {
const ret = arg0.getExtension(getStringFromWasm0(arg1, arg2));
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
}, arguments) };
- imports.wbg.__wbg_getItem_badd23d1a06e7b19 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_getItem_17f98dee3b43fa7e = function() { return handleError(function (arg0, arg1, arg2, arg3) {
const ret = arg1.getItem(getStringFromWasm0(arg2, arg3));
var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_getParameter_6f7bc820485dbae4 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_getParameter_1f0887a2b88e6d19 = function() { return handleError(function (arg0, arg1) {
const ret = arg0.getParameter(arg1 >>> 0);
return ret;
}, arguments) };
- imports.wbg.__wbg_getParameter_fc177c1d22da930b = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_getParameter_e3429f024018310f = function() { return handleError(function (arg0, arg1) {
const ret = arg0.getParameter(arg1 >>> 0);
return ret;
}, arguments) };
- imports.wbg.__wbg_getProgramInfoLog_70d114345e15d2c1 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_getProgramInfoLog_631c180b1b21c8ed = function(arg0, arg1, arg2) {
const ret = arg1.getProgramInfoLog(arg2);
var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_getProgramInfoLog_760af7d6753bc699 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_getProgramInfoLog_a998105a680059db = function(arg0, arg1, arg2) {
const ret = arg1.getProgramInfoLog(arg2);
var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_getProgramParameter_8a6b724d42d813b3 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_getProgramParameter_0c411f0cd4185c5b = function(arg0, arg1, arg2) {
const ret = arg0.getProgramParameter(arg1, arg2 >>> 0);
return ret;
};
- imports.wbg.__wbg_getProgramParameter_d328869400b82698 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_getProgramParameter_360f95ff07ac068d = function(arg0, arg1, arg2) {
const ret = arg0.getProgramParameter(arg1, arg2 >>> 0);
return ret;
};
- imports.wbg.__wbg_getPropertyValue_66c16bac362c6d90 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_getPropertyValue_e623c23a05dfb30c = function() { return handleError(function (arg0, arg1, arg2, arg3) {
const ret = arg1.getPropertyValue(getStringFromWasm0(arg2, arg3));
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_getShaderInfoLog_23dd787b504d5f4e = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_getRandomValues_21a0191e74d0e1d3 = function() { return handleError(function (arg0, arg1) {
+ globalThis.crypto.getRandomValues(getArrayU8FromWasm0(arg0, arg1));
+ }, arguments) };
+ imports.wbg.__wbg_getShaderInfoLog_7e7b38fb910ec534 = function(arg0, arg1, arg2) {
const ret = arg1.getShaderInfoLog(arg2);
var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_getShaderInfoLog_da62e75d61fbf8a8 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_getShaderInfoLog_f59c3112acc6e039 = function(arg0, arg1, arg2) {
const ret = arg1.getShaderInfoLog(arg2);
var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_getShaderParameter_e9098a633e6cf618 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_getShaderParameter_511b5f929074fa31 = function(arg0, arg1, arg2) {
const ret = arg0.getShaderParameter(arg1, arg2 >>> 0);
return ret;
};
- imports.wbg.__wbg_getShaderParameter_f9c66f7ac8114c69 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_getShaderParameter_6dbe0b8558dc41fd = function(arg0, arg1, arg2) {
const ret = arg0.getShaderParameter(arg1, arg2 >>> 0);
return ret;
};
- imports.wbg.__wbg_getSupportedExtensions_3ce4548166177471 = function(arg0) {
+ imports.wbg.__wbg_getSupportedExtensions_3938cc3251d21f05 = function(arg0) {
const ret = arg0.getSupportedExtensions();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_getSupportedExtensions_6f069a552bc69ef2 = function(arg0) {
+ imports.wbg.__wbg_getSupportedExtensions_8c007dbb54905635 = function(arg0) {
const ret = arg0.getSupportedExtensions();
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_getUniformLocation_95f3933486db473c = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_getUniformLocation_657a2b6d102bd126 = function(arg0, arg1, arg2, arg3) {
const ret = arg0.getUniformLocation(arg1, getStringFromWasm0(arg2, arg3));
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_getUniformLocation_b9be4fbca76ab9a4 = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_getUniformLocation_838363001c74dc21 = function(arg0, arg1, arg2, arg3) {
const ret = arg0.getUniformLocation(arg1, getStringFromWasm0(arg2, arg3));
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_get_014bbb75e258e645 = function(arg0, arg1) {
+ imports.wbg.__wbg_get_3091cb4339203d1a = function(arg0, arg1) {
const ret = arg0[arg1 >>> 0];
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_get_198bfcfce5b3a38f = function(arg0, arg1) {
+ imports.wbg.__wbg_get_4095561f3d5ec806 = function(arg0, arg1) {
const ret = arg0[arg1 >>> 0];
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_get_9aa3dff3f0266054 = function(arg0, arg1) {
+ imports.wbg.__wbg_get_8edd839202d9f4db = function(arg0, arg1) {
+ const ret = arg0[arg1 >>> 0];
+ return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
+ };
+ imports.wbg.__wbg_get_b9b93047fe3cf45b = function(arg0, arg1) {
const ret = arg0[arg1 >>> 0];
return ret;
};
- imports.wbg.__wbg_get_dfac72a5ffb577cc = function(arg0, arg1) {
- const ret = arg0[arg1 >>> 0];
- return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
- };
- imports.wbg.__wbg_hash_4227a319264c4ca1 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_hash_dd4b49269c385c8a = function() { return handleError(function (arg0, arg1) {
const ret = arg1.hash;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_height_08fd44318e18021d = function(arg0) {
+ imports.wbg.__wbg_height_1f8226c8f6875110 = function(arg0) {
const ret = arg0.height;
return ret;
};
- imports.wbg.__wbg_height_f36c36e27347cf38 = function(arg0) {
+ imports.wbg.__wbg_height_838cee19ba8597db = function(arg0) {
const ret = arg0.height;
return ret;
};
- imports.wbg.__wbg_hidden_2f28ae7f1a034fbc = function(arg0) {
+ imports.wbg.__wbg_hidden_d5c02c79a2b77bb6 = function(arg0) {
const ret = arg0.hidden;
return ret;
};
- imports.wbg.__wbg_host_7131cd3aac9f8fd5 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_host_9bd7b5dc07c48606 = function() { return handleError(function (arg0, arg1) {
const ret = arg1.host;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_hostname_b4908a01df1be9f2 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_hostname_8d7204884eb7378b = function() { return handleError(function (arg0, arg1) {
const ret = arg1.hostname;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_href_d04a5d3c2e6b361a = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_href_87d60a783a012377 = function() { return handleError(function (arg0, arg1) {
const ret = arg1.href;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_id_87f2e8c82a04a251 = function(arg0, arg1) {
+ imports.wbg.__wbg_id_c65402eae48fb242 = function(arg0, arg1) {
const ret = arg1.id;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_identifier_14d5888db18610bb = function(arg0) {
+ imports.wbg.__wbg_identifier_59e0705aef81ff93 = function(arg0) {
const ret = arg0.identifier;
return ret;
};
- imports.wbg.__wbg_info_18e75e6ce8a36a90 = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_info_033d8b8a0838f1d3 = function(arg0, arg1, arg2, arg3) {
console.info(arg0, arg1, arg2, arg3);
};
- imports.wbg.__wbg_info_c3044c86ae29faab = function(arg0) {
+ imports.wbg.__wbg_info_3daf2e093e091b66 = function(arg0) {
console.info(arg0);
};
- imports.wbg.__wbg_inlineSize_60da5bea0a6275d2 = function(arg0) {
+ imports.wbg.__wbg_inlineSize_8ff96b3ec1b24423 = function(arg0) {
const ret = arg0.inlineSize;
return ret;
};
- imports.wbg.__wbg_instanceof_Element_0f1680908791f190 = function(arg0) {
+ imports.wbg.__wbg_instanceof_Element_0af65443936d5154 = function(arg0) {
let result;
try {
result = arg0 instanceof Element;
@@ -884,7 +892,7 @@ function __wbg_get_imports() {
const ret = result;
return ret;
};
- imports.wbg.__wbg_instanceof_HtmlCanvasElement_f764441ef5ddb63f = function(arg0) {
+ imports.wbg.__wbg_instanceof_HtmlCanvasElement_2ea67072a7624ac5 = function(arg0) {
let result;
try {
result = arg0 instanceof HTMLCanvasElement;
@@ -894,7 +902,7 @@ function __wbg_get_imports() {
const ret = result;
return ret;
};
- imports.wbg.__wbg_instanceof_HtmlElement_d94ed69c6883a691 = function(arg0) {
+ imports.wbg.__wbg_instanceof_HtmlElement_51378c201250b16c = function(arg0) {
let result;
try {
result = arg0 instanceof HTMLElement;
@@ -904,7 +912,7 @@ function __wbg_get_imports() {
const ret = result;
return ret;
};
- imports.wbg.__wbg_instanceof_HtmlInputElement_47b3e827f364773c = function(arg0) {
+ imports.wbg.__wbg_instanceof_HtmlInputElement_12d71bf2d15dd19e = function(arg0) {
let result;
try {
result = arg0 instanceof HTMLInputElement;
@@ -914,7 +922,7 @@ function __wbg_get_imports() {
const ret = result;
return ret;
};
- imports.wbg.__wbg_instanceof_ResizeObserverEntry_145c533d0e7cf2f4 = function(arg0) {
+ imports.wbg.__wbg_instanceof_ResizeObserverEntry_cb85a268a84783ba = function(arg0) {
let result;
try {
result = arg0 instanceof ResizeObserverEntry;
@@ -924,7 +932,7 @@ function __wbg_get_imports() {
const ret = result;
return ret;
};
- imports.wbg.__wbg_instanceof_ResizeObserverSize_8c7b496ccb6db38e = function(arg0) {
+ imports.wbg.__wbg_instanceof_ResizeObserverSize_4138fd53d59e1653 = function(arg0) {
let result;
try {
result = arg0 instanceof ResizeObserverSize;
@@ -934,7 +942,7 @@ function __wbg_get_imports() {
const ret = result;
return ret;
};
- imports.wbg.__wbg_instanceof_WebGl2RenderingContext_ed03a40cd6d9a6c5 = function(arg0) {
+ imports.wbg.__wbg_instanceof_WebGl2RenderingContext_2b6045efeb76568d = function(arg0) {
let result;
try {
result = arg0 instanceof WebGL2RenderingContext;
@@ -944,7 +952,7 @@ function __wbg_get_imports() {
const ret = result;
return ret;
};
- imports.wbg.__wbg_instanceof_WebGlRenderingContext_934db43ae44dbdac = function(arg0) {
+ imports.wbg.__wbg_instanceof_WebGlRenderingContext_b9cbe798424f6d4c = function(arg0) {
let result;
try {
result = arg0 instanceof WebGLRenderingContext;
@@ -954,7 +962,7 @@ function __wbg_get_imports() {
const ret = result;
return ret;
};
- imports.wbg.__wbg_instanceof_Window_d2514c6a7ee7ba60 = function(arg0) {
+ imports.wbg.__wbg_instanceof_Window_def73ea0955fc569 = function(arg0) {
let result;
try {
result = arg0 instanceof Window;
@@ -964,80 +972,80 @@ function __wbg_get_imports() {
const ret = result;
return ret;
};
- imports.wbg.__wbg_isComposing_34930e03980aa623 = function(arg0) {
+ imports.wbg.__wbg_isComposing_36511555ff1869a4 = function(arg0) {
const ret = arg0.isComposing;
return ret;
};
- imports.wbg.__wbg_isComposing_e6c0e75812df1d39 = function(arg0) {
+ imports.wbg.__wbg_isComposing_6e36768c82fd5a4f = function(arg0) {
const ret = arg0.isComposing;
return ret;
};
- imports.wbg.__wbg_isSecureContext_56a612937252b7c4 = function(arg0) {
+ imports.wbg.__wbg_isSecureContext_aedcf3816338189a = function(arg0) {
const ret = arg0.isSecureContext;
return ret;
};
- imports.wbg.__wbg_is_e442492d1fb7967b = function(arg0, arg1) {
+ imports.wbg.__wbg_is_c7481c65e7e5df9e = function(arg0, arg1) {
const ret = Object.is(arg0, arg1);
return ret;
};
- imports.wbg.__wbg_item_7c8b01a4bd9230d3 = function(arg0, arg1) {
+ imports.wbg.__wbg_item_aea4b8432b5457be = function(arg0, arg1) {
const ret = arg0.item(arg1 >>> 0);
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_items_9e6108f345463d2c = function(arg0) {
+ imports.wbg.__wbg_items_89c2afbece3a5d13 = function(arg0) {
const ret = arg0.items;
return ret;
};
- imports.wbg.__wbg_keyCode_e673401ed53dfc2c = function(arg0) {
+ imports.wbg.__wbg_keyCode_237a8d1a040910b8 = function(arg0) {
const ret = arg0.keyCode;
return ret;
};
- imports.wbg.__wbg_key_9a40d4f6defa675b = function(arg0, arg1) {
+ imports.wbg.__wbg_key_7b5c6cb539be8e13 = function(arg0, arg1) {
const ret = arg1.key;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_lastModified_0094dc85b1157ef5 = function(arg0) {
+ imports.wbg.__wbg_lastModified_7a9e61b3961224b8 = function(arg0) {
const ret = arg0.lastModified;
return ret;
};
- imports.wbg.__wbg_left_d79d7167a89a5169 = function(arg0) {
+ imports.wbg.__wbg_left_e46801720267b66d = function(arg0) {
const ret = arg0.left;
return ret;
};
- imports.wbg.__wbg_length_65d1cd11729ced11 = function(arg0) {
+ imports.wbg.__wbg_length_1d5c829e9b2319d6 = function(arg0) {
const ret = arg0.length;
return ret;
};
- imports.wbg.__wbg_length_86e2f100fef1fecc = function(arg0) {
+ imports.wbg.__wbg_length_802483321c8130cf = function(arg0) {
const ret = arg0.length;
return ret;
};
- imports.wbg.__wbg_length_a2ea1b46bcec2b5e = function(arg0) {
+ imports.wbg.__wbg_length_a446193dc22c12f8 = function(arg0) {
const ret = arg0.length;
return ret;
};
- imports.wbg.__wbg_length_c4528fc455e58194 = function(arg0) {
+ imports.wbg.__wbg_length_cfc862ec0ccc7ca0 = function(arg0) {
const ret = arg0.length;
return ret;
};
- imports.wbg.__wbg_length_d65cf0786bfc5739 = function(arg0) {
+ imports.wbg.__wbg_length_e2d2a49132c1b256 = function(arg0) {
const ret = arg0.length;
return ret;
};
- imports.wbg.__wbg_linkProgram_9b1029885a37b70d = function(arg0, arg1) {
+ imports.wbg.__wbg_linkProgram_067ee06739bdde81 = function(arg0, arg1) {
arg0.linkProgram(arg1);
};
- imports.wbg.__wbg_linkProgram_bcf6286423b25b5c = function(arg0, arg1) {
+ imports.wbg.__wbg_linkProgram_e002979fe36e5b2a = function(arg0, arg1) {
arg0.linkProgram(arg1);
};
- imports.wbg.__wbg_localStorage_9ca2da984fd56239 = function() { return handleError(function (arg0) {
+ imports.wbg.__wbg_localStorage_1406c99c39728187 = function() { return handleError(function (arg0) {
const ret = arg0.localStorage;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
}, arguments) };
- imports.wbg.__wbg_location_b2ec7e36fec8a8ff = function(arg0) {
+ imports.wbg.__wbg_location_350d99456c2f3693 = function(arg0) {
const ret = arg0.location;
return ret;
};
@@ -1047,15 +1055,15 @@ function __wbg_get_imports() {
imports.wbg.__wbg_mark_24a1a597f4f00679 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
arg0.mark(getStringFromWasm0(arg1, arg2), arg3);
}, arguments) };
- imports.wbg.__wbg_matchMedia_4adca948756a5784 = function() { return handleError(function (arg0, arg1, arg2) {
+ imports.wbg.__wbg_matchMedia_bf8807a841d930c1 = function() { return handleError(function (arg0, arg1, arg2) {
const ret = arg0.matchMedia(getStringFromWasm0(arg1, arg2));
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
}, arguments) };
- imports.wbg.__wbg_matches_a69a36077c4f07ad = function(arg0) {
+ imports.wbg.__wbg_matches_e9ca73fbf8a3a104 = function(arg0) {
const ret = arg0.matches;
return ret;
};
- imports.wbg.__wbg_matches_f7ab6204c1d7b30d = function(arg0) {
+ imports.wbg.__wbg_matches_f579d2efd905ab4f = function(arg0) {
const ret = arg0.matches;
return ret;
};
@@ -1065,90 +1073,90 @@ function __wbg_get_imports() {
imports.wbg.__wbg_measure_7728846525e2cced = function() { return handleError(function (arg0, arg1, arg2, arg3) {
arg0.measure(getStringFromWasm0(arg1, arg2), arg3);
}, arguments) };
- imports.wbg.__wbg_metaKey_90fbd812345a7e0c = function(arg0) {
+ imports.wbg.__wbg_metaKey_0b25f7848e014cc8 = function(arg0) {
const ret = arg0.metaKey;
return ret;
};
- imports.wbg.__wbg_metaKey_de1f08a4d1e84bd1 = function(arg0) {
+ imports.wbg.__wbg_metaKey_e1dd47d709a80ce5 = function(arg0) {
const ret = arg0.metaKey;
return ret;
};
- imports.wbg.__wbg_name_37e12d7b980bc5bd = function(arg0, arg1) {
+ imports.wbg.__wbg_name_28c43f147574bf08 = function(arg0, arg1) {
const ret = arg1.name;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_navigator_0fe968937104eaa7 = function(arg0) {
+ imports.wbg.__wbg_navigator_1577371c070c8947 = function(arg0) {
const ret = arg0.navigator;
return ret;
};
- imports.wbg.__wbg_new_0565c3001775c60a = function() { return handleError(function (arg0) {
- const ret = new ResizeObserver(arg0);
- return ret;
- }, arguments) };
- imports.wbg.__wbg_new_254fa9eac11932ae = function() {
- const ret = new Array();
- return ret;
- };
- imports.wbg.__wbg_new_3ff5b33b1ce712df = function(arg0) {
- const ret = new Uint8Array(arg0);
+ imports.wbg.__wbg_new_405e22f390576ce2 = function() {
+ const ret = new Object();
return ret;
};
imports.wbg.__wbg_new_5136e00935bbc0fc = function() {
const ret = new Error();
return ret;
};
- imports.wbg.__wbg_new_688846f374351c92 = function() {
- const ret = new Object();
+ imports.wbg.__wbg_new_5f34cc0c99fcc488 = function() { return handleError(function (arg0) {
+ const ret = new ResizeObserver(arg0);
+ return ret;
+ }, arguments) };
+ imports.wbg.__wbg_new_78feb108b6472713 = function() {
+ const ret = new Array();
return ret;
};
imports.wbg.__wbg_new_8a6f238a6ece86ea = function() {
const ret = new Error();
return ret;
};
- imports.wbg.__wbg_newnoargs_fd9e4bf8be2bc16d = function(arg0, arg1) {
+ imports.wbg.__wbg_new_a12002a7f91c75be = function(arg0) {
+ const ret = new Uint8Array(arg0);
+ return ret;
+ };
+ imports.wbg.__wbg_newnoargs_105ed471475aaf50 = function(arg0, arg1) {
const ret = new Function(getStringFromWasm0(arg0, arg1));
return ret;
};
- imports.wbg.__wbg_newwithbyteoffsetandlength_4b01f207bed23fc0 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_newwithbyteoffsetandlength_840f3c038856d4e9 = function(arg0, arg1, arg2) {
const ret = new Int8Array(arg0, arg1 >>> 0, arg2 >>> 0);
return ret;
};
- imports.wbg.__wbg_newwithbyteoffsetandlength_5910bdf845a168eb = function(arg0, arg1, arg2) {
- const ret = new Uint32Array(arg0, arg1 >>> 0, arg2 >>> 0);
- return ret;
- };
- imports.wbg.__wbg_newwithbyteoffsetandlength_6991ab0478cc4a43 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_newwithbyteoffsetandlength_999332a180064b59 = function(arg0, arg1, arg2) {
const ret = new Int32Array(arg0, arg1 >>> 0, arg2 >>> 0);
return ret;
};
- imports.wbg.__wbg_newwithbyteoffsetandlength_69ec77b20853ae02 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_newwithbyteoffsetandlength_d4a86622320ea258 = function(arg0, arg1, arg2) {
const ret = new Uint16Array(arg0, arg1 >>> 0, arg2 >>> 0);
return ret;
};
- imports.wbg.__wbg_newwithbyteoffsetandlength_b0192e1adfca2df1 = function(arg0, arg1, arg2) {
- const ret = new Int16Array(arg0, arg1 >>> 0, arg2 >>> 0);
- return ret;
- };
- imports.wbg.__wbg_newwithbyteoffsetandlength_ba35896968751d91 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_newwithbyteoffsetandlength_d97e637ebe145a9a = function(arg0, arg1, arg2) {
const ret = new Uint8Array(arg0, arg1 >>> 0, arg2 >>> 0);
return ret;
};
- imports.wbg.__wbg_newwithbyteoffsetandlength_f113a96374814bb2 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_newwithbyteoffsetandlength_e6b7e69acd4c7354 = function(arg0, arg1, arg2) {
const ret = new Float32Array(arg0, arg1 >>> 0, arg2 >>> 0);
return ret;
};
- imports.wbg.__wbg_newwithrecordfromstrtoblobpromise_43dee664be2df4ab = function() { return handleError(function (arg0) {
+ imports.wbg.__wbg_newwithbyteoffsetandlength_f1dead44d1fc7212 = function(arg0, arg1, arg2) {
+ const ret = new Uint32Array(arg0, arg1 >>> 0, arg2 >>> 0);
+ return ret;
+ };
+ imports.wbg.__wbg_newwithbyteoffsetandlength_f254047f7e80e7ff = function(arg0, arg1, arg2) {
+ const ret = new Int16Array(arg0, arg1 >>> 0, arg2 >>> 0);
+ return ret;
+ };
+ imports.wbg.__wbg_newwithrecordfromstrtoblobpromise_53d3e3611a048f1e = function() { return handleError(function (arg0) {
const ret = new ClipboardItem(arg0);
return ret;
}, arguments) };
- imports.wbg.__wbg_newwithtext_f2ebd2622e9d451b = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_newwithtext_4beba0b832dd9cc1 = function() { return handleError(function (arg0, arg1) {
const ret = new SpeechSynthesisUtterance(getStringFromWasm0(arg0, arg1));
return ret;
}, arguments) };
- imports.wbg.__wbg_newwithu8arraysequenceandoptions_75a3b40c32d6c988 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_newwithu8arraysequenceandoptions_068570c487f69127 = function() { return handleError(function (arg0, arg1) {
const ret = new Blob(arg0, arg1);
return ret;
}, arguments) };
@@ -1156,26 +1164,26 @@ function __wbg_get_imports() {
const ret = arg0.now();
return ret;
};
- imports.wbg.__wbg_now_62a101fe35b60230 = function(arg0) {
+ imports.wbg.__wbg_now_d18023d54d4e5500 = function(arg0) {
const ret = arg0.now();
return ret;
};
- imports.wbg.__wbg_observe_71a44d88a2880088 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_observe_ed4adb1c245103c5 = function(arg0, arg1, arg2) {
arg0.observe(arg1, arg2);
};
- imports.wbg.__wbg_of_924412d32367b13d = function(arg0) {
+ imports.wbg.__wbg_of_2eaf5a02d443ef03 = function(arg0) {
const ret = Array.of(arg0);
return ret;
};
- imports.wbg.__wbg_offsetTop_eb7c481e74c6fa50 = function(arg0) {
+ imports.wbg.__wbg_offsetTop_de8d0722bd1b211d = function(arg0) {
const ret = arg0.offsetTop;
return ret;
};
- imports.wbg.__wbg_open_94e1e54493f5c069 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_open_6c3f5ef5a0204c5d = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
const ret = arg0.open(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
}, arguments) };
- imports.wbg.__wbg_origin_8c23d49bc1f609e9 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_origin_7c5d649acdace3ea = function() { return handleError(function (arg0, arg1) {
const ret = arg1.origin;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
@@ -1186,165 +1194,165 @@ function __wbg_get_imports() {
const ret = globalThis.performance;
return ret;
};
- imports.wbg.__wbg_performance_2e69ce813a883f21 = function(arg0) {
- const ret = arg0.performance;
- return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
- };
imports.wbg.__wbg_performance_7a3ffd0b17f663ad = function(arg0) {
const ret = arg0.performance;
return ret;
};
- imports.wbg.__wbg_pixelStorei_7c93ee0ad7bf0763 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_performance_c185c0cdc2766575 = function(arg0) {
+ const ret = arg0.performance;
+ return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
+ };
+ imports.wbg.__wbg_pixelStorei_6aba5d04cdcaeaf6 = function(arg0, arg1, arg2) {
arg0.pixelStorei(arg1 >>> 0, arg2);
};
- imports.wbg.__wbg_pixelStorei_7dc331e4d85de1a3 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_pixelStorei_c8520e4b46f4a973 = function(arg0, arg1, arg2) {
arg0.pixelStorei(arg1 >>> 0, arg2);
};
- imports.wbg.__wbg_port_14b0bf6b72b06565 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_port_008e0061f421df1d = function() { return handleError(function (arg0, arg1) {
const ret = arg1.port;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_preventDefault_3c86e59772d015e6 = function(arg0) {
+ imports.wbg.__wbg_preventDefault_c2314fd813c02b3c = function(arg0) {
arg0.preventDefault();
};
- imports.wbg.__wbg_protocol_ceaedd334dc7dbaf = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_protocol_faa0494a9b2554cb = function() { return handleError(function (arg0, arg1) {
const ret = arg1.protocol;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_push_6edad0df4b546b2c = function(arg0, arg1) {
+ imports.wbg.__wbg_push_737cfc8c1432c2c6 = function(arg0, arg1) {
const ret = arg0.push(arg1);
return ret;
};
- imports.wbg.__wbg_queueMicrotask_2181040e064c0dc8 = function(arg0) {
+ imports.wbg.__wbg_queueMicrotask_97d92b4fcc8a61c5 = function(arg0) {
queueMicrotask(arg0);
};
- imports.wbg.__wbg_queueMicrotask_ef9ac43769cbcc4f = function(arg0) {
+ imports.wbg.__wbg_queueMicrotask_d3219def82552485 = function(arg0) {
const ret = arg0.queueMicrotask;
return ret;
};
- imports.wbg.__wbg_readPixels_33f7af7601585ec6 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
+ imports.wbg.__wbg_readPixels_51a0c02cdee207a5 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
arg0.readPixels(arg1, arg2, arg3, arg4, arg5 >>> 0, arg6 >>> 0, arg7);
}, arguments) };
- imports.wbg.__wbg_readPixels_bc526324b691316a = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
+ imports.wbg.__wbg_readPixels_a6cbb21794452142 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
arg0.readPixels(arg1, arg2, arg3, arg4, arg5 >>> 0, arg6 >>> 0, arg7);
}, arguments) };
- imports.wbg.__wbg_readPixels_ca434c18552fc5bc = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
+ imports.wbg.__wbg_readPixels_cd64c5a7b0343355 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
arg0.readPixels(arg1, arg2, arg3, arg4, arg5 >>> 0, arg6 >>> 0, arg7);
}, arguments) };
- imports.wbg.__wbg_removeEventListener_a9ca9f05245321f0 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_removeEventListener_056dfe8c3d6c58f9 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
arg0.removeEventListener(getStringFromWasm0(arg1, arg2), arg3);
}, arguments) };
- imports.wbg.__wbg_remove_530b4f3163f72a83 = function(arg0) {
+ imports.wbg.__wbg_remove_e2d2659f3128c045 = function(arg0) {
arg0.remove();
};
- imports.wbg.__wbg_requestAnimationFrame_169cbbda5861d9ca = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_requestAnimationFrame_d7fd890aaefc3246 = function() { return handleError(function (arg0, arg1) {
const ret = arg0.requestAnimationFrame(arg1);
return ret;
}, arguments) };
- imports.wbg.__wbg_resolve_0bf7c44d641804f9 = function(arg0) {
+ imports.wbg.__wbg_resolve_4851785c9c5f573d = function(arg0) {
const ret = Promise.resolve(arg0);
return ret;
};
- imports.wbg.__wbg_right_74bde7fc03836700 = function(arg0) {
+ imports.wbg.__wbg_right_54416a875852cab1 = function(arg0) {
const ret = arg0.right;
return ret;
};
- imports.wbg.__wbg_scissor_63c22bd552b53b16 = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_scissor_e917a332f67a5d30 = function(arg0, arg1, arg2, arg3, arg4) {
arg0.scissor(arg1, arg2, arg3, arg4);
};
- imports.wbg.__wbg_scissor_eebb3b755c95ca32 = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_scissor_eb177ca33bf24a44 = function(arg0, arg1, arg2, arg3, arg4) {
arg0.scissor(arg1, arg2, arg3, arg4);
};
- imports.wbg.__wbg_search_feca3869d55ecd5c = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_search_c1c3bfbeadd96c47 = function() { return handleError(function (arg0, arg1) {
const ret = arg1.search;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_setAttribute_148e0e65e20e5f27 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_setAttribute_2704501201f15687 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
arg0.setAttribute(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
}, arguments) };
- imports.wbg.__wbg_setItem_37bd15ddee3594af = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_setItem_212ecc915942ab0a = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
arg0.setItem(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
}, arguments) };
- imports.wbg.__wbg_setProperty_0eb9705cf1b05650 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_setProperty_f2cf326652b9a713 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
arg0.setProperty(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
}, arguments) };
- imports.wbg.__wbg_set_23d69db4e5c66a6e = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_set_65595bdd868b3009 = function(arg0, arg1, arg2) {
arg0.set(arg1, arg2 >>> 0);
};
- imports.wbg.__wbg_set_4e647025551483bd = function() { return handleError(function (arg0, arg1, arg2) {
+ imports.wbg.__wbg_set_bb8cecf6a62b9f46 = function() { return handleError(function (arg0, arg1, arg2) {
const ret = Reflect.set(arg0, arg1, arg2);
return ret;
}, arguments) };
- imports.wbg.__wbg_setautofocus_6ebfa477d4cba31b = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_setautofocus_6ca6f0ab5a566c21 = function() { return handleError(function (arg0, arg1) {
arg0.autofocus = arg1 !== 0;
}, arguments) };
- imports.wbg.__wbg_setbox_2c55cd020a2888a8 = function(arg0, arg1) {
+ imports.wbg.__wbg_setbox_2786f3ccea97cac4 = function(arg0, arg1) {
arg0.box = __wbindgen_enum_ResizeObserverBoxOptions[arg1];
};
- imports.wbg.__wbg_setheight_16d76e7fa9d506ea = function(arg0, arg1) {
+ imports.wbg.__wbg_setheight_da683a33fa99843c = function(arg0, arg1) {
arg0.height = arg1 >>> 0;
};
- imports.wbg.__wbg_setinnerHTML_2d75307ba8832258 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_setinnerHTML_31bde41f835786f7 = function(arg0, arg1, arg2) {
arg0.innerHTML = getStringFromWasm0(arg1, arg2);
};
- imports.wbg.__wbg_setonce_87cf501e67ee47f7 = function(arg0, arg1) {
+ imports.wbg.__wbg_setonce_0cb80aea26303a35 = function(arg0, arg1) {
arg0.once = arg1 !== 0;
};
- imports.wbg.__wbg_setpitch_575e6c4d3c08396d = function(arg0, arg1) {
+ imports.wbg.__wbg_setpitch_5f1e968545051707 = function(arg0, arg1) {
arg0.pitch = arg1;
};
- imports.wbg.__wbg_setrate_b2b113bd358677fc = function(arg0, arg1) {
+ imports.wbg.__wbg_setrate_e0aa4bfe9a720dc5 = function(arg0, arg1) {
arg0.rate = arg1;
};
- imports.wbg.__wbg_settabIndex_52ec33536f016c41 = function(arg0, arg1) {
+ imports.wbg.__wbg_settabIndex_31adfec3c7eafbce = function(arg0, arg1) {
arg0.tabIndex = arg1;
};
- imports.wbg.__wbg_settype_e19ab551722d5681 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_settype_2a902a4a235bb64a = function(arg0, arg1, arg2) {
arg0.type = getStringFromWasm0(arg1, arg2);
};
- imports.wbg.__wbg_settype_fd39465d237c2f36 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_settype_39ed370d3edd403c = function(arg0, arg1, arg2) {
arg0.type = getStringFromWasm0(arg1, arg2);
};
- imports.wbg.__wbg_setvalue_44c59c360ad57cf0 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_setvalue_6ad9ef6c692ea746 = function(arg0, arg1, arg2) {
arg0.value = getStringFromWasm0(arg1, arg2);
};
- imports.wbg.__wbg_setvolume_aff584ffa2c97910 = function(arg0, arg1) {
+ imports.wbg.__wbg_setvolume_791fef19f3df9b00 = function(arg0, arg1) {
arg0.volume = arg1;
};
- imports.wbg.__wbg_setwidth_c588fe07a7982aca = function(arg0, arg1) {
+ imports.wbg.__wbg_setwidth_c5fed9f5e7f0b406 = function(arg0, arg1) {
arg0.width = arg1 >>> 0;
};
- imports.wbg.__wbg_shaderSource_3bbf44221529c149 = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_shaderSource_72d3e8597ef85b67 = function(arg0, arg1, arg2, arg3) {
arg0.shaderSource(arg1, getStringFromWasm0(arg2, arg3));
};
- imports.wbg.__wbg_shaderSource_6a657afd48edb05a = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_shaderSource_ad0087e637a35191 = function(arg0, arg1, arg2, arg3) {
arg0.shaderSource(arg1, getStringFromWasm0(arg2, arg3));
};
- imports.wbg.__wbg_shiftKey_0d6625838238aee8 = function(arg0) {
+ imports.wbg.__wbg_shiftKey_2bebb3b703254f47 = function(arg0) {
const ret = arg0.shiftKey;
return ret;
};
- imports.wbg.__wbg_shiftKey_4b30f68655b97001 = function(arg0) {
+ imports.wbg.__wbg_shiftKey_86e737105bab1a54 = function(arg0) {
const ret = arg0.shiftKey;
return ret;
};
- imports.wbg.__wbg_size_5ead5cc358246113 = function(arg0) {
+ imports.wbg.__wbg_size_3808d41635a9c259 = function(arg0) {
const ret = arg0.size;
return ret;
};
- imports.wbg.__wbg_speak_d88fa5f225a44c0a = function(arg0, arg1) {
+ imports.wbg.__wbg_speak_edb998564c00bb2a = function(arg0, arg1) {
arg0.speak(arg1);
};
- imports.wbg.__wbg_speechSynthesis_26d3bf90f6a508c7 = function() { return handleError(function (arg0) {
+ imports.wbg.__wbg_speechSynthesis_74e411ffcf3fc3c7 = function() { return handleError(function (arg0) {
const ret = arg0.speechSynthesis;
return ret;
}, arguments) };
@@ -1362,146 +1370,146 @@ function __wbg_get_imports() {
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_static_accessor_GLOBAL_0be7472e492ad3e3 = function() {
+ imports.wbg.__wbg_static_accessor_GLOBAL_88a902d13a557d07 = function() {
const ret = typeof global === 'undefined' ? null : global;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_static_accessor_GLOBAL_THIS_1a6eb482d12c9bfb = function() {
+ imports.wbg.__wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0 = function() {
const ret = typeof globalThis === 'undefined' ? null : globalThis;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_static_accessor_SELF_1dc398a895c82351 = function() {
+ imports.wbg.__wbg_static_accessor_SELF_37c5d418e4bf5819 = function() {
const ret = typeof self === 'undefined' ? null : self;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_static_accessor_WINDOW_ae1c80c7eea8d64a = function() {
+ imports.wbg.__wbg_static_accessor_WINDOW_5de37043a91a9c40 = function() {
const ret = typeof window === 'undefined' ? null : window;
return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
};
- imports.wbg.__wbg_stopPropagation_da43a41fec77962c = function(arg0) {
+ imports.wbg.__wbg_stopPropagation_11d220a858e5e0fb = function(arg0) {
arg0.stopPropagation();
};
- imports.wbg.__wbg_style_53bb2d762dd1c030 = function(arg0) {
+ imports.wbg.__wbg_style_fb30c14e5815805c = function(arg0) {
const ret = arg0.style;
return ret;
};
- imports.wbg.__wbg_texImage2D_488bd0838560f2fd = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
+ imports.wbg.__wbg_texImage2D_57483314967bdd11 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
arg0.texImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, arg9);
}, arguments) };
- imports.wbg.__wbg_texImage2D_54f87bf0ff987e47 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
+ imports.wbg.__wbg_texImage2D_5f2835f02b1d1077 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
arg0.texImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, arg9);
}, arguments) };
- imports.wbg.__wbg_texImage2D_d83566263a20c144 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
+ imports.wbg.__wbg_texImage2D_b8edcb5692f65f88 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
arg0.texImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, arg9);
}, arguments) };
- imports.wbg.__wbg_texParameteri_45603287be57d25e = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_texParameteri_8112b26b3c360b7e = function(arg0, arg1, arg2, arg3) {
arg0.texParameteri(arg1 >>> 0, arg2 >>> 0, arg3);
};
- imports.wbg.__wbg_texParameteri_d550886a76f21258 = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_texParameteri_ef50743cb94d507e = function(arg0, arg1, arg2, arg3) {
arg0.texParameteri(arg1 >>> 0, arg2 >>> 0, arg3);
};
- imports.wbg.__wbg_texSubImage2D_0eeb9856a37cc769 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
+ imports.wbg.__wbg_texSubImage2D_c7951ed97252bdff = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
arg0.texSubImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, arg9);
}, arguments) };
- imports.wbg.__wbg_texSubImage2D_355ed8d7c2b07c22 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
+ imports.wbg.__wbg_texSubImage2D_d52d1a0d3654c60b = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
arg0.texSubImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, arg9);
}, arguments) };
- imports.wbg.__wbg_texSubImage2D_7af37da149ecfb8e = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
+ imports.wbg.__wbg_texSubImage2D_fbdf91268228c757 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) {
arg0.texSubImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, arg9);
}, arguments) };
- imports.wbg.__wbg_then_0438fad860fe38e1 = function(arg0, arg1) {
+ imports.wbg.__wbg_then_44b73946d2fb3e7d = function(arg0, arg1) {
const ret = arg0.then(arg1);
return ret;
};
- imports.wbg.__wbg_then_0ffafeddf0e182a4 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_then_48b406749878a531 = function(arg0, arg1, arg2) {
const ret = arg0.then(arg1, arg2);
return ret;
};
- imports.wbg.__wbg_top_640e0509d882f0ee = function(arg0) {
+ imports.wbg.__wbg_top_ec9fceb1f030f2ea = function(arg0) {
const ret = arg0.top;
return ret;
};
- imports.wbg.__wbg_touches_464d67ccc79e7632 = function(arg0) {
+ imports.wbg.__wbg_touches_6831ee0099511603 = function(arg0) {
const ret = arg0.touches;
return ret;
};
- imports.wbg.__wbg_type_1cad8117b64accc6 = function(arg0, arg1) {
+ imports.wbg.__wbg_type_00566e0d2e337e2e = function(arg0, arg1) {
const ret = arg1.type;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_type_394bc3bf9b919d18 = function(arg0, arg1) {
+ imports.wbg.__wbg_type_20c7c49b2fbe0023 = function(arg0, arg1) {
const ret = arg1.type;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_uniform1i_33a6ced29e8c7297 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_uniform1i_5ddd9d8ccbd390bb = function(arg0, arg1, arg2) {
arg0.uniform1i(arg1, arg2);
};
- imports.wbg.__wbg_uniform1i_fd66f39a37e6a753 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_uniform1i_ed95b6129dce4d84 = function(arg0, arg1, arg2) {
arg0.uniform1i(arg1, arg2);
};
- imports.wbg.__wbg_uniform2f_78492045e002e4eb = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_uniform2f_56af4e1731d87421 = function(arg0, arg1, arg2, arg3) {
arg0.uniform2f(arg1, arg2, arg3);
};
- imports.wbg.__wbg_uniform2f_8174f619e86c3ba2 = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_uniform2f_b69b5369bc019bd5 = function(arg0, arg1, arg2, arg3) {
arg0.uniform2f(arg1, arg2, arg3);
};
- imports.wbg.__wbg_useProgram_1a5a4be134db012a = function(arg0, arg1) {
+ imports.wbg.__wbg_useProgram_473bf913989b6089 = function(arg0, arg1) {
arg0.useProgram(arg1);
};
- imports.wbg.__wbg_useProgram_88e7787408765ccf = function(arg0, arg1) {
+ imports.wbg.__wbg_useProgram_9b2660f7bb210471 = function(arg0, arg1) {
arg0.useProgram(arg1);
};
- imports.wbg.__wbg_userAgent_918b064b4cd32842 = function() { return handleError(function (arg0, arg1) {
+ imports.wbg.__wbg_userAgent_12e9d8e62297563f = function() { return handleError(function (arg0, arg1) {
const ret = arg1.userAgent;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
}, arguments) };
- imports.wbg.__wbg_value_47fde8ea2d9fdcd5 = function(arg0, arg1) {
+ imports.wbg.__wbg_value_91cbf0dd3ab84c1e = function(arg0, arg1) {
const ret = arg1.value;
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len1 = WASM_VECTOR_LEN;
getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};
- imports.wbg.__wbg_vertexAttribPointer_1f280ac2d8994592 = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
+ imports.wbg.__wbg_vertexAttribPointer_550dc34903e3d1ea = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
arg0.vertexAttribPointer(arg1 >>> 0, arg2, arg3 >>> 0, arg4 !== 0, arg5, arg6);
};
- imports.wbg.__wbg_vertexAttribPointer_c6b1ccfa43bbca96 = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
+ imports.wbg.__wbg_vertexAttribPointer_7a2a506cdbe3aebc = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
arg0.vertexAttribPointer(arg1 >>> 0, arg2, arg3 >>> 0, arg4 !== 0, arg5, arg6);
};
- imports.wbg.__wbg_viewport_1ca83fff581a8f22 = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_viewport_a1b4d71297ba89af = function(arg0, arg1, arg2, arg3, arg4) {
arg0.viewport(arg1, arg2, arg3, arg4);
};
- imports.wbg.__wbg_viewport_770469a07e2d9772 = function(arg0, arg1, arg2, arg3, arg4) {
+ imports.wbg.__wbg_viewport_e615e98f676f2d39 = function(arg0, arg1, arg2, arg3, arg4) {
arg0.viewport(arg1, arg2, arg3, arg4);
};
- imports.wbg.__wbg_warn_123db6aa8948382e = function(arg0) {
+ imports.wbg.__wbg_warn_4ca3906c248c47c4 = function(arg0) {
console.warn(arg0);
};
- imports.wbg.__wbg_warn_cb8be8bbf790a5d6 = function(arg0, arg1, arg2, arg3) {
+ imports.wbg.__wbg_warn_aaf1f4664a035bd6 = function(arg0, arg1, arg2, arg3) {
console.warn(arg0, arg1, arg2, arg3);
};
- imports.wbg.__wbg_width_0d7b0b5ad3c2009f = function(arg0) {
+ imports.wbg.__wbg_width_5dde457d606ba683 = function(arg0) {
const ret = arg0.width;
return ret;
};
- imports.wbg.__wbg_width_9927e6a7adb23d6d = function(arg0) {
+ imports.wbg.__wbg_width_cdaf02311c1621d1 = function(arg0) {
const ret = arg0.width;
return ret;
};
- imports.wbg.__wbg_writeText_e65e98e75a2a92b8 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbg_writeText_51c338e8ae4b85b9 = function(arg0, arg1, arg2) {
const ret = arg0.writeText(getStringFromWasm0(arg1, arg2));
return ret;
};
- imports.wbg.__wbg_write_595020cd67830644 = function(arg0, arg1) {
+ imports.wbg.__wbg_write_e357400b06c0ccf5 = function(arg0, arg1) {
const ret = arg0.write(arg1);
return ret;
};
@@ -1519,20 +1527,20 @@ function __wbg_get_imports() {
const ret = false;
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper2733 = function(arg0, arg1, arg2) {
- const ret = makeMutClosure(arg0, arg1, 792, __wbg_adapter_30);
+ imports.wbg.__wbindgen_closure_wrapper2823 = function(arg0, arg1, arg2) {
+ const ret = makeMutClosure(arg0, arg1, 787, __wbg_adapter_30);
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper2735 = function(arg0, arg1, arg2) {
- const ret = makeMutClosure(arg0, arg1, 792, __wbg_adapter_30);
+ imports.wbg.__wbindgen_closure_wrapper2825 = function(arg0, arg1, arg2) {
+ const ret = makeMutClosure(arg0, arg1, 787, __wbg_adapter_30);
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper2737 = function(arg0, arg1, arg2) {
- const ret = makeMutClosure(arg0, arg1, 792, __wbg_adapter_35);
+ imports.wbg.__wbindgen_closure_wrapper2827 = function(arg0, arg1, arg2) {
+ const ret = makeMutClosure(arg0, arg1, 787, __wbg_adapter_35);
return ret;
};
- imports.wbg.__wbindgen_closure_wrapper5102 = function(arg0, arg1, arg2) {
- const ret = makeMutClosure(arg0, arg1, 1295, __wbg_adapter_38);
+ imports.wbg.__wbindgen_closure_wrapper5095 = function(arg0, arg1, arg2) {
+ const ret = makeMutClosure(arg0, arg1, 1303, __wbg_adapter_38);
return ret;
};
imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {
diff --git a/crates/client/dist/wxbox-client-96cce58fa4aaba7a_bg.wasm b/crates/client/dist/wxbox-client-d12479fc5b6a11f2_bg.wasm
similarity index 72%
rename from crates/client/dist/wxbox-client-96cce58fa4aaba7a_bg.wasm
rename to crates/client/dist/wxbox-client-d12479fc5b6a11f2_bg.wasm
index 4b265e9..a76139d 100644
Binary files a/crates/client/dist/wxbox-client-96cce58fa4aaba7a_bg.wasm and b/crates/client/dist/wxbox-client-d12479fc5b6a11f2_bg.wasm differ
diff --git a/crates/client/src/app.rs b/crates/client/src/app.rs
index 17093ba..7053ae4 100644
--- a/crates/client/src/app.rs
+++ b/crates/client/src/app.rs
@@ -7,20 +7,20 @@ use serde::{Deserialize, Serialize};
use tracing::debug;
use crate::map::{Map};
use crate::map::sources::baselayers::BASELAYER_OSM;
-use crate::map::tiles::LayerManager;
-use crate::ui::layer_selector::{LayerSelector};
+use crate::map::tiles::{ActiveLayer, LayerId, LayerManager};
use crate::ui::shell::footer::footer;
use crate::ui::shell::left_bar::left_bar;
+use crate::ui::shell::right_bar::right_bar;
use crate::ui::shell::top_bar::top_bar;
use crate::ui::tokens::{DESIGN_TOKENS, DesignTokens};
#[derive(Serialize, Deserialize)]
pub struct App {
map: Map,
- layer_selector: LayerSelector,
widget_gallery: WidgetGallery,
pub(crate) frame_time_history: History<f32>,
- add_layer_open: bool
+ add_layer_open: bool,
+ selected_layer: Option<LayerId>,
}
impl App {
@@ -42,15 +42,19 @@ impl App {
let mut map = Map::new(cc).unwrap();
let mut layer_manager = LayerManager::default();
layer_manager.register_builtin_layers();
- layer_manager.active_layers.push(BASELAYER_OSM.source_id);
+ layer_manager.active_layers.push(ActiveLayer {
+ source_id: BASELAYER_OSM.source_id,
+ layer_id: LayerId::new(),
+ visible: true,
+ });
map.layer_manager = layer_manager;
Self {
map,
- layer_selector: LayerSelector::default(),
widget_gallery: WidgetGallery::default(),
frame_time_history: History::new(1..100, 0.5),
- add_layer_open: false
+ add_layer_open: false,
+ selected_layer: None
}
}
}
@@ -67,7 +71,8 @@ impl eframe::App for App {
top_bar(ctx);
footer(ctx, &self);
- left_bar(ctx, &mut self.add_layer_open, &mut self.map.layer_manager);
+ left_bar(ctx, &mut self.add_layer_open, &mut self.map.layer_manager, &mut self.selected_layer);
+ right_bar(ctx);
/*
egui::SidePanel::left("sidebar")
diff --git a/crates/client/src/map.rs b/crates/client/src/map.rs
index 7107a56..482a400 100644
--- a/crates/client/src/map.rs
+++ b/crates/client/src/map.rs
@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
use tracing::debug;
use crate::map::render::{ExtraRenderOptions, MapRender};
use crate::map::sources::baselayers::BASELAYER_OSM;
-use crate::map::tiles::{LayerId, LayerManager, LayerSource, Tile, XCoord, YCoord, ZoomLevel};
+use crate::map::tiles::{SourceId, LayerManager, LayerSource, Tile, XCoord, YCoord, ZoomLevel};
#[derive(Serialize, Deserialize)]
#[serde(default)]
@@ -212,7 +212,7 @@ impl Map {
// layers are stored top-down, but we want to render tiles bottom-up
for active_layer in active_layers.iter().rev() {
let layer_info_opt = {
- self.layer_manager.registered_layers.get(active_layer).unwrap().clone()
+ self.layer_manager.registered_sources.get(&active_layer.source_id).unwrap().clone()
};
let x_buffer_tiles = 2;
@@ -236,7 +236,7 @@ impl Map {
let tile = self.load_tile(ctx, z_clamped as ZoomLevel, tx, ty, &layer_info_opt);
tiles.push(TilesetTile {
- tileid: (z_clamped as usize, tx, ty, *active_layer),
+ tileid: (z_clamped as usize, tx, ty, active_layer.source_id),
x: (256.0*ox as f32 - x_tile_frac as f32),
y: (-256.0*oy as f32 + y_tile_frac as f32),
tile: match tile.promise.ready() {
@@ -288,11 +288,11 @@ impl Map {
pub struct Tileset {
pub tiles: Arc<Mutex<Vec<TilesetTile>>>,
zoom: f32,
- retained_tiles: Vec<(ZoomLevel, XCoord, YCoord, LayerId)>
+ retained_tiles: Vec<(ZoomLevel, XCoord, YCoord, SourceId)>
}
#[derive(Clone, Debug)]
struct TilesetTile {
- tileid: (ZoomLevel, XCoord, YCoord, LayerId),
+ tileid: (ZoomLevel, XCoord, YCoord, SourceId),
x: f32,
y: f32,
tile: Option<DynamicImage>,
diff --git a/crates/client/src/map/render.rs b/crates/client/src/map/render.rs
index 06e83d5..af33708 100644
--- a/crates/client/src/map/render.rs
+++ b/crates/client/src/map/render.rs
@@ -4,7 +4,7 @@ use std::mem;
use glow::{Buffer, PixelUnpackData, Program, Texture, VertexArray};
use serde::{Deserialize, Serialize};
use tracing::{error, warn};
-use crate::map::tiles::{LayerId, LayerManager, XCoord, YCoord, ZoomLevel};
+use crate::map::tiles::{SourceId, LayerManager, XCoord, YCoord, ZoomLevel};
use crate::map::Tileset;
pub struct MapRender {
@@ -12,7 +12,7 @@ pub struct MapRender {
vao: VertexArray,
ebo: Buffer,
shader_program: Program,
- texture_cache: HashMap<(ZoomLevel, XCoord, YCoord, LayerId), Texture>
+ texture_cache: HashMap<(ZoomLevel, XCoord, YCoord, SourceId), Texture>
}
#[allow(unsafe_code)]
diff --git a/crates/client/src/map/tiles.rs b/crates/client/src/map/tiles.rs
index b50ce7b..534afa9 100644
--- a/crates/client/src/map/tiles.rs
+++ b/crates/client/src/map/tiles.rs
@@ -1,3 +1,4 @@
+use std::cmp::PartialEq;
use std::collections::HashMap;
use std::fmt::{Debug, Formatter};
use image::DynamicImage;
@@ -11,24 +12,25 @@ use crate::map::Tileset;
pub type ZoomLevel = usize;
pub type XCoord = usize;
pub type YCoord = usize;
-pub type LayerId = u64;
+pub type SourceId = u64;
#[derive(Default, Serialize, Deserialize, Debug)]
#[serde(default)]
pub struct LayerManager {
- pub registered_layers: HashMap<LayerId, LayerSource>,
- pub active_layers: Vec<LayerId>,
+ pub registered_sources: HashMap<SourceId, LayerSource>,
+ pub active_layers: Vec<ActiveLayer>,
#[serde(skip)]
- pub tiles: HashMap<(ZoomLevel, XCoord, YCoord, LayerId), (Tile, u64)>,
+ pub tiles: HashMap<(ZoomLevel, XCoord, YCoord, SourceId), (Tile, u64)>,
pub tile_cache_retention: u64
}
+
impl LayerManager {
pub fn register_layer(&mut self, layer: &LayerSource) {
- self.registered_layers.insert(layer.source_id, layer.clone());
+ self.registered_sources.insert(layer.source_id, layer.clone());
}
- pub fn unregister_layer(&mut self, layer_id: &LayerId) {
- self.registered_layers.remove(layer_id);
- self.active_layers.retain(|u| u != layer_id);
+ pub fn unregister_layer(&mut self, layer_id: &SourceId) {
+ self.registered_sources.remove(layer_id);
+ self.active_layers.retain(|u| u.source_id != *layer_id);
}
pub fn register_builtin_layers(&mut self) {
let layers = [
@@ -53,7 +55,7 @@ impl LayerManager {
pub fn remove_unregistered_layers(&mut self) {
// remove any
- self.active_layers.retain(|u| self.registered_layers.contains_key(u));
+ self.active_layers.retain(|u| self.registered_sources.contains_key(&u.source_id));
}
pub fn garbage_collect(&mut self, current_tileset: &mut Tileset) {
let tiles_onscreen = current_tileset.tiles.lock().unwrap();
@@ -103,4 +105,29 @@ impl Debug for Tile {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", if self.promise.ready().is_some() { "<loaded texture>" } else { "<texture promise>" })
}
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct ActiveLayer {
+ pub source_id: SourceId,
+ pub layer_id: LayerId,
+ pub visible: bool
+}
+
+#[derive(Hash, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+pub struct LayerId(u32);
+impl LayerId {
+ pub fn new() -> Self {
+ Self(rand::random())
+ }
+}
+impl Debug for LayerId {
+ fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{:04x}", self.0)
+ }
+}
+impl From<LayerId> for egui::Id {
+ fn from(id: LayerId) -> Self {
+ Self::new(id)
+ }
}
\ No newline at end of file
diff --git a/crates/client/src/ui/layer_selector.rs b/crates/client/src/ui/layer_selector.rs
deleted file mode 100644
index 5f8f928..0000000
--- a/crates/client/src/ui/layer_selector.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use std::collections::HashMap;
-use egui::{Button, Color32, Frame, Id, Ui, vec2};
-use serde::{Deserialize, Serialize};
-use crate::map::tiles::{LayerId, LayerManager, LayerSource};
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-struct Location {
- row: usize,
-}
-
-fn active_layer_reorderer(ui: &mut Ui, layers: &mut Vec<LayerId>, layer_registry: &HashMap<LayerId, LayerSource>) {
- let mut from = None;
- let mut to = None;
-
- let frame = Frame::default().inner_margin(4.0);
- let (_, dropped_payload) = ui.dnd_drop_zone::<Location, ()>(frame, |ui| {
- ui.set_min_size(vec2(64.0, 100.0));
- for (row_idx, item) in layers.iter().enumerate() {
- let item_id = Id::new(("layerselect_dnd", row_idx));
- let item_location = Location {
- row: row_idx
- };
- let response = ui.dnd_drag_source(item_id, item_location, |ui| {
- let opt = layer_registry.get(item);
- let layer = opt.as_ref().unwrap();
- ui.label(layer.display_name.clone());
- }).response;
-
- if let (Some(pointer), Some(hovered_payload)) = (
- ui.input(|i| i.pointer.interact_pos()),
- response.dnd_hover_payload::<Location>(),
- ) {
- let rect = response.rect;
- let stroke = egui::Stroke::new(1.0, Color32::WHITE);
- let insert_row_idx = if *hovered_payload == item_location {
- ui.painter().hline(rect.x_range(), rect.center().y, stroke);
- row_idx
- } else if pointer.y < rect.center().y {
- ui.painter().hline(rect.x_range(), rect.top(), stroke);
- row_idx
- } else {
- ui.painter().hline(rect.x_range(), rect.bottom(), stroke);
- row_idx + 1
- };
-
- if let Some(dragged_payload) = response.dnd_release_payload() {
- from = Some(dragged_payload);
- to = Some(Location {
- row: insert_row_idx
- });
- }
- }
- }
- });
-
- if let Some(dragged_payload) = dropped_payload {
- from = Some(dragged_payload);
- to = Some(Location {
- row: usize::MAX
- });
- }
-
- if let (Some(from), Some(mut to)) = (from, to) {
- to.row -= (from.row < to.row) as usize;
- let item = layers.remove(from.row);
- to.row = to.row.min(layers.len());
- layers.insert(to.row, item);
- }
-}
-
-#[derive(Serialize, Deserialize, Default)]
-pub struct LayerSelector {
- add_layer_layerid: LayerId
-}
-impl LayerSelector {
- pub fn ui(&mut self, ui: &mut Ui, layer_manager: &mut LayerManager) {
- active_layer_reorderer(ui, &mut layer_manager.active_layers, &layer_manager.registered_layers);
-
- egui::ComboBox::from_id_salt("layerselect")
- .selected_text({
- if self.add_layer_layerid == 0 { "Select a layer".to_string() }
- else {
- let opt = layer_manager.registered_layers.get(&self.add_layer_layerid);
- opt.as_ref().unwrap().display_name.clone()
- }
- })
- .show_ui(ui, |ui| {
- for (layerid, layer) in &layer_manager.registered_layers {
- ui.selectable_value(&mut self.add_layer_layerid, *layerid, layer.display_name.clone());
- }
- });
-
- if ui.add_enabled(self.add_layer_layerid != 0, Button::new("Add")).clicked() {
- layer_manager.active_layers.push(self.add_layer_layerid);
- }
- }
-}
-
diff --git a/crates/client/src/ui/mod.rs b/crates/client/src/ui/mod.rs
index 9774844..8cc69f0 100644
--- a/crates/client/src/ui/mod.rs
+++ b/crates/client/src/ui/mod.rs
@@ -2,7 +2,6 @@ use std::any::Any;
use egui::emath::GuiRounding;
use egui::{emath, CursorIcon, Id, InnerResponse, LayerId, Order, Sense, Ui, UiBuilder};
-pub mod layer_selector;
pub mod tokens;
pub mod shell;
diff --git a/crates/client/src/ui/shell/bars.rs b/crates/client/src/ui/shell/bars.rs
new file mode 100644
index 0000000..e28081b
--- /dev/null
+++ b/crates/client/src/ui/shell/bars.rs
@@ -0,0 +1,31 @@
+use egui::{Align, FontFamily, Frame, Layout, RichText, Ui};
+use crate::ui::UiExt;
+
+pub fn pane_header(
+ ui: &mut Ui,
+ title: &str,
+ icon: Option<&str>,
+ top_separator: bool,
+ add_contents: impl FnOnce(&mut Ui),
+) {
+ if top_separator {
+ ui.full_span_separator();
+ }
+
+ let mut frame = Frame::new();
+ frame.inner_margin.left = 8;
+ frame.inner_margin.right = 8;
+
+ frame.show(ui, |ui| {
+ ui.horizontal(|ui| {
+ if let Some(icon) = icon {
+ ui.label(RichText::new(icon).family(FontFamily::Name("icon-only".into())).strong());
+ }
+ ui.label(RichText::new(title).family(FontFamily::Name("semibold".into())).strong());
+
+ ui.with_layout(Layout::right_to_left(Align::Center), add_contents);
+ });
+ });
+
+ ui.full_span_separator();
+}
\ No newline at end of file
diff --git a/crates/client/src/ui/shell/left_bar.rs b/crates/client/src/ui/shell/left_bar.rs
index e061ecc..853dc54 100644
--- a/crates/client/src/ui/shell/left_bar.rs
+++ b/crates/client/src/ui/shell/left_bar.rs
@@ -1,29 +1,21 @@
-use eframe::emath::Align;
-use egui::{Color32, CursorIcon, FontFamily, Frame, Id, Layout, Response, RichText, ScrollArea, Theme, Ui, vec2, Visuals, CornerRadius, Button, Margin, Label, Rect, Sense};
-use egui::epaint::Marginf;
-use egui::frame::Prepared;
-use tracing::debug;
-use crate::map::tiles::{LayerManager, LayerTypeHint};
+use std::collections::HashMap;
+use crate::map::tiles::{ActiveLayer, LayerId, LayerManager, LayerSource, LayerTypeHint, SourceId};
use crate::ui::tokens::DESIGN_TOKENS;
use crate::ui::UiExt;
+use eframe::emath::Align;
+use egui::epaint::Marginf;
+use egui::frame::Prepared;
+use egui::{vec2, Button, Color32, CornerRadius, CursorIcon, FontFamily, Frame, Id, Label, Layout, Margin, Rect, Response, RichText, ScrollArea, Sense, Separator, Theme, Ui, UiBuilder, Visuals};
+use tracing::debug;
+use crate::ui::shell::bars::pane_header;
fn outer_rect(f: &Prepared) -> Rect {
-
let content_rect = f.content_ui.min_rect();
- content_rect
-
- + f.frame.inner_margin
-
- + Marginf::from(f.frame.stroke.width)
-
- + f.frame.outer_margin
-
+ content_rect + f.frame.inner_margin + Marginf::from(f.frame.stroke.width) + f.frame.outer_margin
}
-
-pub fn left_bar(ctx: &egui::Context, add_open: &mut bool, layer_manager: &mut LayerManager) {
-
+pub fn left_bar(ctx: &egui::Context, add_open: &mut bool, layer_manager: &mut LayerManager, selected_layer: &mut Option<LayerId>) {
let mut frame = Frame::side_top_panel(&ctx.style());
frame.inner_margin.top = 4;
frame.inner_margin.left = 0;
@@ -32,24 +24,52 @@ pub fn left_bar(ctx: &egui::Context, add_open: &mut bool, layer_manager: &mut La
egui::SidePanel::left("left_panel")
.frame(frame)
.show(ctx, |ui| {
- pane_header(ui, "Layers", Some(egui_phosphor::regular::STACK), false, |ui| {
- ui.style_mut().visuals.widgets.inactive.weak_bg_fill = Color32::TRANSPARENT;
- if ui.button(RichText::new(egui_phosphor::regular::PLUS).size(12.0)).clicked() {
- *add_open = true;
- }
- });
-
- for (idx, layer) in layer_manager.active_layers.iter().enumerate() {
- ui.dnd_drag_source(
- Id::new(idx as u64 + layer),
- idx,
- |ui| {
- if ui.button("hello").clicked() {
- *add_open = true;
- }
+ pane_header(
+ ui,
+ "Layers",
+ Some(egui_phosphor::regular::STACK),
+ false,
+ |ui| {
+ ui.style_mut().visuals.widgets.inactive.weak_bg_fill = Color32::TRANSPARENT;
+ if ui
+ .button(RichText::new(egui_phosphor::regular::PLUS).size(12.0))
+ .clicked()
+ {
+ *add_open = true;
}
+ },
+ );
+
+ ui.label(format!("{:?}", selected_layer));
+
+ let lm_registry = &layer_manager.registered_sources;
+ let layers_to_draw = layer_manager.active_layers.len();
+
+ let mut layers_to_remove = vec![];
+
+ for (idx, layer) in layer_manager.active_layers.iter_mut().enumerate() {
+ let retain = draw_layer(
+ ui,
+ layer,
+ lm_registry,
+ selected_layer
);
+
+ if !retain {
+ layers_to_remove.push(layer.layer_id);
+ }
+
+ /*
+ if idx != layers_to_draw - 1 {
+ ui.add(
+ Separator::default()
+ .shrink(72.0)
+ );
+ }*/ // TODO @tm85 this looks weird, please mess with it at your earliest convenience
+
}
+
+ layer_manager.active_layers.retain(|layer| !layers_to_remove.contains(&layer.layer_id));
});
if *add_open {
@@ -59,14 +79,23 @@ pub fn left_bar(ctx: &egui::Context, add_open: &mut bool, layer_manager: &mut La
egui::Modal::new(Id::new("add_source_modal"))
.frame(frame)
.show(ctx, |ui| {
- pane_header(ui, "Add layer", Some(egui_phosphor::regular::STACK_PLUS), false, |ui| {
- ui.style_mut().visuals.widgets.inactive.weak_bg_fill = Color32::TRANSPARENT;
- if ui.button(RichText::new(egui_phosphor::regular::X).size(12.0)).clicked() {
- *add_open = false;
- }
- });
+ pane_header(
+ ui,
+ "Add layer",
+ Some(egui_phosphor::regular::STACK_PLUS),
+ false,
+ |ui| {
+ ui.style_mut().visuals.widgets.inactive.weak_bg_fill = Color32::TRANSPARENT;
+ if ui
+ .button(RichText::new(egui_phosphor::regular::X).size(12.0))
+ .clicked()
+ {
+ *add_open = false;
+ }
+ },
+ );
- for (id, registered_layer) in &layer_manager.registered_layers {
+ for (id, registered_layer) in &layer_manager.registered_sources {
// ghost button
let mut frame = Frame::new();
@@ -80,8 +109,18 @@ pub fn left_bar(ctx: &egui::Context, add_open: &mut bool, layer_manager: &mut La
{
frame.content_ui.horizontal(|ui| {
- let mut frame = Frame::new()
- .fill(DESIGN_TOKENS.get_color("colors.base.4", if ui.style().visuals.dark_mode { Theme::Dark } else { Theme::Light }).unwrap());
+ let mut frame = Frame::new().fill(
+ DESIGN_TOKENS
+ .get_color(
+ "colors.base.4",
+ if ui.style().visuals.dark_mode {
+ Theme::Dark
+ } else {
+ Theme::Light
+ },
+ )
+ .unwrap(),
+ );
frame.inner_margin.top = 4;
frame.inner_margin.left = 8;
@@ -91,26 +130,26 @@ pub fn left_bar(ctx: &egui::Context, add_open: &mut bool, layer_manager: &mut La
frame.corner_radius = CornerRadius::from(4);
frame.show(ui, |ui| {
+ let icon = match registered_layer.type_hint {
+ LayerTypeHint::Baselayer => egui_phosphor::regular::MAP_TRIFOLD,
+ LayerTypeHint::RadarData => egui_phosphor::regular::TARGET,
+ };
- let icon = match registered_layer.type_hint {
- LayerTypeHint::Baselayer => egui_phosphor::regular::MAP_TRIFOLD,
- LayerTypeHint::RadarData => egui_phosphor::regular::TARGET
- };
-
- ui.label(RichText::new(icon).size(24.0));
- });
+ ui.label(RichText::new(icon).size(24.0));
+ });
ui.vertical(|ui| {
ui.label(®istered_layer.display_name);
ui.horizontal(|ui| {
-
let type_hint = match registered_layer.type_hint {
LayerTypeHint::Baselayer => "Baselayer",
LayerTypeHint::RadarData => "Radar data",
};
let icon = match registered_layer.type_hint {
- LayerTypeHint::Baselayer => egui_phosphor::regular::MAP_TRIFOLD,
- LayerTypeHint::RadarData => egui_phosphor::regular::TARGET
+ LayerTypeHint::Baselayer => {
+ egui_phosphor::regular::MAP_TRIFOLD
+ }
+ LayerTypeHint::RadarData => egui_phosphor::regular::TARGET,
};
let type_lbl = format!("{icon} {type_hint}");
@@ -120,26 +159,39 @@ pub fn left_bar(ctx: &egui::Context, add_open: &mut bool, layer_manager: &mut La
|ui| {
ui.label(RichText::new(type_lbl).weak());
ui.add_space(ui.available_width());
- }
+ },
);
-
ui.allocate_ui_with_layout(
vec2(120.0, 20.0),
Layout::left_to_right(Align::Center),
|ui| {
- ui.label(RichText::new(format!("{} {}", egui_phosphor::regular::NAVIGATION_ARROW, ®istered_layer.location)).weak());
+ ui.label(
+ RichText::new(format!(
+ "{} {}",
+ egui_phosphor::regular::NAVIGATION_ARROW,
+ ®istered_layer.location
+ ))
+ .weak(),
+ );
ui.add_space(ui.available_width());
- }
+ },
);
ui.allocate_ui_with_layout(
vec2(100.0, 20.0),
Layout::left_to_right(Align::Center),
|ui| {
- ui.label(RichText::new(format!("{} {}", egui_phosphor::regular::IDENTIFICATION_BADGE, ®istered_layer.source)).weak());
+ ui.label(
+ RichText::new(format!(
+ "{} {}",
+ egui_phosphor::regular::IDENTIFICATION_BADGE,
+ ®istered_layer.source
+ ))
+ .weak(),
+ );
ui.add_space(ui.available_width());
- }
+ },
);
});
});
@@ -149,102 +201,156 @@ pub fn left_bar(ctx: &egui::Context, add_open: &mut bool, layer_manager: &mut La
}
let response = ui.allocate_rect(outer_rect(&frame), Sense::click_and_drag());
if response.hovered() {
- frame.frame.fill = DESIGN_TOKENS.get_color("colors.base.7", if ui.style().visuals.dark_mode { Theme::Dark } else { Theme::Light }).unwrap();
- ui.ctx().output_mut(|u| u.cursor_icon = CursorIcon::PointingHand);
+ frame.frame.fill = DESIGN_TOKENS
+ .get_color(
+ "colors.base.7",
+ if ui.style().visuals.dark_mode {
+ Theme::Dark
+ } else {
+ Theme::Light
+ },
+ )
+ .unwrap();
+ ui.ctx()
+ .output_mut(|u| u.cursor_icon = CursorIcon::PointingHand);
}
if response.clicked() {
- layer_manager.active_layers.push(*id);
+ layer_manager.active_layers.push(ActiveLayer {
+ source_id: *id,
+ layer_id: LayerId::new(),
+ visible: true,
+ });
debug!("{:?}", layer_manager);
*add_open = false;
}
frame.paint(ui);
}
-
});
}
}
-fn pane_header(ui: &mut Ui, title: &str, icon: Option<&str>, top_separator: bool, add_contents: impl FnOnce(&mut Ui)) {
- if top_separator {
- ui.full_span_separator();
- }
- let mut frame = Frame::new();
- frame.inner_margin.left = 8;
- frame.inner_margin.right = 8;
- frame.show(ui, |ui| {
- ui.horizontal(|ui| {
- let text = if let Some(icon) = icon {
- RichText::new(format!("{} {}", icon, title))
- } else {
- RichText::new(title)
+fn draw_layer(ui: &mut Ui, layer: &mut ActiveLayer, registry: &HashMap<SourceId, LayerSource>, selected_layer: &mut Option<LayerId>) -> bool {
+ let mut retain = true;
+
+ ui.scope_builder(
+ UiBuilder::new()
+ .id_salt(layer.layer_id)
+ .sense(Sense::click_and_drag()),
+ |ui| {
+ let source = registry
+ .get(&layer.source_id)
+ .unwrap();
+ let title = source.display_name.as_str();
+ let icon = match source.type_hint {
+ LayerTypeHint::Baselayer => egui_phosphor::regular::MAP_TRIFOLD,
+ LayerTypeHint::RadarData => egui_phosphor::regular::TARGET,
};
- ui.label(
- text
- .family(FontFamily::Name("semibold".into()))
- .strong()
- );
-
- ui.with_layout(Layout::right_to_left(Align::Center), add_contents);
- });
- });
+ let mut any_children_hovered = false;
- ui.full_span_separator();
-}
+ let mut frame = Frame::new();
+ //frame.fill = ui.style().visuals.hyperlink_color;
+ frame.inner_margin.left = 8;
+ frame.inner_margin.right = 8;
+ frame.inner_margin.top = 2;
+ frame.inner_margin.bottom = 2;
-/*
-fn layer(ui: &mut Ui, title: &str, icon: &str) {
- ui.passthrough_dnd_drag_source(Id::new(title), title.to_owned(), |ui| {
- let mut frame = Frame::new();
- //frame.fill = ui.style().visuals.hyperlink_color;
- frame.inner_margin.left = 8;
- frame.inner_margin.right = 8;
- frame.inner_margin.top = 2;
- frame.inner_margin.bottom = 2;
- let mut frame = frame.begin(ui);
- {
- frame.content_ui.horizontal(|ui| {
-
- ui.label(
- RichText::new(egui_phosphor::regular::LIST)
- .size(12.0)
- .family(FontFamily::Name("icon-only".into()))
- .weak()
- );
-
- ui.add_space(8.0);
-
- ui.label(RichText::new(
- format!("{icon} {title}")
- ));
-
- ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
- ui.style_mut().visuals.widgets.inactive.weak_bg_fill = Color32::TRANSPARENT;
- ui.button(
- RichText::new(egui_phosphor::regular::EYE)
- .size(12.0)
- .family(FontFamily::Name("icon-only".into()))
+ let mut frame = frame.begin(ui);
+ {
+ frame.content_ui.horizontal(|ui| {
+ ui.add(
+ Label::new(
+ RichText::new(egui_phosphor::regular::DOTS_SIX_VERTICAL)
+ .size(12.0)
+ .family(FontFamily::Name("icon-only".into()))
+ .weak(),
+ )
+ .sense(Sense::empty())
+ .selectable(false)
);
- ui.button(
- RichText::new(egui_phosphor::regular::TRASH)
+
+ ui.add_space(8.0);
+
+ let mut name_label = RichText::new(format!("{icon} {title} ({:?})", layer.layer_id));
+ if !layer.visible {
+ name_label = name_label.weak();
+ }
+
+ ui.add(Label::new(name_label).sense(Sense::empty()).selectable(false));
+
+ ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+ ui.style_mut().visuals.widgets.inactive.weak_bg_fill = Color32::TRANSPARENT;
+
+ let mut visibility_label = RichText::new(if layer.visible {
+ egui_phosphor::regular::EYE
+ } else {
+ egui_phosphor::regular::EYE_SLASH
+ })
.size(12.0)
- .family(FontFamily::Name("icon-only".into()))
- );
+ .family(FontFamily::Name("icon-only".into()));
+
+ if !layer.visible {
+ visibility_label = visibility_label.weak();
+ }
+
+ let visibility_btn = ui.button(
+ visibility_label
+ );
+
+ any_children_hovered = any_children_hovered || visibility_btn.hovered();
+ if visibility_btn.clicked() {
+ layer.visible = !layer.visible;
+ }
+
+ let mut delete_label = RichText::new(egui_phosphor::regular::TRASH)
+ .size(12.0)
+ .family(FontFamily::Name("icon-only".into()));
+
+ if !layer.visible {
+ delete_label = delete_label.weak();
+ }
+
+ let delete_button = ui.button(
+ delete_label
+ );
+ any_children_hovered = any_children_hovered || delete_button.hovered();
+
+ if delete_button.clicked() {
+ retain = false;
+ }
+ });
});
- });
- }
- let response = frame.allocate_space(ui);
- if response.hovered() {
- frame.frame.fill = ;
- ui.ctx().output_mut(|u| u.cursor_icon = CursorIcon::Grab);
- }
- frame.paint(ui);
+ }
+ frame.allocate_space(ui);
+
+ let response = ui.response();
+
+ if response.hovered() && !any_children_hovered {
+ frame.frame.fill = ui.visuals().widgets.active.weak_bg_fill;
+ ui.ctx().output_mut(|u| u.cursor_icon = CursorIcon::Grab);
+ }
+
+ if response.clicked() {
+ *selected_layer = Some(layer.layer_id);
+ }
+
+ if let Some(sel_layer) = selected_layer {
+ if *sel_layer == layer.layer_id {
+ if !layer.visible {
+ frame.frame.fill = ui.visuals().widgets.inactive.bg_fill;
+ } else {
+ frame.frame.fill = ui.visuals().widgets.hovered.bg_fill;
+ }
+ }
+ }
+
+ frame.paint(ui);
+ }
+ );
+ retain
- });
}
-
- */
\ No newline at end of file
diff --git a/crates/client/src/ui/shell/mod.rs b/crates/client/src/ui/shell/mod.rs
index 80071c4..97beeec 100644
--- a/crates/client/src/ui/shell/mod.rs
+++ b/crates/client/src/ui/shell/mod.rs
@@ -1,3 +1,5 @@
pub mod top_bar;
pub mod footer;
-pub mod left_bar;
\ No newline at end of file
+pub mod left_bar;
+pub mod bars;
+pub mod right_bar;
\ No newline at end of file
diff --git a/crates/client/src/ui/shell/right_bar.rs b/crates/client/src/ui/shell/right_bar.rs
new file mode 100644
index 0000000..bd8a755
--- /dev/null
+++ b/crates/client/src/ui/shell/right_bar.rs
@@ -0,0 +1,31 @@
+use egui::{Align, Direction, Frame, Layout, RichText};
+use crate::ui::shell::bars::pane_header;
+
+pub fn right_bar(ctx: &egui::Context) {
+ let mut frame = Frame::side_top_panel(&ctx.style());
+ frame.inner_margin.top = 4;
+ frame.inner_margin.left = 0;
+ frame.inner_margin.right = 0;
+
+ egui::SidePanel::right("right_panel")
+ .frame(frame)
+ .show(ctx, |ui| {
+ pane_header(
+ ui,
+ "Properties",
+ Some(egui_phosphor::regular::INFO),
+ false,
+ |ui| {}
+ );
+
+ ui.with_layout(
+ Layout::top_down_justified(Align::Center),
+ |ui| {
+ ui.label(
+ RichText::new("Select a layer in the Layers panel to modify it's properties").italics()
+ );
+ }
+ );
+
+ });
+}
\ No newline at end of file