diff --git a/Cargo.lock b/Cargo.lock
index 00f95ac55164d61e4075607ab87ac9787687343f..88ddb7700d9291dddd17e5fc3d9048ee4e8c9f5d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,23 +10,22 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [
"memchr",
]
[[package]]
name = "alsa"
-version = "0.7.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47"
+checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce"
dependencies = [
"alsa-sys",
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
"libc",
- "nix 0.24.3",
]
[[package]]
@@ -94,9 +93,9 @@ checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10"
[[package]]
name = "autocfg"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
[[package]]
name = "bincode"
@@ -109,22 +108,22 @@ dependencies = [
[[package]]
name = "bindgen"
-version = "0.69.1"
+version = "0.69.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
"cexpr",
"clang-sys",
+ "itertools",
"lazy_static",
"lazycell",
- "peeking_take_while",
"proc-macro2",
"quote",
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.39",
+ "syn 2.0.58",
]
[[package]]
@@ -141,9 +140,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.4.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
[[package]]
name = "block"
@@ -153,15 +152,15 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "bumpalo"
-version = "3.14.0"
+version = "3.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
[[package]]
name = "bytemuck"
-version = "1.14.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
[[package]]
name = "byteorder"
@@ -171,9 +170,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
[[package]]
name = "calloop"
@@ -191,9 +190,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.83"
+version = "1.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
dependencies = [
"jobserver",
"libc",
@@ -220,6 +219,12 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
[[package]]
name = "cgmath"
version = "0.18.0"
@@ -239,13 +244,13 @@ checksum = "75476fe966a8af7c0ceae2a3e514afa87d4451741fcdfab8bfaa07ad301842ec"
[[package]]
name = "clang-sys"
-version = "1.6.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
dependencies = [
"glob",
"libc",
- "libloading 0.7.4",
+ "libloading 0.8.3",
]
[[package]]
@@ -283,7 +288,7 @@ dependencies = [
"block",
"cocoa-foundation",
"core-foundation",
- "core-graphics 0.23.1",
+ "core-graphics 0.23.2",
"foreign-types 0.5.0",
"libc",
"objc",
@@ -350,9 +355,9 @@ dependencies = [
[[package]]
name = "core-graphics"
-version = "0.23.1"
+version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
@@ -379,7 +384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
dependencies = [
"core-foundation",
- "core-graphics 0.23.1",
+ "core-graphics 0.23.2",
"foreign-types 0.5.0",
"libc",
]
@@ -397,32 +402,30 @@ dependencies = [
[[package]]
name = "coreaudio-sys"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028"
+checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9"
dependencies = [
"bindgen",
]
[[package]]
name = "cpal"
-version = "0.15.2"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c"
+checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
dependencies = [
"alsa",
"core-foundation-sys",
"coreaudio-rs",
"dasp_sample",
- "jni 0.19.0",
+ "jni",
"js-sys",
"libc",
"mach2",
- "ndk",
+ "ndk 0.8.0",
"ndk-context",
"oboe",
- "once_cell",
- "parking_lot",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
@@ -431,55 +434,46 @@ dependencies = [
[[package]]
name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
dependencies = [
"cfg-if",
]
[[package]]
name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
dependencies = [
- "cfg-if",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
dependencies = [
- "cfg-if",
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
- "autocfg",
- "cfg-if",
"crossbeam-utils",
- "memoffset 0.9.0",
- "scopeguard",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
[[package]]
name = "crossfont"
@@ -490,7 +484,7 @@ dependencies = [
"cocoa 0.25.0",
"core-foundation",
"core-foundation-sys",
- "core-graphics 0.23.1",
+ "core-graphics 0.23.2",
"core-text",
"dwrote",
"foreign-types 0.5.0",
@@ -565,9 +559,9 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
[[package]]
name = "deranged"
-version = "0.3.10"
+version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
dependencies = [
"powerfmt",
]
@@ -584,14 +578,14 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [
- "libloading 0.8.1",
+ "libloading 0.8.3",
]
[[package]]
name = "downcast-rs"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
[[package]]
name = "dwrote"
@@ -609,9 +603,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.9.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
[[package]]
name = "encoding_rs"
@@ -640,9 +634,9 @@ dependencies = [
[[package]]
name = "exr"
-version = "1.71.0"
+version = "1.72.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8"
+checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
dependencies = [
"bit_field",
"flume",
@@ -654,11 +648,17 @@ dependencies = [
"zune-inflate",
]
+[[package]]
+name = "extended"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365"
+
[[package]]
name = "fdeflate"
-version = "0.3.1"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
dependencies = [
"simd-adler32",
]
@@ -715,7 +715,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.58",
]
[[package]]
@@ -754,9 +754,9 @@ dependencies = [
[[package]]
name = "gif"
-version = "0.12.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
dependencies = [
"color_quant",
"weezl",
@@ -764,9 +764,9 @@ dependencies = [
[[package]]
name = "gilrs"
-version = "0.10.4"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b2e57a9cb946b5d04ae8638c5f554abb5a9f82c4c950fd5b1fee6d119592fb"
+checksum = "499067aa54af19f88732dc418f61f23d5912de1518665bb0eca034ca0d07574c"
dependencies = [
"fnv",
"gilrs-core",
@@ -778,9 +778,9 @@ dependencies = [
[[package]]
name = "gilrs-core"
-version = "0.5.9"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "178769da179a47b187837d1ab2b5b9b684a21180166a77a4ca37e7e58ee3833d"
+checksum = "85c132270a155f2548e67d66e731075c336c39098afc555752f3df8f882c720e"
dependencies = [
"core-foundation",
"inotify",
@@ -789,7 +789,7 @@ dependencies = [
"libc",
"libudev-sys",
"log",
- "nix 0.27.1",
+ "nix 0.28.0",
"rusty-xinput",
"serde",
"uuid",
@@ -801,9 +801,9 @@ dependencies = [
[[package]]
name = "glam"
-version = "0.24.2"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
dependencies = [
"mint",
]
@@ -816,10 +816,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "half"
-version = "2.2.1"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
dependencies = [
+ "cfg-if",
"crunchy",
]
@@ -837,9 +838,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "image"
-version = "0.24.7"
+version = "0.24.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
dependencies = [
"bytemuck",
"byteorder",
@@ -847,7 +848,6 @@ dependencies = [
"exr",
"gif",
"jpeg-decoder",
- "num-rational",
"num-traits",
"png",
"qoi",
@@ -891,9 +891,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.1.0"
+version = "2.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
dependencies = [
"equivalent",
"hashbrown",
@@ -933,46 +933,43 @@ dependencies = [
[[package]]
name = "io-kit-sys"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4769cb30e5dcf1710fc6730d3e94f78c47723a014a567de385e113c737394640"
+checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b"
dependencies = [
"core-foundation-sys",
"mach2",
]
[[package]]
-name = "itoa"
-version = "1.0.9"
+name = "itertools"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
[[package]]
-name = "jni"
-version = "0.19.0"
+name = "itoa"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "jni"
-version = "0.20.0"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
dependencies = [
"cesu8",
+ "cfg-if",
"combine",
"jni-sys",
"log",
"thiserror",
"walkdir",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -983,42 +980,43 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "jobserver"
-version = "0.1.27"
+version = "0.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
dependencies = [
"libc",
]
[[package]]
name = "jpeg-decoder"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
dependencies = [
"rayon",
]
[[package]]
name = "js-sys"
-version = "0.3.66"
+version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "kira"
-version = "0.8.5"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d15d6971aeabe05687ca909c6cf71b857e338b204c1ba9fe664e84020c633249"
+checksum = "8968f1eda49cdf4f6406fd5ffe590c3ca2778a1b0e50b5684974b138a99dfb2f"
dependencies = [
"atomic-arena",
"cpal",
"glam",
"mint",
"ringbuf",
+ "send_wrapper",
"symphonia",
]
@@ -1042,9 +1040,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]]
name = "libc"
-version = "0.2.150"
+version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "libloading"
@@ -1058,12 +1056,12 @@ dependencies = [
[[package]]
name = "libloading"
-version = "0.8.1"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
dependencies = [
"cfg-if",
- "windows-sys 0.48.0",
+ "windows-targets 0.52.4",
]
[[package]]
@@ -1088,15 +1086,15 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.20"
+version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
[[package]]
name = "mach2"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
+checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
dependencies = [
"libc",
]
@@ -1121,9 +1119,9 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.6.4"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
[[package]]
name = "memmap2"
@@ -1143,15 +1141,6 @@ dependencies = [
"autocfg",
]
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
[[package]]
name = "minimal-lexical"
version = "0.2.1"
@@ -1160,9 +1149,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
dependencies = [
"adler",
"simd-adler32",
@@ -1176,9 +1165,9 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
[[package]]
name = "mio"
-version = "0.8.9"
+version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
dependencies = [
"libc",
"log",
@@ -1194,12 +1183,26 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
dependencies = [
"bitflags 1.3.2",
"jni-sys",
- "ndk-sys",
- "num_enum",
+ "ndk-sys 0.4.1+23.1.7779620",
+ "num_enum 0.5.11",
"raw-window-handle 0.5.2",
"thiserror",
]
+[[package]]
+name = "ndk"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
+dependencies = [
+ "bitflags 2.5.0",
+ "jni-sys",
+ "log",
+ "ndk-sys 0.5.0+25.2.9519653",
+ "num_enum 0.7.2",
+ "thiserror",
+]
+
[[package]]
name = "ndk-context"
version = "0.1.1"
@@ -1214,10 +1217,10 @@ checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f"
dependencies = [
"libc",
"log",
- "ndk",
+ "ndk 0.7.0",
"ndk-context",
"ndk-macro",
- "ndk-sys",
+ "ndk-sys 0.4.1+23.1.7779620",
"once_cell",
"parking_lot",
]
@@ -1229,7 +1232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
dependencies = [
"darling",
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -1244,6 +1247,15 @@ dependencies = [
"jni-sys",
]
+[[package]]
+name = "ndk-sys"
+version = "0.5.0+25.2.9519653"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
+dependencies = [
+ "jni-sys",
+]
+
[[package]]
name = "nix"
version = "0.24.3"
@@ -1253,7 +1265,7 @@ dependencies = [
"bitflags 1.3.2",
"cfg-if",
"libc",
- "memoffset 0.6.5",
+ "memoffset",
]
[[package]]
@@ -1266,17 +1278,18 @@ dependencies = [
"bitflags 1.3.2",
"cfg-if",
"libc",
- "memoffset 0.6.5",
+ "memoffset",
]
[[package]]
name = "nix"
-version = "0.27.1"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
"cfg-if",
+ "cfg_aliases",
"libc",
]
@@ -1300,66 +1313,72 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-derive"
-version = "0.3.3"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.58",
]
[[package]]
-name = "num-integer"
-version = "0.1.45"
+name = "num-traits"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
dependencies = [
"autocfg",
- "num-traits",
]
[[package]]
-name = "num-rational"
-version = "0.4.1"
+name = "num_enum"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
+ "num_enum_derive 0.5.11",
]
[[package]]
-name = "num-traits"
-version = "0.2.17"
+name = "num_enum"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
dependencies = [
- "autocfg",
+ "num_enum_derive 0.7.2",
]
[[package]]
-name = "num_enum"
+name = "num_enum_derive"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
dependencies = [
- "num_enum_derive",
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
]
[[package]]
name = "num_enum_derive"
-version = "0.5.11"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.58",
]
[[package]]
@@ -1373,12 +1392,12 @@ dependencies = [
[[package]]
name = "oboe"
-version = "0.5.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
+checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
dependencies = [
- "jni 0.20.0",
- "ndk",
+ "jni",
+ "ndk 0.8.0",
"ndk-context",
"num-derive",
"num-traits",
@@ -1387,18 +1406,18 @@ dependencies = [
[[package]]
name = "oboe-sys"
-version = "0.5.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2"
+checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
dependencies = [
"cc",
]
[[package]]
name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "overload"
@@ -1429,12 +1448,6 @@ dependencies = [
"windows-targets 0.48.5",
]
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
[[package]]
name = "percent-encoding"
version = "2.3.1"
@@ -1443,21 +1456,21 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
[[package]]
name = "pkg-config"
-version = "0.3.27"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
name = "png"
-version = "0.17.10"
+version = "0.17.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
dependencies = [
"bitflags 1.3.2",
"crc32fast",
@@ -1482,11 +1495,20 @@ dependencies = [
"toml_edit 0.19.15",
]
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
[[package]]
name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
dependencies = [
"unicode-ident",
]
@@ -1502,9 +1524,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.33"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
dependencies = [
"proc-macro2",
]
@@ -1531,16 +1553,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac4ea493258d54c24cb46aa9345d099e58e2ea3f30dd63667fc54fc892f18e76"
dependencies = [
"cocoa 0.25.0",
- "core-graphics 0.23.1",
+ "core-graphics 0.23.2",
"objc",
"raw-window-handle 0.5.2",
]
[[package]]
name = "rayon"
-version = "1.8.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
"either",
"rayon-core",
@@ -1548,9 +1570,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
@@ -1567,14 +1589,14 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.2"
+version = "1.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
]
[[package]]
@@ -1588,13 +1610,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.3"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
]
[[package]]
@@ -1605,9 +1627,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
[[package]]
name = "ringbuf"
@@ -1637,9 +1659,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.15"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
[[package]]
name = "safe_arch"
@@ -1683,31 +1705,37 @@ dependencies = [
"tiny-skia",
]
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
[[package]]
name = "serde"
-version = "1.0.193"
+version = "1.0.197"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.193"
+version = "1.0.197"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.58",
]
[[package]]
name = "serde_json"
-version = "1.0.108"
+version = "1.0.115"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
dependencies = [
"itoa",
"ryu",
@@ -1716,9 +1744,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.4"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
dependencies = [
"serde",
]
@@ -1755,9 +1783,9 @@ dependencies = [
[[package]]
name = "shlex"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "simd-adler32"
@@ -1776,9 +1804,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.11.2"
+version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "smithay-client-toolkit"
@@ -1816,9 +1844,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "symphonia"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941"
+checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
dependencies = [
"lazy_static",
"symphonia-bundle-flac",
@@ -1827,15 +1855,15 @@ dependencies = [
"symphonia-codec-vorbis",
"symphonia-core",
"symphonia-format-ogg",
- "symphonia-format-wav",
+ "symphonia-format-riff",
"symphonia-metadata",
]
[[package]]
name = "symphonia-bundle-flac"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f23b0482a7cb18fcdf9981ab0b78df800ef0080187d294650023c462439058d"
+checksum = "72e34f34298a7308d4397a6c7fbf5b84c5d491231ce3dd379707ba673ab3bd97"
dependencies = [
"log",
"symphonia-core",
@@ -1845,11 +1873,10 @@ dependencies = [
[[package]]
name = "symphonia-bundle-mp3"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f31d7fece546f1e6973011a9eceae948133bbd18fd3d52f6073b1e38ae6368a"
+checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4"
dependencies = [
- "bitflags 1.3.2",
"lazy_static",
"log",
"symphonia-core",
@@ -1858,9 +1885,9 @@ dependencies = [
[[package]]
name = "symphonia-codec-pcm"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47f1fbd220a06a641c8ce2ddad10f5ef6ee5cc0c54d9044d25d43b0d3119deaa"
+checksum = "f395a67057c2ebc5e84d7bb1be71cce1a7ba99f64e0f0f0e303a03f79116f89b"
dependencies = [
"log",
"symphonia-core",
@@ -1868,9 +1895,9 @@ dependencies = [
[[package]]
name = "symphonia-codec-vorbis"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3953397e3506aa01350c4205817e4f95b58d476877a42f0458d07b665749e203"
+checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30"
dependencies = [
"log",
"symphonia-core",
@@ -1879,9 +1906,9 @@ dependencies = [
[[package]]
name = "symphonia-core"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142"
+checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3"
dependencies = [
"arrayvec 0.7.4",
"bitflags 1.3.2",
@@ -1892,9 +1919,9 @@ dependencies = [
[[package]]
name = "symphonia-format-ogg"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bf1a00ccd11452d44048a0368828040f778ae650418dbd9d8765b7ee2574c8d"
+checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931"
dependencies = [
"log",
"symphonia-core",
@@ -1903,11 +1930,12 @@ dependencies = [
]
[[package]]
-name = "symphonia-format-wav"
-version = "0.5.3"
+name = "symphonia-format-riff"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da76614728fa27c003bdcdfbac51396bd8fcbf94c95fe8e62f1d2bac58ef03a4"
+checksum = "05f7be232f962f937f4b7115cbe62c330929345434c834359425e043bfd15f50"
dependencies = [
+ "extended",
"log",
"symphonia-core",
"symphonia-metadata",
@@ -1915,9 +1943,9 @@ dependencies = [
[[package]]
name = "symphonia-metadata"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0"
+checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c"
dependencies = [
"encoding_rs",
"lazy_static",
@@ -1927,9 +1955,9 @@ dependencies = [
[[package]]
name = "symphonia-utils-xiph"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a450ca645b80d69aff8b35576cbfdc7f20940b29998202aab910045714c951f8"
+checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe"
dependencies = [
"symphonia-core",
"symphonia-metadata",
@@ -1948,9 +1976,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.39"
+version = "2.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
dependencies = [
"proc-macro2",
"quote",
@@ -1959,29 +1987,29 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.50"
+version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.58",
]
[[package]]
name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
dependencies = [
"cfg-if",
"once_cell",
@@ -1989,9 +2017,9 @@ dependencies = [
[[package]]
name = "tiff"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
dependencies = [
"flate2",
"jpeg-decoder",
@@ -2000,12 +2028,13 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.30"
+version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
dependencies = [
"deranged",
"itoa",
+ "num-conv",
"powerfmt",
"serde",
"time-core",
@@ -2020,10 +2049,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.15"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
dependencies = [
+ "num-conv",
"time-core",
]
@@ -2054,14 +2084,14 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.8.8"
+version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.21.0",
+ "toml_edit 0.22.9",
]
[[package]]
@@ -2081,20 +2111,31 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
"indexmap",
"toml_datetime",
- "winnow",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
]
[[package]]
name = "toml_edit"
-version = "0.21.0"
+version = "0.22.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow",
+ "winnow 0.6.5",
]
[[package]]
@@ -2128,7 +2169,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.58",
]
[[package]]
@@ -2178,9 +2219,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "uuid"
-version = "1.6.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
[[package]]
name = "valuable"
@@ -2232,9 +2273,9 @@ dependencies = [
[[package]]
name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
dependencies = [
"same-file",
"winapi-util",
@@ -2248,9 +2289,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2258,24 +2299,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.58",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.39"
+version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
dependencies = [
"cfg-if",
"js-sys",
@@ -2285,9 +2326,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2295,22 +2336,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.39",
+ "syn 2.0.58",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.89"
+version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
[[package]]
name = "wayland-client"
@@ -2387,9 +2428,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.66"
+version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2397,9 +2438,9 @@ dependencies = [
[[package]]
name = "weezl"
-version = "0.1.7"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]]
name = "winapi"
@@ -2434,11 +2475,31 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
-version = "0.46.0"
+version = "0.54.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
+checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
dependencies = [
- "windows-targets 0.42.2",
+ "windows-core",
+ "windows-targets 0.52.4",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.54.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.4",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64"
+dependencies = [
+ "windows-targets 0.52.4",
]
[[package]]
@@ -2454,6 +2515,15 @@ dependencies = [
"windows_x86_64_msvc 0.36.1",
]
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
[[package]]
name = "windows-sys"
version = "0.48.0"
@@ -2493,6 +2563,21 @@ dependencies = [
"windows_x86_64_msvc 0.48.5",
]
+[[package]]
+name = "windows-targets"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
+]
+
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
@@ -2505,6 +2590,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.36.1"
@@ -2523,6 +2614,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+
[[package]]
name = "windows_i686_gnu"
version = "0.36.1"
@@ -2541,6 +2638,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+
[[package]]
name = "windows_i686_msvc"
version = "0.36.1"
@@ -2559,6 +2662,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.36.1"
@@ -2577,6 +2686,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
@@ -2589,6 +2704,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.36.1"
@@ -2607,6 +2728,12 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+
[[package]]
name = "winit"
version = "0.27.5"
@@ -2622,7 +2749,7 @@ dependencies = [
"libc",
"log",
"mio",
- "ndk",
+ "ndk 0.7.0",
"ndk-glue",
"objc",
"once_cell",
@@ -2643,9 +2770,18 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.5.25"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
dependencies = [
"memchr",
]
@@ -2672,18 +2808,15 @@ dependencies = [
[[package]]
name = "xcursor"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
-dependencies = [
- "nom",
-]
+checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
[[package]]
name = "xml-rs"
-version = "0.8.19"
+version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a"
+checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
[[package]]
name = "zune-inflate"
diff --git a/game/resources/shaders/sprite.vert b/game/resources/shaders/sprite.vert
index ff558d4f621b04eeb88d8e2d28cb70e66f40b6cc..eeeec8c08303aaec3828c1ce0a32f0f430918356 100644
--- a/game/resources/shaders/sprite.vert
+++ b/game/resources/shaders/sprite.vert
@@ -1,4 +1,3 @@
-
#version 460
//#extension GL_ARB_shader_draw_parameters : require
@@ -11,21 +10,46 @@ struct VertexOutput
struct SpriteUniform
{
- vec2 uv_top_left;
- vec2 uv_bottom_right;
+ vec2 uv_bottom_left;
+ vec2 uv_top_right;
uint width;
uint height;
int material_id;
- int padding1;
+ uint padding1;
};
+uint get_mirroring(uint flags)
+{
+ return (flags & 0xC0000000) >> 30;
+}
+
+uint get_billboarding(uint flags)
+{
+ return (flags & 0x30000000) >> 28;
+}
+
+uint get_use_section(uint flags)
+{
+ return (flags & 0x08000000) >> 27;
+}
+
+uint get_section_offset_mode(uint flags)
+{
+ return (flags & 0x04000000) >> 26;
+}
+
+int get_palette_id(uint flags)
+{
+ return int(flags & 0x03FFFFFF);
+}
+
struct SpriteStateUniform
{
mat4 model;
int sprite_id;
- int palette_id;
- ivec2 mirroring;
- ivec2 billboarding;
+ uint flags;
+ vec2 bottom_left;
+ vec2 top_right;
vec2 padding1;
};
@@ -34,32 +58,32 @@ struct DrawListUniform
uint index;
};
-layout(std140, set = 0, binding = 0) readonly buffer SpriteStates
+layout (std140, set = 0, binding = 0) readonly buffer SpriteStates
{
SpriteStateUniform states[];
} sprite_states;
-layout(std140, set = 0, binding = 2) readonly buffer Sprites
+layout (std140, set = 0, binding = 2) readonly buffer Sprites
{
SpriteUniform sprites[];
} sprites;
-layout(std140, set = 0, binding = 4) readonly buffer DrawList
+layout (std140, set = 0, binding = 4) readonly buffer DrawList
{
DrawListUniform entity_ids[];
} draw_list;
-layout(push_constant) uniform constants
+layout (push_constant) uniform constants
{
mat4 view;
mat4 proj;
} PushConstants;
-layout(location = 0) out vec4 fragColor;
-layout(location = 1) out vec3 fragNormal;
-layout(location = 2) out vec2 fragBaseCoords;
-layout(location = 3) out VertexOutput vertexOutput;
+layout (location = 0) out vec4 fragColor;
+layout (location = 1) out vec3 fragNormal;
+layout (location = 2) out vec2 fragBaseCoords;
+layout (location = 3) out VertexOutput vertexOutput;
const uint verts_per_sprite = 6;
@@ -75,44 +99,82 @@ void main()
SpriteStateUniform state = sprite_states.states[current_entity];
SpriteUniform sprite = sprites.sprites[state.sprite_id];
+ int palette_id = get_palette_id(state.flags);
+
+ uint mirroring_flags = get_mirroring(state.flags);
+ uint mirroring_y = (mirroring_flags & 0x1);
+ uint mirroring_x = (mirroring_flags & 0x2) >> 1;
+ ivec2 mirroring = ivec2(mirroring_x, mirroring_y);
+
+ uint billboarding_flags = get_billboarding(state.flags);
+ uint billboarding_y = (billboarding_flags & 0x1);
+ uint billboarding_x = (billboarding_flags & 0x2) >> 1;
+ ivec2 billboarding = ivec2(billboarding_x, billboarding_y);
+
+ uint use_section = get_use_section(state.flags);
+ uint section_offset_mode = get_section_offset_mode(state.flags);
+
+ vec2 offset = vec2(0.0);
+ vec2 bounds = vec2(sprite.width, sprite.height);
+
+ vec2 uv_dimensions = sprite.uv_top_right - sprite.uv_bottom_left;
+ vec2 section_bottom_left_uvs = sprite.uv_bottom_left;
+ vec2 section_top_right_uvs = sprite.uv_top_right;
+
+ if (use_section != 0)
+ {
+ vec2 section_dimensions = state.top_right - state.bottom_left;
+
+ if (section_offset_mode != 0)
+ {
+ offset = vec2(sprite.width * state.bottom_left.x, sprite.height * state.bottom_left.y);
+ }
+
+ bounds = vec2(offset.x + sprite.width * section_dimensions.x, offset.y + sprite.height * section_dimensions.y);
+
+ // TODO: Why does this work this way?
+ section_bottom_left_uvs = sprite.uv_bottom_left + (uv_dimensions * vec2(state.bottom_left.x, 1.0 - state.top_right.y));
+ section_top_right_uvs = sprite.uv_bottom_left + (uv_dimensions * vec2(state.top_right.x, 1.0 - state.bottom_left.y));
+ }
+
vec3 positions[verts_per_sprite] = vec3[]
(
- vec3(0, 0, 0),
- vec3(0, sprite.height, 0),
- vec3(sprite.width, 0, 0),
- vec3(0, sprite.height, 0),
- vec3(sprite.width, sprite.height, 0),
- vec3(sprite.width, 0, 0)
+ vec3(offset.x, offset.y, 0),
+ vec3(offset.x, bounds.y, 0),
+ vec3(bounds.x, offset.y, 0),
+ vec3(offset.x, bounds.y, 0),
+ vec3(bounds.x, bounds.y, 0),
+ vec3(bounds.x, offset.y, 0)
);
- vec2 uv_top_left = sprite.uv_top_left;
- vec2 uv_bottom_right = sprite.uv_bottom_right;
+ vec2 uv_bottom_left = section_bottom_left_uvs;
+ vec2 uv_top_right = section_top_right_uvs;
- if(state.mirroring.x > 0)
+ if (mirroring.x > 0)
{
- uv_top_left.x = sprite.uv_bottom_right.x;
- uv_bottom_right.x = sprite.uv_top_left.x;
+ uv_bottom_left.x = section_top_right_uvs.x;
+ uv_top_right.x = section_bottom_left_uvs.x;
}
- if(state.mirroring.y > 0)
+ if (mirroring.y > 0)
{
- uv_top_left.y = sprite.uv_bottom_right.y;
- uv_bottom_right.y = sprite.uv_top_left.y;
+ uv_bottom_left.y = section_top_right_uvs.y;
+ uv_top_right.y = section_bottom_left_uvs.y;
}
vec2 uvs[verts_per_sprite] = vec2[]
(
- vec2(uv_top_left.x, uv_bottom_right.y),
- vec2(uv_top_left.x, uv_top_left.y),
- vec2(uv_bottom_right.x, uv_bottom_right.y),
- vec2(uv_top_left.x, uv_top_left.y),
- vec2(uv_bottom_right.x, uv_top_left.y),
- vec2(uv_bottom_right.x, uv_bottom_right.y)
+ vec2(uv_bottom_left.x, uv_top_right.y),
+ vec2(uv_bottom_left.x, uv_bottom_left.y),
+ vec2(uv_top_right.x, uv_top_right.y),
+ vec2(uv_bottom_left.x, uv_bottom_left.y),
+ vec2(uv_top_right.x, uv_bottom_left.y),
+ vec2(uv_top_right.x, uv_top_right.y)
);
mat4 view_model = PushConstants.view * state.model;
- if(state.billboarding.x != 0 || state.billboarding.y != 0)
+ if (billboarding.x != 0 || billboarding.y != 0)
{
mat4 s = mat4(1);
s[0][0] = length(state.model[0]);
@@ -127,12 +189,12 @@ void main()
view_model = PushConstants.view * m * s * t;
- if (state.billboarding.x != 0)
+ if (billboarding.x != 0)
{
view_model[0] = s[0];
}
- if (state.billboarding.y != 0)
+ if (billboarding.y != 0)
{
view_model[1] = s[1];
}
@@ -148,6 +210,5 @@ void main()
gl_Position = PushConstants.proj * view_model * vec4(positions[table_index], 1.0);
fragNormal = vec3(0);
fragColor = vec4(1);
- vertexOutput = VertexOutput(sprite.material_id, state.palette_id, current_entity);
- //vertexOutput = VertexOutput(0, 0);
+ vertexOutput = VertexOutput(sprite.material_id, palette_id, current_entity);
}
\ No newline at end of file
diff --git a/game/src/game/seaquest/seaquest_state.rs b/game/src/game/seaquest/seaquest_state.rs
index 1b883482257ee0a6c5953f795eb9dfbcaaea772a..4c308fa54937d8d58315e9e634f3d5689ed903a2 100644
--- a/game/src/game/seaquest/seaquest_state.rs
+++ b/game/src/game/seaquest/seaquest_state.rs
@@ -48,6 +48,8 @@ use crate::sprites::sprite_types::{
SpriteInstance,
SpriteInstanceBuilder,
SpriteInstanceId,
+ SpriteSubSection,
+ UvCoords,
};
use crate::vulkan::vulkan_app_resources::VulkanAppResources;
use crate::{audio, ErrorResult};
@@ -478,6 +480,20 @@ impl PlayerState
}
}
+ // TEST sprite sections
+ let air_percent = self.air / game_defines.player_defines.max_oxygen;
+ let sub_section = SpriteSubSection {
+ offset: true,
+ uv_coords: UvCoords {
+ bottom_left: [0.5 - air_percent * 0.5, 0.0],
+ top_right: [0.5 + air_percent * 0.5, 1.0],
+ },
+ };
+ //sprite_state_manager
+ // .get_animation_sprite_instance_mut(self.animation_instance_id)
+ // .sub_section_mut(Some(sub_section));
+ // END TEST
+
if self.lives < 0
{
self.on_game_over(game_defines, player_initialization);
@@ -880,8 +896,9 @@ impl GameSystem
PlaybackState::Playing,
);
- game_state.players[0].switch_theme(sprite_manager, sprite_state_manager, asset_theme);
- game_state.players[1].switch_theme(sprite_manager, sprite_state_manager, asset_theme);
+ game_state.players.iter().for_each(|player| {
+ player.switch_theme(sprite_manager, sprite_state_manager, asset_theme);
+ });
game_state.player_bullets.iter().for_each(|bullets| {
bullets.iter().for_each(|bullet| {
diff --git a/game/src/sprites/sprite_manager.rs b/game/src/sprites/sprite_manager.rs
index 5ee38d3bb43f39a4ff20909f50cb1f085d707fc6..23891f818604cb0ad1985e7a22ce4bb87a7d9d3b 100644
--- a/game/src/sprites/sprite_manager.rs
+++ b/game/src/sprites/sprite_manager.rs
@@ -866,24 +866,24 @@ impl SpriteManager
.get(&(theme.to_string(), s.material_name.clone()))
.unwrap();
- let (texture_coords, width, height) = {
+ let (uv_coords, width, height) = {
let material = parse.lookup_material(theme, &s.material_name).unwrap();
let texture = texture_manager
.get_texture_asset(theme, &material.texture_name)
.unwrap();
let (width, height) = (texture.texture.width as f32, texture.texture.height as f32);
- let coords = &s.color_map_coords;
+
+ let bottom_left = [s.color_map_coords[0], s.color_map_coords[1]];
+ let top_right = [s.color_map_coords[2], s.color_map_coords[3]];
+
+ let coord_dimensions = [top_right[0] - bottom_left[0], top_right[1] - bottom_left[1]];
+ let uvs = UvCoords { bottom_left, top_right };
(
- [
- [coords[0], coords[1]],
- [coords[0], coords[3]],
- [coords[2], coords[1]],
- [coords[2], coords[3]],
- ],
- ((coords[2] - coords[0]) * width).round(),
- ((coords[3] - coords[1]) * height).round(),
+ uvs,
+ (coord_dimensions[0] * width).round(),
+ (coord_dimensions[1] * height).round(),
)
};
@@ -892,7 +892,7 @@ impl SpriteManager
width,
height,
material_id,
- texture_coords,
+ uv_coords,
}
})
.collect::<Vec<_>>();
@@ -1066,8 +1066,8 @@ impl SpriteManager
material_id: s.material_id.0,
width: s.width as u32,
height: s.height as u32,
- uv_top_left: s.texture_coords[0],
- uv_bottom_right: s.texture_coords[3],
+ uv_bottom_left: s.uv_coords.bottom_left,
+ uv_top_right: s.uv_coords.top_right,
padding: [0],
})
.collect::<Vec<_>>()
diff --git a/game/src/sprites/sprite_shader.rs b/game/src/sprites/sprite_shader.rs
index 7b49a88433925f0fb0d899df2811f1495f7b1379..de38a7f0fd39a612cc3e41dee1ecc189cf88b0d4 100644
--- a/game/src/sprites/sprite_shader.rs
+++ b/game/src/sprites/sprite_shader.rs
@@ -10,7 +10,7 @@ use crate::assets::textures::texture_resources::TextureResources;
use crate::common::common_flags::{BillboardMode, MirrorMode};
use crate::common::errors::*;
use crate::sprites::sprite_manager::SpriteManager;
-use crate::sprites::sprite_types::{MaterialId, PaletteId, SpriteInstance};
+use crate::sprites::sprite_types::{MaterialId, PaletteId, SpriteInstance, UvCoords};
use crate::vulkan::vulkan_app_resources::VulkanAppResources;
use crate::vulkan::vulkan_buffers::*;
use crate::vulkan::vulkan_devices::*;
@@ -44,12 +44,13 @@ pub struct SpriteMaterials
pub materials: [SpriteMaterialUniform; MAX_MATERIALS],
}
+// TODO: Move uvs out of the sprite uniform and into the sprite state.
#[derive(Copy, Clone, Debug)]
#[repr(C, packed)]
pub struct SpriteUniform
{
- pub uv_top_left: [f32; 2],
- pub uv_bottom_right: [f32; 2],
+ pub uv_bottom_left: [f32; 2],
+ pub uv_top_right: [f32; 2],
pub width: u32,
pub height: u32,
pub material_id: u32,
@@ -70,11 +71,9 @@ pub struct SpriteStateUniform
{
pub model: Matrix4<f32>,
pub sprite_index: i32,
- pub palette_id: i32,
- pub mirror_x: i32, // These are only i32s because there is extra space from alignment padding
- pub mirror_y: i32,
- pub billboard_x: i32,
- pub billboard_y: i32,
+ pub flags: u32,
+ pub bottom_left: [f32; 2],
+ pub top_right: [f32; 2],
pub padding: [i64; 1],
}
@@ -930,19 +929,60 @@ impl SpriteGpuResources
let gpu_mem = unsafe { std::slice::from_raw_parts_mut(pointer, sprite_instances.len()) };
sprite_instances.iter().enumerate().for_each(|(i, sprite_instance)| {
- gpu_mem[i as usize] = SpriteStateUniform {
+ let mut flags: u32 = 0;
+
+ flags |= match &sprite_instance.sub_section
+ {
+ Some(s) =>
+ {
+ if s.offset
+ {
+ 0x08000000 | 0x04000000
+ }
+ else
+ {
+ 0x08000000
+ }
+ }
+ None => 0,
+ };
+
+ flags |= match sprite_instance.billboard_mode
+ {
+ BillboardMode::XAxis => 0x20000000,
+ BillboardMode::YAxis => 0x10000000,
+ BillboardMode::XYAxis => 0x30000000,
+ BillboardMode::None => 0,
+ };
+
+ flags |= match sprite_instance.mirror_mode
+ {
+ MirrorMode::XAxis => 0x80000000,
+ MirrorMode::YAxis => 0x40000000,
+ MirrorMode::XYAxis => 0xC0000000,
+ MirrorMode::None => 0,
+ };
+
+ let palette_id = sprite_instance.palette_id.unwrap_or(PaletteId(0x003FFFFF)).0;
+
+ flags |= palette_id;
+
+ let default_uvs = UvCoords {
+ bottom_left: [0.0, 0.0],
+ top_right: [0.0, 0.0],
+ };
+
+ let uvs = sprite_instance
+ .sub_section
+ .as_ref()
+ .map(|s| s.uv_coords)
+ .unwrap_or(default_uvs);
+
+ gpu_mem[i] = SpriteStateUniform {
sprite_index: sprite_instance.sprite_id.into(),
- palette_id: sprite_instance.palette_id.unwrap_or(PaletteId(u32::MAX)).into(),
- billboard_x: (sprite_instance.billboard_mode == BillboardMode::XAxis
- || sprite_instance.billboard_mode == BillboardMode::XYAxis)
- as i32,
- billboard_y: (sprite_instance.billboard_mode == BillboardMode::YAxis
- || sprite_instance.billboard_mode == BillboardMode::XYAxis)
- as i32,
- mirror_x: (sprite_instance.mirror_mode == MirrorMode::XAxis
- || sprite_instance.mirror_mode == MirrorMode::XYAxis) as i32,
- mirror_y: (sprite_instance.mirror_mode == MirrorMode::YAxis
- || sprite_instance.mirror_mode == MirrorMode::XYAxis) as i32,
+ flags,
+ bottom_left: uvs.bottom_left,
+ top_right: uvs.top_right,
model: sprite_instance.transform,
padding: [0],
};
diff --git a/game/src/sprites/sprite_types.rs b/game/src/sprites/sprite_types.rs
index 97e072cecf4a117c06bef74f9be6cee29987513b..194a3d747fff0372f7f0e243e9401f491822a58d 100644
--- a/game/src/sprites/sprite_types.rs
+++ b/game/src/sprites/sprite_types.rs
@@ -120,10 +120,17 @@ pub enum PlaybackState
Stopped,
}
+#[derive(Default, Clone, Copy, PartialEq, Debug, Serialize, Deserialize)]
+pub struct UvCoords
+{
+ pub bottom_left: [f32; 2],
+ pub top_right: [f32; 2],
+}
+
pub struct Sprite
{
pub name: String,
- pub texture_coords: [[f32; 2]; 4], // Should really be per texture in the material
+ pub uv_coords: UvCoords, // Will need to be one per material if there are multiple materials
pub material_id: MaterialId,
pub width: f32,
pub height: f32,
@@ -154,11 +161,19 @@ pub struct SpriteAnimation
pub offset: [f32; 2],
}
+#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct SpriteSubSection
+{
+ pub uv_coords: UvCoords,
+ pub offset: bool,
+}
+
#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
pub struct SpriteInstance
{
pub sprite_id: SpriteId,
pub transform: Matrix4<f32>,
+ pub sub_section: Option<SpriteSubSection>,
pub palette_id: Option<PaletteId>,
pub mirror_mode: MirrorMode,
pub billboard_mode: BillboardMode,
@@ -171,6 +186,7 @@ impl Default for SpriteInstance
Self {
sprite_id: SpriteId(0),
transform: Matrix4::identity(),
+ sub_section: None,
palette_id: None,
mirror_mode: MirrorMode::None,
billboard_mode: BillboardMode::None,
@@ -208,12 +224,20 @@ impl SpriteInstance
self
}
+
+ pub fn sub_section_mut(&mut self, sub_section: Option<SpriteSubSection>) -> &mut Self
+ {
+ self.sub_section = sub_section;
+
+ self
+ }
}
pub struct SpriteInstanceBuilder
{
sprite_id: SpriteId,
transform: Matrix4<f32>,
+ sub_section: Option<SpriteSubSection>,
palette_id: Option<PaletteId>,
mirror_mode: MirrorMode,
billboard_mode: BillboardMode,
@@ -226,6 +250,7 @@ impl SpriteInstanceBuilder
Self {
sprite_id,
transform: Matrix4::identity(),
+ sub_section: None,
palette_id: None,
mirror_mode: MirrorMode::None,
billboard_mode: BillboardMode::None,
@@ -256,11 +281,18 @@ impl SpriteInstanceBuilder
self
}
+ pub fn sub_section(mut self, sub_section: SpriteSubSection) -> Self
+ {
+ self.sub_section = Some(sub_section);
+ self
+ }
+
pub fn build(self) -> SpriteInstance
{
SpriteInstance {
sprite_id: self.sprite_id,
transform: self.transform,
+ sub_section: self.sub_section,
palette_id: self.palette_id,
mirror_mode: self.mirror_mode,
billboard_mode: self.billboard_mode,