From e598309eefcdb0cf8e972aa24ed53b964c519495 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 09:59:50 +0000
Subject: [PATCH] chore(deps): bump show-image from 0.13.1 to 0.14.0
Bumps [show-image](https://github.com/robohouse-delft/show-image-rs) from 0.13.1 to 0.14.0.
- [Changelog](https://github.com/robohouse-delft/show-image-rs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/robohouse-delft/show-image-rs/compare/v0.13.1...v0.14.0)
---
updated-dependencies:
- dependency-name: show-image
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
---
Cargo.lock | 638 +++++++++--------------------
tools/sprite_sheet_tool/Cargo.toml | 2 +-
2 files changed, 201 insertions(+), 439 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 2e89da2..0102484 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -147,6 +147,24 @@ dependencies = [
"pkg-config",
]
+[[package]]
+name = "android-activity"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
+dependencies = [
+ "android-properties",
+ "bitflags 1.3.2",
+ "cc",
+ "jni-sys",
+ "libc",
+ "log",
+ "ndk 0.7.0",
+ "ndk-context",
+ "ndk-sys 0.4.1+23.1.7779620",
+ "num_enum 0.6.1",
+]
+
[[package]]
name = "android-activity"
version = "0.5.2"
@@ -266,7 +284,7 @@ checksum = "1faa3c733d9a3dd6fbaf85da5d162a2e03b2e0033a90dceb0e2a90fdd1e5380a"
dependencies = [
"clipboard-win",
"core-graphics 0.23.1",
- "image",
+ "image 0.24.9",
"log",
"objc",
"objc-foundation",
@@ -283,12 +301,6 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
[[package]]
name = "arrayvec"
version = "0.7.4"
@@ -515,7 +527,7 @@ dependencies = [
"egui",
"egui-dropdown",
"fuzzy-matcher",
- "image",
+ "image 0.24.9",
"once_cell",
"pretty-type-name",
"smallvec",
@@ -1069,7 +1081,7 @@ dependencies = [
"encase",
"futures-lite",
"hexasphere",
- "image",
+ "image 0.24.9",
"js-sys",
"ktx2",
"naga 0.19.2",
@@ -1425,7 +1437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
dependencies = [
"arrayref",
- "arrayvec 0.7.4",
+ "arrayvec",
"cc",
"cfg-if",
"constant_time_eq",
@@ -1717,61 +1729,6 @@ dependencies = [
"error-code",
]
-[[package]]
-name = "cmake"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics 0.22.3",
- "foreign-types 0.3.2",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics 0.23.1",
- "foreign-types 0.5.0",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "core-foundation",
- "core-graphics-types",
- "libc",
- "objc",
-]
-
[[package]]
name = "codespan-reporting"
version = "0.11.1"
@@ -1803,6 +1760,12 @@ dependencies = [
"com_macros",
]
+[[package]]
+name = "com-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+
[[package]]
name = "com_macros"
version = "0.6.0"
@@ -1903,12 +1866,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-[[package]]
-name = "copyless"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536"
-
[[package]]
name = "core-foundation"
version = "0.9.4"
@@ -1962,18 +1919,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "core-text"
-version = "20.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
-dependencies = [
- "core-foundation",
- "core-graphics 0.23.1",
- "foreign-types 0.5.0",
- "libc",
-]
-
[[package]]
name = "coreaudio-rs"
version = "0.11.3"
@@ -2071,29 +2016,6 @@ version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
-[[package]]
-name = "crossfont"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb5a3822b594afc99b503cc1859b94686d3c3efdd60507a28587dab80ee1071"
-dependencies = [
- "cocoa 0.25.0",
- "core-foundation",
- "core-foundation-sys",
- "core-graphics 0.23.1",
- "core-text",
- "dwrote",
- "foreign-types 0.5.0",
- "freetype-rs",
- "libc",
- "log",
- "objc",
- "once_cell",
- "pkg-config",
- "servo-fontconfig",
- "winapi",
-]
-
[[package]]
name = "crunchy"
version = "0.2.2"
@@ -2111,12 +2033,6 @@ dependencies = [
"typenum",
]
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
[[package]]
name = "cursor-icon"
version = "1.1.0"
@@ -2125,12 +2041,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
[[package]]
name = "d3d12"
-version = "0.5.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
+checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
dependencies = [
- "bitflags 1.3.2",
- "libloading 0.7.4",
+ "bitflags 2.4.2",
+ "libloading 0.8.1",
"winapi",
]
@@ -2145,38 +2061,14 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core 0.13.4",
- "darling_macro 0.13.4",
-]
-
[[package]]
name = "darling"
version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
dependencies = [
- "darling_core 0.20.8",
- "darling_macro 0.20.8",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
+ "darling_core",
+ "darling_macro",
]
[[package]]
@@ -2193,24 +2085,13 @@ dependencies = [
"syn 2.0.52",
]
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core 0.13.4",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "darling_macro"
version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
dependencies = [
- "darling_core 0.20.8",
+ "darling_core",
"quote",
"syn 2.0.52",
]
@@ -2308,20 +2189,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
-[[package]]
-name = "dwrote"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
-dependencies = [
- "lazy_static",
- "libc",
- "serde",
- "serde_derive",
- "winapi",
- "wio",
-]
-
[[package]]
name = "ecolor"
version = "0.27.2"
@@ -2537,16 +2404,6 @@ dependencies = [
"pin-project-lite",
]
-[[package]]
-name = "expat-sys"
-version = "2.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa"
-dependencies = [
- "cmake",
- "pkg-config",
-]
-
[[package]]
name = "exr"
version = "1.72.0"
@@ -2681,28 +2538,6 @@ dependencies = [
"percent-encoding",
]
-[[package]]
-name = "freetype-rs"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb"
-dependencies = [
- "bitflags 1.3.2",
- "freetype-sys",
- "libc",
-]
-
-[[package]]
-name = "freetype-sys"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
-dependencies = [
- "cmake",
- "libc",
- "pkg-config",
-]
-
[[package]]
name = "from_bytes_or_zeroed"
version = "0.1.0"
@@ -2979,9 +2814,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "glow"
-version = "0.11.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
+checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
dependencies = [
"js-sys",
"slotmap",
@@ -3077,16 +2912,6 @@ dependencies = [
"spinning_top",
]
-[[package]]
-name = "gpu-alloc"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
-dependencies = [
- "bitflags 1.3.2",
- "gpu-alloc-types 0.2.0",
-]
-
[[package]]
name = "gpu-alloc"
version = "0.6.0"
@@ -3094,25 +2919,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
dependencies = [
"bitflags 2.4.2",
- "gpu-alloc-types 0.3.0",
+ "gpu-alloc-types",
]
[[package]]
name = "gpu-alloc-types"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
]
[[package]]
-name = "gpu-alloc-types"
-version = "0.3.0"
+name = "gpu-allocator"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
+checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
dependencies = [
- "bitflags 2.4.2",
+ "backtrace",
+ "log",
+ "thiserror",
+ "winapi",
+ "windows 0.44.0",
]
[[package]]
@@ -3191,6 +3020,21 @@ dependencies = [
"serde",
]
+[[package]]
+name = "hassle-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
+dependencies = [
+ "bitflags 1.3.2",
+ "com-rs",
+ "libc",
+ "libloading 0.7.4",
+ "thiserror",
+ "widestring",
+ "winapi",
+]
+
[[package]]
name = "hassle-rs"
version = "0.11.0"
@@ -3311,6 +3155,17 @@ dependencies = [
"tiff",
]
+[[package]]
+name = "image"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "num-traits",
+]
+
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -3378,12 +3233,6 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "inplace_it"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e567468c50f3d4bc7397702e09b380139f9b9288b4e909b070571007f8b5bf78"
-
[[package]]
name = "instant"
version = "0.1.12"
@@ -3716,7 +3565,7 @@ version = "0.12.0"
source = "git+https://github.com/cBournhonesque/lightyear#a6abcbe1eba1d6235727aaf39e4bc609da4d6a37"
dependencies = [
"anyhow",
- "darling 0.20.8",
+ "darling",
"proc-macro2",
"quote",
"serde",
@@ -3818,16 +3667,17 @@ dependencies = [
[[package]]
name = "metal"
-version = "0.24.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
+checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
"block",
"core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types 0.5.0",
"log",
"objc",
+ "paste",
]
[[package]]
@@ -3906,12 +3756,12 @@ dependencies = [
[[package]]
name = "naga"
-version = "0.9.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f50357e1167a3ab92d6b3c7f4bf5f7fd13fde3f4b28bf0d5ea07b5100fdb6c0"
+checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
dependencies = [
"bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
"codespan-reporting",
"hexf-parse",
"indexmap 1.9.3",
@@ -4029,35 +3879,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-[[package]]
-name = "ndk-glue"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f"
-dependencies = [
- "libc",
- "log",
- "ndk 0.7.0",
- "ndk-context",
- "ndk-macro",
- "ndk-sys 0.4.1+23.1.7779620",
- "once_cell",
- "parking_lot 0.12.1",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
-dependencies = [
- "darling 0.13.4",
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "ndk-sys"
version = "0.4.1+23.1.7779620"
@@ -4285,6 +4106,15 @@ dependencies = [
"num_enum_derive 0.5.11",
]
+[[package]]
+name = "num_enum"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+dependencies = [
+ "num_enum_derive 0.6.1",
+]
+
[[package]]
name = "num_enum"
version = "0.7.2"
@@ -4306,6 +4136,18 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "num_enum_derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.52",
+]
+
[[package]]
name = "num_enum_derive"
version = "0.7.2"
@@ -4588,7 +4430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94683d8d7e785fe84b02d0a0dbe0fcf359c031c338dd6d144de958573c570c25"
dependencies = [
"approx",
- "arrayvec 0.7.4",
+ "arrayvec",
"bitflags 1.3.2",
"downcast-rs",
"either",
@@ -4611,7 +4453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "542444b3ef557470c352ca13ba34a3d5e558b34265339320b8fb560bc82c427e"
dependencies = [
"approx",
- "arrayvec 0.7.4",
+ "arrayvec",
"bitflags 1.3.2",
"downcast-rs",
"either",
@@ -4940,15 +4782,6 @@ dependencies = [
"bitflags 2.4.2",
]
-[[package]]
-name = "raw-window-handle"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
-dependencies = [
- "cty",
-]
-
[[package]]
name = "raw-window-handle"
version = "0.5.2"
@@ -5076,12 +4909,6 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-[[package]]
-name = "renderdoc-sys"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
-
[[package]]
name = "renderdoc-sys"
version = "1.0.0"
@@ -5261,15 +5088,6 @@ version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
-[[package]]
-name = "safe_arch"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05"
-dependencies = [
- "bytemuck",
-]
-
[[package]]
name = "safe_arch"
version = "0.7.1"
@@ -5321,14 +5139,15 @@ dependencies = [
[[package]]
name = "sctk-adwaita"
-version = "0.4.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339"
+checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09"
dependencies = [
- "crossfont",
+ "ab_glyph",
"log",
+ "memmap2 0.5.10",
"smithay-client-toolkit 0.16.1",
- "tiny-skia 0.7.0",
+ "tiny-skia 0.8.4",
]
[[package]]
@@ -5416,27 +5235,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "servo-fontconfig"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c"
-dependencies = [
- "libc",
- "servo-fontconfig-sys",
-]
-
-[[package]]
-name = "servo-fontconfig-sys"
-version = "5.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
-dependencies = [
- "expat-sys",
- "freetype-sys",
- "pkg-config",
-]
-
[[package]]
name = "sharded-slab"
version = "0.1.7"
@@ -5454,18 +5252,18 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "show-image"
-version = "0.13.1"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8a66a2f47667d404f77403a68263263b52af6c1136bccdad448bb1c38ac215"
+checksum = "e2d6d4263fd19c1fbd0f4bbc0e0128de55dce8beb8f7d9052e09ee7f104c9eeb"
dependencies = [
"futures",
"glam 0.21.3",
- "image",
- "indexmap 1.9.3",
+ "image 0.25.1",
+ "indexmap 2.2.5",
"rustc_version",
"show-image-macros",
- "wgpu 0.13.1",
- "winit 0.27.5",
+ "wgpu 0.17.2",
+ "winit 0.28.7",
]
[[package]]
@@ -5662,7 +5460,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"clap",
- "image",
+ "image 0.24.9",
"indexmap 2.2.5",
"ron",
"serde",
@@ -5782,7 +5580,7 @@ version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c2287b6d7f721ada4cddf61ade5e760b2c6207df041cac9bfaa192897362fd3"
dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
"grid",
"num-traits",
"slotmap",
@@ -5898,17 +5696,16 @@ dependencies = [
[[package]]
name = "tiny-skia"
-version = "0.7.0"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82"
+checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
dependencies = [
"arrayref",
- "arrayvec 0.5.2",
+ "arrayvec",
"bytemuck",
"cfg-if",
"png",
- "safe_arch 0.5.2",
- "tiny-skia-path 0.7.0",
+ "tiny-skia-path 0.8.4",
]
[[package]]
@@ -5918,7 +5715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
dependencies = [
"arrayref",
- "arrayvec 0.7.4",
+ "arrayvec",
"bytemuck",
"cfg-if",
"log",
@@ -5927,12 +5724,13 @@ dependencies = [
[[package]]
name = "tiny-skia-path"
-version = "0.7.0"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c"
+checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
dependencies = [
"arrayref",
"bytemuck",
+ "strict-num",
]
[[package]]
@@ -6567,23 +6365,26 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]]
name = "wgpu"
-version = "0.13.1"
+version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "277e967bf8b7820a76852645a6bce8bbd31c32fda2042e82d8e3ea75fda8892d"
+checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41"
dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
+ "cfg-if",
"js-sys",
"log",
- "naga 0.9.0",
+ "naga 0.13.0",
"parking_lot 0.12.1",
- "raw-window-handle 0.4.3",
+ "profiling",
+ "raw-window-handle 0.5.2",
"smallvec",
+ "static_assertions",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "wgpu-core 0.13.2",
- "wgpu-hal 0.13.2",
- "wgpu-types 0.13.2",
+ "wgpu-core 0.17.1",
+ "wgpu-hal 0.17.2",
+ "wgpu-types 0.17.0",
]
[[package]]
@@ -6592,7 +6393,7 @@ version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01"
dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
"cfg-if",
"cfg_aliases",
"js-sys",
@@ -6613,27 +6414,25 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "0.13.2"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b92788dec9d0c1bed849a1b83f01b2ee12819bf04a79c90f68e4173f7b5ba2"
+checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
"bit-vec",
- "bitflags 1.3.2",
- "cfg_aliases",
+ "bitflags 2.4.2",
"codespan-reporting",
- "copyless",
- "fxhash",
"log",
- "naga 0.9.0",
+ "naga 0.13.0",
"parking_lot 0.12.1",
"profiling",
- "raw-window-handle 0.4.3",
+ "raw-window-handle 0.5.2",
+ "rustc-hash",
"smallvec",
"thiserror",
"web-sys",
- "wgpu-hal 0.13.2",
- "wgpu-types 0.13.2",
+ "wgpu-hal 0.17.2",
+ "wgpu-types 0.17.0",
]
[[package]]
@@ -6642,7 +6441,7 @@ version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c8bb6a5c62ad78bd683609d525cde6efb6e7cf39e008ea0b8e42518ce18ea81"
dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
"bit-vec",
"bitflags 2.4.2",
"cfg_aliases",
@@ -6664,40 +6463,42 @@ dependencies = [
[[package]]
name = "wgpu-hal"
-version = "0.13.2"
+version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cbdfc3d0637dba3d5536b93adef3d26023a0b96f0e1ee5ee9560a401d9f646"
+checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
dependencies = [
"android_system_properties",
- "arrayvec 0.7.4",
+ "arrayvec",
"ash",
"bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
"block",
"core-graphics-types",
- "d3d12 0.5.0",
- "foreign-types 0.3.2",
- "fxhash",
- "glow 0.11.2",
- "gpu-alloc 0.5.4",
+ "d3d12 0.7.0",
+ "glow 0.12.3",
+ "gpu-alloc",
+ "gpu-allocator 0.22.0",
"gpu-descriptor",
- "inplace_it",
+ "hassle-rs 0.10.0",
"js-sys",
"khronos-egl 4.1.0",
- "libloading 0.7.4",
+ "libc",
+ "libloading 0.8.1",
"log",
- "metal 0.24.0",
- "naga 0.9.0",
+ "metal 0.26.0",
+ "naga 0.13.0",
"objc",
"parking_lot 0.12.1",
"profiling",
"range-alloc",
- "raw-window-handle 0.4.3",
- "renderdoc-sys 0.7.1",
+ "raw-window-handle 0.5.2",
+ "renderdoc-sys",
+ "rustc-hash",
+ "smallvec",
"thiserror",
"wasm-bindgen",
"web-sys",
- "wgpu-types 0.13.2",
+ "wgpu-types 0.17.0",
"winapi",
]
@@ -6708,7 +6509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb7b9a56d44851cc0f51bf2f8b5ed8af5cf6e4bdb178fd5786ea2b4771e2edf0"
dependencies = [
"android_system_properties",
- "arrayvec 0.7.4",
+ "arrayvec",
"ash",
"bit-set",
"bitflags 2.4.2",
@@ -6718,10 +6519,10 @@ dependencies = [
"d3d12 0.19.0",
"glow 0.13.1",
"glutin_wgl_sys",
- "gpu-alloc 0.6.0",
- "gpu-allocator",
+ "gpu-alloc",
+ "gpu-allocator 0.25.0",
"gpu-descriptor",
- "hassle-rs",
+ "hassle-rs 0.11.0",
"js-sys",
"khronos-egl 6.0.0",
"libc",
@@ -6735,7 +6536,7 @@ dependencies = [
"profiling",
"range-alloc",
"raw-window-handle 0.6.0",
- "renderdoc-sys 1.0.0",
+ "renderdoc-sys",
"rustc-hash",
"smallvec",
"thiserror",
@@ -6747,11 +6548,13 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "0.13.2"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f762cbc08e1a51389859cf9c199c7aef544789cf3510889aab12c607f701604"
+checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
+ "js-sys",
+ "web-sys",
]
[[package]]
@@ -6772,7 +6575,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c"
dependencies = [
"bytemuck",
- "safe_arch 0.7.1",
+ "safe_arch",
]
[[package]]
@@ -6812,6 +6615,15 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "windows"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
[[package]]
name = "windows"
version = "0.46.0"
@@ -6873,19 +6685,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
[[package]]
name = "windows-sys"
version = "0.45.0"
@@ -6976,12 +6775,6 @@ 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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
@@ -7000,12 +6793,6 @@ 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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
@@ -7024,12 +6811,6 @@ 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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
@@ -7048,12 +6829,6 @@ 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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
@@ -7090,12 +6865,6 @@ 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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
@@ -7116,12 +6885,13 @@ checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
[[package]]
name = "winit"
-version = "0.27.5"
+version = "0.28.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
+checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94"
dependencies = [
+ "android-activity 0.4.3",
"bitflags 1.3.2",
- "cocoa 0.24.1",
+ "cfg_aliases",
"core-foundation",
"core-graphics 0.22.3",
"dispatch",
@@ -7130,20 +6900,21 @@ dependencies = [
"log",
"mio",
"ndk 0.7.0",
- "ndk-glue",
- "objc",
+ "objc2 0.3.0-beta.3.patch-leaks.3",
"once_cell",
- "parking_lot 0.12.1",
+ "orbclient",
"percent-encoding",
- "raw-window-handle 0.4.3",
"raw-window-handle 0.5.2",
- "sctk-adwaita 0.4.3",
+ "redox_syscall 0.3.5",
+ "sctk-adwaita 0.5.4",
"smithay-client-toolkit 0.16.1",
"wasm-bindgen",
"wayland-client 0.29.5",
+ "wayland-commons",
"wayland-protocols 0.29.5",
+ "wayland-scanner 0.29.5",
"web-sys",
- "windows-sys 0.36.1",
+ "windows-sys 0.45.0",
"x11-dl",
]
@@ -7154,7 +6925,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "272be407f804517512fdf408f0fe6c067bf24659a913c61af97af176bfd5aa92"
dependencies = [
"ahash",
- "android-activity",
+ "android-activity 0.5.2",
"atomic-waker",
"bitflags 2.4.2",
"bytemuck",
@@ -7204,15 +6975,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "wio"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "wtransport"
version = "0.1.11"
diff --git a/tools/sprite_sheet_tool/Cargo.toml b/tools/sprite_sheet_tool/Cargo.toml
index ed7cbab..b1261ed 100644
--- a/tools/sprite_sheet_tool/Cargo.toml
+++ b/tools/sprite_sheet_tool/Cargo.toml
@@ -12,6 +12,6 @@ indexmap = "2.0.0"
ron = "0.8.0"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
-show-image = { version = "0.13.1", features = ["image"] }
+show-image = { version = "0.14.0", features = ["image"] }
text_io = "0.1.12"
anyhow = "1"