diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 00000000..bc0b7619
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,5 @@
+[target.x86_64-pc-windows-msvc]
+linker = "rust-lld"
+
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["-C", "linker=clang", "-C", "link-arg=-fuse-ld=mold"]
diff --git a/.github/workflows/build-steam.yml b/.github/workflows/build-steam.yml
index 59c1233f..5807627c 100644
--- a/.github/workflows/build-steam.yml
+++ b/.github/workflows/build-steam.yml
@@ -16,14 +16,14 @@ jobs:
- name: Install libraries
run: |
sudo apt update
- sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev -y
+ sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang lld -y
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
- run: cargo build --features steamworks --release
+ run: cargo build --features steamworks --release --jobs 1
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
@@ -44,11 +44,11 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
- run: cargo build --features steamworks --release
+ run: cargo build --features steamworks --release --jobs 1
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
@@ -69,11 +69,11 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
- run: cargo build --features steamworks --release
+ run: cargo build --features steamworks --release --jobs 1
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 302cbf4b..be063897 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,14 +15,14 @@ jobs:
- name: Install libraries
run: |
sudo apt update
- sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev -y
+ sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
- run: cargo build --release
+ run: cargo build --release --jobs 1
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
@@ -42,11 +42,11 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
- run: cargo build --release
+ run: cargo build --release --jobs 1
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
@@ -66,11 +66,11 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
- run: cargo build --release
+ run: cargo build --release --jobs 1
- name: Setup artifact
run: |
mkdir -p ${{ github.workspace }}/artifact
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 122ae13d..12a6c753 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -13,13 +13,13 @@ jobs:
- name: Install libraries
run: |
sudo apt update
- sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev
+ sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- - run: cargo check --all-features
+ - run: cargo check --all-features --jobs 1
test:
name: Test Suite
@@ -30,13 +30,13 @@ jobs:
submodules: true
- run: |
sudo apt update
- sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libgtk-3-dev libasound2-dev -y
+ sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- - run: cargo test --lib
+ - run: cargo test --lib --jobs 1
fmt:
name: Rustfmt
@@ -48,10 +48,10 @@ jobs:
- name: Install libraries
run: |
sudo apt update
- sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev -y
+ sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
components: rustfmt
- name: Rust Cache
uses: Swatinem/rust-cache@v2
@@ -67,11 +67,11 @@ jobs:
- name: Install libraries
run: |
sudo apt update
- sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev -y
+ sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
- toolchain: nightly-2023-04-21
+ toolchain: nightly-2023-09-12
components: clippy
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- - run: cargo clippy -- # -D warnings
\ No newline at end of file
+ - run: cargo clippy --jobs 1 -- # -D warnings
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 1af4a611..ba1c26ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,6 @@ git-conventional-commits.yaml
# Steamworks common folder
steamworks/*
# Allow the redistributable, though
-!steamworks/redistributable_bin
\ No newline at end of file
+!steamworks/redistributable_bin
+#! renderdoc
+captures/
diff --git a/.gitmodules b/.gitmodules
index 696c8716..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "alox-48"]
- path = alox-48
- url = https://github.com/Speak2Erase/alox-48
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7279758f..f2468ad8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -19,13 +19,17 @@
"playtest",
"wasm",
"filesystem",
- "image cache"
+ "image cache",
+ "tilemap",
+ "config",
+ "audio"
],
"rust-analyzer.showUnlinkedFileNotification": false,
"rust-analyzer.cargo.extraEnv": {
"CARGO_PROFILE_RUST_ANALYZER_INHERITS": "dev"
},
- "rust-analyzer.cargo.extraArgs": [
+ "rust-analyzer.cargo.extraArgs": [],
+ "rust-analyzer.check.extraArgs": [
"--profile",
"rust-analyzer"
],
diff --git a/Cargo.lock b/Cargo.lock
index af349d38..5463b600 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
[[package]]
name = "accesskit"
-version = "0.9.0"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4803cf8c252f374ae6bfbb341e49e5a37f7601f2ce74a105927a663eba952c67"
+checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
dependencies = [
"enumn",
"serde",
@@ -30,77 +30,72 @@ dependencies = [
[[package]]
name = "accesskit_consumer"
-version = "0.13.0"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee8cf1202a4f94d31837f1902ab0a75c77b65bf59719e093703abe83efd74ec"
+checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00"
dependencies = [
"accesskit",
- "parking_lot",
]
[[package]]
name = "accesskit_macos"
-version = "0.5.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10be25f2b27bc33aa1647072e86b948b41596f1af1ae43a2b4b9be5d2011cbda"
+checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56"
dependencies = [
"accesskit",
"accesskit_consumer",
"objc2",
"once_cell",
- "parking_lot",
]
[[package]]
name = "accesskit_unix"
-version = "0.2.0"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630e7ee8f93c6246478bf0df6760db899b28d9ad54353a5f2d3157138ba817fc"
+checksum = "e084cb5168790c0c112626175412dc5ad127083441a8248ae49ddf6725519e83"
dependencies = [
"accesskit",
"accesskit_consumer",
"async-channel",
"atspi",
"futures-lite",
- "parking_lot",
"serde",
"zbus",
]
[[package]]
name = "accesskit_windows"
-version = "0.12.0"
+version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13c462fabdd950ef14308a9390b07fa2e2e3aabccba1f3ea36ea2231bb942ab"
+checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31"
dependencies = [
"accesskit",
"accesskit_consumer",
"arrayvec",
"once_cell",
- "parking_lot",
"paste",
- "windows 0.42.0",
+ "windows 0.48.0",
]
[[package]]
name = "accesskit_winit"
-version = "0.10.0"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17727888757ec027ec221db33070e226ee07df44425b583bc67684204d35eff9"
+checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0"
dependencies = [
"accesskit",
"accesskit_macos",
"accesskit_unix",
"accesskit_windows",
- "parking_lot",
"winit",
]
[[package]]
name = "addr2line"
-version = "0.19.0"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
dependencies = [
"gimli",
]
@@ -171,7 +166,7 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
"once_cell",
"version_check",
]
@@ -190,35 +185,41 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "1.0.1"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
dependencies = [
"memchr",
]
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
[[package]]
name = "alox-48"
-version = "0.2.0"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8054396c448cd2fb78b7b719b9fe616eac0b6b0e824f1cbcc0804617124a3d3f"
dependencies = [
- "bytemuck",
- "color-eyre",
"enum-as-inner",
- "indexmap",
+ "indexmap 2.0.0",
+ "miette",
"paste",
- "pretty-hex",
"serde",
"thiserror",
]
[[package]]
name = "alsa"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44"
+checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47"
dependencies = [
"alsa-sys",
- "bitflags",
+ "bitflags 1.3.2",
"libc",
"nix 0.24.3",
]
@@ -235,12 +236,12 @@ dependencies = [
[[package]]
name = "android-activity"
-version = "0.4.1"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6"
+checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
dependencies = [
"android-properties",
- "bitflags",
+ "bitflags 1.3.2",
"cc",
"jni-sys",
"libc",
@@ -248,7 +249,7 @@ dependencies = [
"ndk",
"ndk-context",
"ndk-sys",
- "num_enum",
+ "num_enum 0.6.1",
]
[[package]]
@@ -257,11 +258,20 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "anyhow"
-version = "1.0.70"
+version = "1.0.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
[[package]]
name = "arboard"
@@ -289,9 +299,18 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
[[package]]
name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "ash"
+version = "0.37.3+1.3.251"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
+dependencies = [
+ "libloading 0.7.4",
+]
[[package]]
name = "async-broadcast"
@@ -305,9 +324,9 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
dependencies = [
"concurrent-queue",
"event-listener",
@@ -323,7 +342,7 @@ dependencies = [
"async-lock",
"async-task",
"concurrent-queue",
- "fastrand",
+ "fastrand 1.9.0",
"futures-lite",
"slab",
]
@@ -369,7 +388,7 @@ dependencies = [
"log",
"parking",
"polling",
- "rustix",
+ "rustix 0.37.23",
"slab",
"socket2",
"waker-fn",
@@ -377,9 +396,9 @@ dependencies = [
[[package]]
name = "async-lock"
-version = "2.7.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
dependencies = [
"event-listener",
]
@@ -409,8 +428,8 @@ dependencies = [
"cfg-if",
"event-listener",
"futures-lite",
- "rustix",
- "signal-hook 0.3.15",
+ "rustix 0.37.23",
+ "signal-hook 0.3.17",
"windows-sys 0.48.0",
]
@@ -422,7 +441,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
@@ -459,20 +478,20 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
[[package]]
name = "async-trait"
-version = "0.1.68"
+version = "0.1.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
name = "atk-sys"
-version = "0.16.0"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148"
+checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -482,12 +501,9 @@ dependencies = [
[[package]]
name = "atomic"
-version = "0.5.1"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c"
-dependencies = [
- "autocfg",
-]
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
[[package]]
name = "atomic-waker"
@@ -497,15 +513,15 @@ checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
[[package]]
name = "atomic_refcell"
-version = "0.1.10"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
+checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905"
[[package]]
name = "atspi"
-version = "0.8.7"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab84c09a770065868da0d713f1f4b35af85d96530a868f1c1a6c249178379187"
+checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa"
dependencies = [
"async-recursion",
"async-trait",
@@ -520,17 +536,12 @@ dependencies = [
[[package]]
name = "atspi-macros"
-version = "0.1.4"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3ebc5a6f61f6996eca56a4cece7b3fe7da3b86f0473c7b71ab44e229f3acce4"
+checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768"
dependencies = [
- "proc-macro2",
"quote",
- "serde",
"syn 1.0.109",
- "zbus",
- "zbus_names",
- "zvariant",
]
[[package]]
@@ -541,15 +552,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.67"
+version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
dependencies = [
"addr2line",
"cc",
"cfg-if",
"libc",
- "miniz_oxide 0.6.2",
+ "miniz_oxide 0.7.1",
"object",
"rustc-demangle",
]
@@ -568,9 +579,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.21.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bincode"
@@ -587,7 +598,7 @@ version = "0.64.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cexpr",
"clang-sys",
"lazy_static",
@@ -628,6 +639,15 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitflags"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "block"
version = "0.1.6"
@@ -681,22 +701,22 @@ dependencies = [
"async-lock",
"async-task",
"atomic-waker",
- "fastrand",
+ "fastrand 1.9.0",
"futures-lite",
"log",
]
[[package]]
name = "bumpalo"
-version = "3.12.1"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytemuck"
-version = "1.13.1"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
dependencies = [
"bytemuck_derive",
]
@@ -709,7 +729,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
@@ -732,9 +752,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
[[package]]
name = "cairo-sys-rs"
-version = "0.16.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421"
+checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff"
dependencies = [
"libc",
"system-deps",
@@ -742,10 +762,11 @@ dependencies = [
[[package]]
name = "calloop"
-version = "0.10.5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a59225be45a478d772ce015d9743e49e92798ece9e34eda9a6aa2a6a7f40192"
+checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
dependencies = [
+ "bitflags 1.3.2",
"log",
"nix 0.25.1",
"slotmap",
@@ -753,22 +774,29 @@ dependencies = [
"vec_map",
]
+[[package]]
+name = "camino"
+version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
+
[[package]]
name = "catppuccin-egui"
-version = "2.0.1"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c840bcad5f36bba893de10ad208359b4b6bab36c60262af8e7883f2843350475"
+checksum = "1d3754c4417c19dc020529b0a3fb5e649afa59b16d49c9231210800ce00891b5"
dependencies = [
"egui",
]
[[package]]
name = "cc"
-version = "1.0.79"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
dependencies = [
"jobserver",
+ "libc",
]
[[package]]
@@ -788,9 +816,9 @@ dependencies = [
[[package]]
name = "cfg-expr"
-version = "0.15.1"
+version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9"
+checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
dependencies = [
"smallvec",
"target-lexicon",
@@ -834,9 +862,15 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
dependencies = [
"glob",
"libc",
- "libloading",
+ "libloading 0.7.4",
]
+[[package]]
+name = "claxon"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
+
[[package]]
name = "clipboard-win"
version = "4.5.0"
@@ -848,6 +882,47 @@ dependencies = [
"winapi",
]
+[[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",
+ "foreign-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
[[package]]
name = "color-eyre"
version = "0.6.2"
@@ -881,6 +956,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+[[package]]
+name = "com-rs"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+
[[package]]
name = "combine"
version = "4.6.6"
@@ -909,6 +990,28 @@ dependencies = [
"crossbeam-utils",
]
+[[package]]
+name = "const-random"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e"
+dependencies = [
+ "const-random-macro",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb"
+dependencies = [
+ "getrandom 0.2.10",
+ "once_cell",
+ "proc-macro-hack",
+ "tiny-keccak",
+]
+
[[package]]
name = "const_fn"
version = "0.4.9"
@@ -960,7 +1063,7 @@ version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
"core-graphics-types",
"foreign-types",
@@ -969,13 +1072,12 @@ dependencies = [
[[package]]
name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
- "foreign-types",
"libc",
]
@@ -985,7 +1087,7 @@ version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation-sys 0.6.2",
"coreaudio-sys",
]
@@ -1026,9 +1128,9 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.7"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
dependencies = [
"libc",
]
@@ -1039,6 +1141,21 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
+[[package]]
+name = "crc"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
+
[[package]]
name = "crc32fast"
version = "1.3.2"
@@ -1048,6 +1165,20 @@ dependencies = [
"cfg-if",
]
+[[package]]
+name = "crossbeam"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
+dependencies = [
+ "cfg-if",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
[[package]]
name = "crossbeam-channel"
version = "0.5.8"
@@ -1071,22 +1202,32 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.14"
+version = "0.9.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
- "memoffset 0.8.0",
+ "memoffset 0.9.0",
"scopeguard",
]
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
[[package]]
name = "crossbeam-utils"
-version = "0.8.15"
+version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if",
]
@@ -1124,17 +1265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
dependencies = [
"lab",
- "phf 0.11.1",
-]
-
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
+ "phf 0.11.2",
]
[[package]]
@@ -1163,9 +1294,9 @@ dependencies = [
[[package]]
name = "curl-sys"
-version = "0.4.61+curl-8.0.1"
+version = "0.4.65+curl-8.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79"
+checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986"
dependencies = [
"cc",
"libc",
@@ -1177,14 +1308,25 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "d3d12"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
+dependencies = [
+ "bitflags 1.3.2",
+ "libloading 0.7.4",
+ "winapi",
+]
+
[[package]]
name = "dashmap"
-version = "5.4.0"
+version = "5.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28"
dependencies = [
"cfg-if",
- "hashbrown",
+ "hashbrown 0.14.0",
"lock_api",
"once_cell",
"parking_lot_core",
@@ -1204,9 +1346,15 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
[[package]]
name = "deltae"
-version = "0.3.1"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4"
+
+[[package]]
+name = "deranged"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef311e2c0a388b9ba56c839ac68d33b92d18ce7104d0acc4375cb479e2b9a53"
+checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
[[package]]
name = "derivative"
@@ -1230,9 +1378,9 @@ dependencies = [
[[package]]
name = "digest"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer 0.10.4",
"crypto-common",
@@ -1293,11 +1441,29 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
[[package]]
name = "dlib"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+dependencies = [
+ "libloading 0.8.0",
+]
+
+[[package]]
+name = "dlv-list"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
+checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73"
dependencies = [
- "libloading",
+ "const-random",
+]
+
+[[package]]
+name = "document-features"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e493c573fce17f00dcab13b6ac057994f3ce17d1af4dc39bfd482b83c6eb6157"
+dependencies = [
+ "litrs",
]
[[package]]
@@ -1306,11 +1472,21 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+[[package]]
+name = "duplicate"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+]
+
[[package]]
name = "ecolor"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9"
+checksum = "2e479a7fa3f23d4e794f8b2f8b3568dd4e47886ad1b12c9c095e141cb591eb63"
dependencies = [
"bytemuck",
"serde",
@@ -1318,90 +1494,114 @@ dependencies = [
[[package]]
name = "eframe"
-version = "0.21.3"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3df3ce60931e5f2d83bab4484d1a283908534d5308cc6b0c5c22c59cd15ee7cc"
+checksum = "bf4596583a2c680c55b6feaa748f74890c4f9cb9c7cb69d6117110444cb65b2f"
dependencies = [
"bytemuck",
+ "cocoa",
"directories-next",
"egui",
+ "egui-wgpu",
"egui-winit",
"egui_glow",
"glow",
"glutin",
"glutin-winit",
+ "image 0.24.7",
"js-sys",
+ "log",
+ "objc",
"percent-encoding",
+ "pollster",
"raw-window-handle",
"ron",
"serde",
"thiserror",
- "tracing",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
+ "wgpu",
+ "winapi",
"winit",
]
[[package]]
name = "egui"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe"
+checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7"
dependencies = [
"accesskit",
"ahash 0.8.3",
"epaint",
+ "log",
"nohash-hasher",
"ron",
"serde",
- "tracing",
]
[[package]]
name = "egui-notify"
-version = "0.6.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa87d2d91ebea916ae30837068f869f9b91242107f86f6abc3f085fbd160e195"
+checksum = "d57ed9c398e24c1b9faf2c52cdc305dd29cb1d9dfa12a0166d254582bc47727a"
dependencies = [
"egui",
]
+[[package]]
+name = "egui-wgpu"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33caaedd8283779c787298af23d8754a7e88421ff32e89ad0040c855fc0b0224"
+dependencies = [
+ "bytemuck",
+ "epaint",
+ "log",
+ "thiserror",
+ "type-map",
+ "wgpu",
+ "winit",
+]
+
[[package]]
name = "egui-winit"
-version = "0.21.1"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab43597ba41f0ce39a364ad83185594578bfd8b3409b99dbcbb01df23afc3dbb"
+checksum = "4a49155fd4a0a4fb21224407a91de0030847972ef90fc64edb63621caea61cb2"
dependencies = [
"accesskit_winit",
- "android-activity",
"arboard",
"egui",
"instant",
+ "log",
+ "raw-window-handle",
"serde",
"smithay-clipboard",
- "tracing",
"webbrowser",
"winit",
]
[[package]]
name = "egui_dock"
-version = "0.4.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be7e6eb63cb936413bd2a4f54be4a9ef53a48252f25864f5f946d4954d7332bd"
+checksum = "1ec07302c1a474f37fe6ef2c6672427880025edc37ac33955e6ea4a11bc6972a"
dependencies = [
+ "duplicate",
"egui",
+ "paste",
]
[[package]]
name = "egui_extras"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f051342e97dfa2445107cb7d2e720617f5c840199b5cb4fe0ffcf481fcf5cce"
+checksum = "9278f4337b526f0d57e5375e5a7340a311fa6ee8f9fcc75721ac50af13face02"
dependencies = [
"egui",
- "image 0.24.6",
+ "image 0.24.7",
"resvg",
"serde",
"tiny-skia",
@@ -1410,30 +1610,30 @@ dependencies = [
[[package]]
name = "egui_glow"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8257332fb168a965b3dca81d6a344e053153773c889cabdba0b3b76f1629ae81"
+checksum = "1f8c2752cdf1b0ef5fcda59a898cacabad974d4f5880e92a420b2c917022da64"
dependencies = [
"bytemuck",
"egui",
"glow",
+ "log",
"memoffset 0.6.5",
- "tracing",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "either"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "emath"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e"
+checksum = "3857d743a6e0741cdd60b622a74c7a36ea75f5f8f11b793b41d905d2c9721a4b"
dependencies = [
"bytemuck",
"serde",
@@ -1441,23 +1641,23 @@ dependencies = [
[[package]]
name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
dependencies = [
"cfg-if",
]
[[package]]
name = "enum-as-inner"
-version = "0.5.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
+checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.29",
]
[[package]]
@@ -1478,25 +1678,25 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
name = "enumn"
-version = "0.1.8"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76"
+checksum = "b893c4eb2dc092c811165f84dc7447fae16fb66521717968c34c509b39b1a5c5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
name = "epaint"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95"
+checksum = "09333964d4d57f40a85338ba3ca5ed4716070ab184dcfed966b35491c5c64f3b"
dependencies = [
"ab_glyph",
"ahash 0.8.3",
@@ -1504,16 +1704,23 @@ dependencies = [
"bytemuck",
"ecolor",
"emath",
+ "log",
"nohash-hasher",
"parking_lot",
"serde",
]
[[package]]
-name = "errno"
-version = "0.3.1"
+name = "equivalent"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
dependencies = [
"errno-dragonfly",
"libc",
@@ -1548,15 +1755,15 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "exr"
-version = "1.6.3"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4"
+checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18"
dependencies = [
"bit_field",
"flume 0.10.14",
"half",
"lebe",
- "miniz_oxide 0.6.2",
+ "miniz_oxide 0.7.1",
"rayon-core",
"smallvec",
"zune-inflate",
@@ -1574,9 +1781,9 @@ dependencies = [
[[package]]
name = "fancy-regex"
-version = "0.7.1"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf"
+checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
dependencies = [
"bit-set",
"regex",
@@ -1591,6 +1798,12 @@ dependencies = [
"instant",
]
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
[[package]]
name = "fdeflate"
version = "0.3.0"
@@ -1610,6 +1823,18 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "filetime"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.3.5",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "finl_unicode"
version = "1.2.0"
@@ -1624,9 +1849,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.26"
+version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
dependencies = [
"crc32fast",
"miniz_oxide 0.7.1",
@@ -1685,13 +1910,22 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "futures"
version = "0.3.28"
@@ -1746,7 +1980,7 @@ version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
"futures-core",
"futures-io",
"memchr",
@@ -1763,7 +1997,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
@@ -1798,9 +2032,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.16.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016"
+checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
dependencies = [
"gio-sys",
"glib-sys",
@@ -1811,9 +2045,9 @@ dependencies = [
[[package]]
name = "gdk-sys"
-version = "0.16.0"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a"
+checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1859,9 +2093,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.9"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
"js-sys",
@@ -1892,15 +2126,15 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.27.2"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]]
name = "gio-sys"
-version = "0.16.3"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
+checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -1942,11 +2176,20 @@ dependencies = [
"xml-rs",
]
+[[package]]
+name = "glam"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226"
+dependencies = [
+ "bytemuck",
+]
+
[[package]]
name = "glib-sys"
-version = "0.16.3"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
+checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
dependencies = [
"libc",
"system-deps",
@@ -1972,9 +2215,9 @@ dependencies = [
[[package]]
name = "glow"
-version = "0.12.1"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1"
+checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728"
dependencies = [
"js-sys",
"slotmap",
@@ -1984,11 +2227,11 @@ dependencies = [
[[package]]
name = "glutin"
-version = "0.30.7"
+version = "0.30.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89bab9ec7715de13d5d5402238e66f48e3a5ae636ebb45aba4013c962e2ff15"
+checksum = "8fc93b03242719b8ad39fb26ed2b01737144ce7bd4bfc7adadcef806596760fe"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg_aliases",
"cgl",
"core-foundation",
@@ -1996,7 +2239,7 @@ dependencies = [
"glutin_egl_sys",
"glutin_glx_sys",
"glutin_wgl_sys",
- "libloading",
+ "libloading 0.7.4",
"objc2",
"once_cell",
"raw-window-handle",
@@ -2019,9 +2262,9 @@ dependencies = [
[[package]]
name = "glutin_egl_sys"
-version = "0.4.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5aaf0abb5c4148685b33101ae326a207946b4d3764d6cdc79f8316cdaa8367d"
+checksum = "af784eb26c5a68ec85391268e074f0aa618c096eadb5d6330b0911cf34fe57c5"
dependencies = [
"gl_generator",
"windows-sys 0.45.0",
@@ -2048,20 +2291,72 @@ dependencies = [
[[package]]
name = "gobject-sys"
-version = "0.16.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
+checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
dependencies = [
"glib-sys",
"libc",
"system-deps",
]
+[[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",
+]
+
+[[package]]
+name = "gpu-alloc-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "gpu-allocator"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+dependencies = [
+ "backtrace",
+ "log",
+ "thiserror",
+ "winapi",
+ "windows 0.44.0",
+]
+
+[[package]]
+name = "gpu-descriptor"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a"
+dependencies = [
+ "bitflags 1.3.2",
+ "gpu-descriptor-types",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "gpu-descriptor-types"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
[[package]]
name = "gtk-sys"
-version = "0.16.0"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3"
+checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722"
dependencies = [
"atk-sys",
"cairo-sys-rs",
@@ -2094,25 +2389,43 @@ dependencies = [
]
[[package]]
-name = "heck"
-version = "0.4.1"
+name = "hashbrown"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
[[package]]
-name = "hermit-abi"
-version = "0.2.6"
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
+[[package]]
+name = "hassle-rs"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0"
dependencies = [
+ "bitflags 1.3.2",
+ "com-rs",
"libc",
+ "libloading 0.7.4",
+ "thiserror",
+ "widestring",
+ "winapi",
]
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
[[package]]
name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
[[package]]
name = "hex"
@@ -2120,6 +2433,12 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+[[package]]
+name = "hexf-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
[[package]]
name = "hkdf"
version = "0.10.0"
@@ -2140,6 +2459,21 @@ dependencies = [
"digest 0.9.0",
]
+[[package]]
+name = "home"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "hound"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1"
+
[[package]]
name = "http"
version = "0.2.9"
@@ -2198,9 +2532,9 @@ dependencies = [
[[package]]
name = "idna"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
dependencies = [
"unicode-bidi",
"unicode-normalization",
@@ -2221,14 +2555,14 @@ dependencies = [
"num-traits",
"png",
"qoi",
- "tiff",
+ "tiff 0.8.1",
]
[[package]]
name = "image"
-version = "0.24.6"
+version = "0.24.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
dependencies = [
"bytemuck",
"byteorder",
@@ -2240,7 +2574,7 @@ dependencies = [
"num-traits",
"png",
"qoi",
- "tiff",
+ "tiff 0.9.0",
]
[[package]]
@@ -2262,7 +2596,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
"serde",
]
@@ -2272,6 +2616,26 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "instant"
version = "0.1.12"
@@ -2286,11 +2650,11 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi",
"libc",
"windows-sys 0.48.0",
]
@@ -2329,18 +2693,18 @@ dependencies = [
[[package]]
name = "itertools"
-version = "0.10.5"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
dependencies = [
"either",
]
[[package]]
name = "itoa"
-version = "1.0.6"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "jni"
@@ -2412,19 +2776,50 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.61"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "khronos-egl"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
+dependencies = [
+ "libc",
+ "libloading 0.7.4",
+ "pkg-config",
+]
+
[[package]]
name = "khronos_api"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
+[[package]]
+name = "kqueue"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
[[package]]
name = "kurbo"
version = "0.8.3"
@@ -2467,11 +2862,22 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+[[package]]
+name = "lewton"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
+dependencies = [
+ "byteorder",
+ "ogg",
+ "tinyvec",
+]
+
[[package]]
name = "libc"
-version = "0.2.142"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libloading"
@@ -2483,17 +2889,27 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "libloading"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "libm"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
[[package]]
name = "libnghttp2-sys"
-version = "0.1.7+1.45.0"
+version = "0.1.8+1.55.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
+checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340"
dependencies = [
"cc",
"libc",
@@ -2501,9 +2917,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.9"
+version = "1.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
dependencies = [
"cc",
"libc",
@@ -2528,15 +2944,27 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
-version = "0.3.6"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+
+[[package]]
+name = "litrs"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa"
[[package]]
name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
dependencies = [
"autocfg",
"scopeguard",
@@ -2544,11 +2972,10 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
dependencies = [
- "cfg-if",
"value-bag",
]
@@ -2558,7 +2985,7 @@ version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
dependencies = [
- "hashbrown",
+ "hashbrown 0.12.3",
]
[[package]]
@@ -2567,11 +2994,15 @@ version = "0.4.0"
dependencies = [
"alox-48",
"atomic_refcell",
+ "bitflags 2.4.0",
"bytemuck",
+ "camino",
"catppuccin-egui",
"cfg-if",
"color-eyre",
"command-lib",
+ "crc",
+ "crossbeam",
"dashmap",
"eframe",
"egui",
@@ -2582,12 +3013,14 @@ dependencies = [
"eyre",
"futures",
"git-version",
- "image 0.24.6",
+ "glam",
+ "image 0.24.7",
"itertools",
"luminol-term",
- "num-derive",
- "num-traits",
+ "notify",
+ "num_enum 0.7.0",
"once_cell",
+ "ouroboros",
"parking_lot",
"paste",
"poll-promise",
@@ -2596,6 +3029,8 @@ dependencies = [
"rmxp-types",
"rodio",
"ron",
+ "rust-ini",
+ "rustysynth",
"serde",
"slab",
"static_assertions",
@@ -2603,10 +3038,11 @@ dependencies = [
"strum",
"surf",
"syntect",
+ "thiserror",
"tracing",
"tracing-subscriber",
- "windows 0.46.0",
- "winreg 0.11.0",
+ "windows 0.51.1",
+ "winreg 0.51.0",
"winres",
"zip",
]
@@ -2625,9 +3061,9 @@ dependencies = [
[[package]]
name = "mac_address"
-version = "1.1.4"
+version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b238e3235c8382b7653c6408ed1b08dd379bdb9fdf990fb0bbae3db2cc0ae963"
+checksum = "4863ee94f19ed315bf3bc00299338d857d4b5bc856af375cc97d237382ad3856"
dependencies = [
"nix 0.23.2",
"winapi",
@@ -2692,13 +3128,50 @@ dependencies = [
[[package]]
name = "memoffset"
-version = "0.8.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
+[[package]]
+name = "metal"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "core-graphics-types",
+ "foreign-types",
+ "log",
+ "objc",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
[[package]]
name = "mime"
version = "0.3.17"
@@ -2731,15 +3204,6 @@ dependencies = [
"autocfg",
]
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.7.1"
@@ -2752,14 +3216,34 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.6"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
"log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "naga"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
+dependencies = [
+ "bit-set",
+ "bitflags 1.3.2",
+ "codespan-reporting",
+ "hexf-parse",
+ "indexmap 1.9.3",
+ "log",
+ "num-traits",
+ "rustc-hash",
+ "spirv",
+ "termcolor",
+ "thiserror",
+ "unicode-xid",
]
[[package]]
@@ -2768,7 +3252,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
]
[[package]]
@@ -2777,10 +3261,10 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"jni-sys",
"ndk-sys",
- "num_enum",
+ "num_enum 0.5.11",
"raw-window-handle",
"thiserror",
]
@@ -2806,7 +3290,7 @@ version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cc",
"cfg-if",
"libc",
@@ -2819,7 +3303,7 @@ version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.6.5",
@@ -2832,7 +3316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
dependencies = [
"autocfg",
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.6.5",
@@ -2845,7 +3329,7 @@ version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.7.1",
@@ -2868,6 +3352,25 @@ dependencies = [
"minimal-lexical",
]
+[[package]]
+name = "notify"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+dependencies = [
+ "bitflags 2.4.0",
+ "crossbeam-channel",
+ "filetime",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio",
+ "walkdir",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "nu-ansi-term"
version = "0.46.0"
@@ -2912,30 +3415,48 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
dependencies = [
- "autocfg",
+ "num_enum_derive 0.5.11",
]
[[package]]
-name = "num_cpus"
-version = "1.15.0"
+name = "num_enum"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
dependencies = [
- "hermit-abi 0.2.6",
- "libc",
+ "num_enum_derive 0.6.1",
]
[[package]]
name = "num_enum"
-version = "0.5.11"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb"
dependencies = [
- "num_enum_derive",
+ "num_enum_derive 0.7.0",
]
[[package]]
@@ -2950,6 +3471,30 @@ 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",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
[[package]]
name = "objc"
version = "0.2.7"
@@ -2957,6 +3502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
dependencies = [
"malloc_buf",
+ "objc_exception",
]
[[package]]
@@ -2978,9 +3524,9 @@ checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
[[package]]
name = "objc2"
-version = "0.3.0-beta.3"
+version = "0.3.0-beta.3.patch-leaks.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe31e5425d3d0b89a15982c024392815da40689aceb34bad364d58732bcfd649"
+checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
dependencies = [
"block2",
"objc-sys",
@@ -2996,6 +3542,15 @@ dependencies = [
"objc-sys",
]
+[[package]]
+name = "objc_exception"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "objc_id"
version = "0.1.1"
@@ -3007,9 +3562,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.30.3"
+version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
+checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
dependencies = [
"memchr",
]
@@ -3037,11 +3592,20 @@ dependencies = [
"cc",
]
+[[package]]
+name = "ogg"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
+dependencies = [
+ "byteorder",
+]
+
[[package]]
name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "opaque-debug"
@@ -3057,9 +3621,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.87"
+version = "0.9.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e"
+checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac"
dependencies = [
"cc",
"libc",
@@ -3069,22 +3633,32 @@ dependencies = [
[[package]]
name = "orbclient"
-version = "0.3.45"
+version = "0.3.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1"
+checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f"
dependencies = [
"redox_syscall 0.3.5",
]
[[package]]
name = "ordered-float"
-version = "3.7.0"
+version = "3.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213"
+checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06"
dependencies = [
"num-traits",
]
+[[package]]
+name = "ordered-multimap"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e"
+dependencies = [
+ "dlv-list",
+ "hashbrown 0.13.2",
+]
+
[[package]]
name = "ordered-stream"
version = "0.2.0"
@@ -3095,6 +3669,31 @@ dependencies = [
"pin-project-lite",
]
+[[package]]
+name = "ouroboros"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c86de06555b970aec45229b27291b53154f21a5743a163419f4e4c0b065dcde"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cad0c4b129e9696e37cb712b243777b90ef489a0bfaa0ac34e7d9b860e4f134"
+dependencies = [
+ "heck",
+ "itertools",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
[[package]]
name = "overload"
version = "0.1.1"
@@ -3118,9 +3717,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
[[package]]
name = "pango-sys"
-version = "0.16.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f"
+checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -3146,25 +3745,25 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
dependencies = [
"backtrace",
"cfg-if",
"libc",
"petgraph",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.3.5",
"smallvec",
"thread-id",
- "windows-sys 0.45.0",
+ "windows-targets 0.48.5",
]
[[package]]
name = "paste"
-version = "1.0.12"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "peeking_take_while"
@@ -3174,15 +3773,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
[[package]]
name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pest"
-version = "2.6.0"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70"
+checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
dependencies = [
"thiserror",
"ucd-trie",
@@ -3190,9 +3789,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.6.0"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb"
+checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
dependencies = [
"pest",
"pest_generator",
@@ -3200,36 +3799,36 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.6.0"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e"
+checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
name = "pest_meta"
-version = "2.6.0"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411"
+checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
dependencies = [
"once_cell",
"pest",
- "sha2 0.10.6",
+ "sha2 0.10.7",
]
[[package]]
name = "petgraph"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
"fixedbitset",
- "indexmap",
+ "indexmap 2.0.0",
]
[[package]]
@@ -3243,45 +3842,45 @@ dependencies = [
[[package]]
name = "phf"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
dependencies = [
"phf_macros",
- "phf_shared 0.11.1",
+ "phf_shared 0.11.2",
]
[[package]]
name = "phf_codegen"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"
+checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
dependencies = [
"phf_generator",
- "phf_shared 0.11.1",
+ "phf_shared 0.11.2",
]
[[package]]
name = "phf_generator"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
dependencies = [
- "phf_shared 0.11.1",
+ "phf_shared 0.11.2",
"rand 0.8.5",
]
[[package]]
name = "phf_macros"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
"phf_generator",
- "phf_shared 0.11.1",
+ "phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.29",
]
[[package]]
@@ -3295,9 +3894,9 @@ dependencies = [
[[package]]
name = "phf_shared"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
dependencies = [
"siphasher",
]
@@ -3310,29 +3909,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
[[package]]
name = "pin-project"
-version = "1.0.12"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.29",
]
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "pin-utils"
@@ -3342,31 +3941,31 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "plist"
-version = "1.4.3"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590"
+checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"
dependencies = [
- "base64 0.21.0",
- "indexmap",
+ "base64 0.21.2",
+ "indexmap 1.9.3",
"line-wrap",
"quick-xml",
"serde",
- "time 0.3.20",
+ "time 0.3.27",
]
[[package]]
name = "png"
-version = "0.17.8"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"crc32fast",
"fdeflate",
"flate2",
@@ -3375,9 +3974,11 @@ dependencies = [
[[package]]
name = "poll-promise"
-version = "0.2.0"
-source = "git+https://github.com/EmbarkStudios/poll-promise?rev=8c4d0d6e4d693cf54e9306950cb2f6d271c77080#8c4d0d6e4d693cf54e9306950cb2f6d271c77080"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6a58fecbf9da8965bcdb20ce4fd29788d1acee68ddbb64f0ba1b81bccdb7df"
dependencies = [
+ "document-features",
"smol",
"static_assertions",
]
@@ -3389,7 +3990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
dependencies = [
"autocfg",
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"concurrent-queue",
"libc",
@@ -3398,6 +3999,12 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "pollster"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
+
[[package]]
name = "polyval"
version = "0.4.5"
@@ -3415,7 +4022,7 @@ version = "0.8.1"
source = "git+https://github.com/wez/wezterm?rev=3666303c7b26c6c966b3f136dbb954686d334cc3#3666303c7b26c6c966b3f136dbb954686d334cc3"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 1.3.2",
"downcast-rs",
"filedescriptor",
"lazy_static",
@@ -3435,12 +4042,6 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-[[package]]
-name = "pretty-hex"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
-
[[package]]
name = "proc-macro-crate"
version = "1.3.1"
@@ -3451,6 +4052,30 @@ dependencies = [
"toml_edit",
]
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
[[package]]
name = "proc-macro-hack"
version = "0.5.20+deprecated"
@@ -3459,13 +4084,19 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [
"unicode-ident",
]
+[[package]]
+name = "profiling"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46b2164ebdb1dfeec5e337be164292351e11daf63a05174c6776b2f47460f0c9"
+
[[package]]
name = "qoi"
version = "0.4.1"
@@ -3477,18 +4108,18 @@ dependencies = [
[[package]]
name = "quick-xml"
-version = "0.28.2"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
+checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
dependencies = [
"memchr",
]
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2",
]
@@ -3552,7 +4183,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
]
[[package]]
@@ -3564,6 +4195,12 @@ dependencies = [
"rand_core 0.5.1",
]
+[[package]]
+name = "range-alloc"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
+
[[package]]
name = "raw-window-handle"
version = "0.5.2"
@@ -3604,7 +4241,7 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
@@ -3613,7 +4250,7 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
@@ -3622,33 +4259,45 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
"redox_syscall 0.2.16",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.8.1"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.7.1",
+ "regex-automata",
+ "regex-syntax",
]
[[package]]
-name = "regex-syntax"
-version = "0.6.29"
+name = "regex-automata"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
[[package]]
name = "regex-syntax"
-version = "0.7.1"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+
+[[package]]
+name = "renderdoc-sys"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
[[package]]
name = "resvg"
@@ -3666,14 +4315,12 @@ dependencies = [
[[package]]
name = "rfd"
-version = "0.11.3"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cb2988ec50c9bcdb0c012b89643a6094a35a785a37897211ee62e1639342f7b"
+checksum = "241a0deb168c88050d872294f7b3106c1dfa8740942bcc97bc91b98e97b5c501"
dependencies = [
- "async-io",
"block",
"dispatch",
- "futures-util",
"glib-sys",
"gobject-sys",
"gtk-sys",
@@ -3686,7 +4333,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "windows 0.44.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3704,9 +4351,11 @@ version = "0.1.0"
dependencies = [
"alox-48",
"bytemuck",
+ "camino",
"flate2",
"num-derive",
"num-traits",
+ "num_enum 0.6.1",
"paste",
"rand 0.8.5",
"serde",
@@ -3720,19 +4369,23 @@ version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa"
dependencies = [
+ "claxon",
"cpal",
+ "hound",
+ "lewton",
"symphonia",
]
[[package]]
name = "ron"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
dependencies = [
- "base64 0.13.1",
- "bitflags",
+ "base64 0.21.2",
+ "bitflags 2.4.0",
"serde",
+ "serde_derive",
]
[[package]]
@@ -3744,6 +4397,16 @@ dependencies = [
"xmlparser",
]
+[[package]]
+name = "rust-ini"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap",
+]
+
[[package]]
name = "rustc-demangle"
version = "0.1.23"
@@ -3767,29 +4430,48 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.37.15"
+version = "0.37.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
+dependencies = [
+ "bitflags 2.4.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.5",
"windows-sys 0.48.0",
]
[[package]]
name = "rustversion"
-version = "1.0.12"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "rustysynth"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b916492c4bdd1dba14c92761cc855f9ef12f3c7e4ef18cab07ee49e784c1c66b"
[[package]]
name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "safemem"
@@ -3808,11 +4490,11 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.21"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3823,9 +4505,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
[[package]]
name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "sctk-adwaita"
@@ -3875,41 +4557,29 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.160"
+version = "1.0.187"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c"
dependencies = [
"serde_derive",
]
-[[package]]
-name = "serde-xml-rs"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0bf1ba0696ccf0872866277143ff1fd14d22eec235d2b23702f95e6660f7dfa"
-dependencies = [
- "log",
- "serde",
- "thiserror",
- "xml-rs",
-]
-
[[package]]
name = "serde_derive"
-version = "1.0.160"
+version = "1.0.187"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
name = "serde_json"
-version = "1.0.96"
+version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
dependencies = [
"itoa",
"ryu",
@@ -3929,20 +4599,20 @@ dependencies = [
[[package]]
name = "serde_repr"
-version = "0.1.12"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
+checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
dependencies = [
"serde",
]
@@ -4018,7 +4688,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -4042,13 +4712,13 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
]
[[package]]
@@ -4094,9 +4764,9 @@ dependencies = [
[[package]]
name = "signal-hook"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
dependencies = [
"libc",
"signal-hook-registry",
@@ -4113,9 +4783,9 @@ dependencies = [
[[package]]
name = "simd-adler32"
-version = "0.3.5"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
[[package]]
name = "simplecss"
@@ -4128,15 +4798,15 @@ dependencies = [
[[package]]
name = "siphasher"
-version = "0.3.10"
+version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
[[package]]
name = "slab"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
dependencies = [
"autocfg",
"serde",
@@ -4164,9 +4834,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
[[package]]
name = "smithay-client-toolkit"
@@ -4174,7 +4844,7 @@ version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"calloop",
"dlib",
"lazy_static",
@@ -4242,6 +4912,16 @@ dependencies = [
"lock_api",
]
+[[package]]
+name = "spirv"
+version = "0.2.0+1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+dependencies = [
+ "bitflags 1.3.2",
+ "num-traits",
+]
+
[[package]]
name = "standback"
version = "0.2.17"
@@ -4312,7 +4992,7 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37769f3fb7cc26bf69609e455a606c073d7332ddd45742b2317d72abafc04d8e"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"lazy_static",
"steamworks-sys",
"thiserror",
@@ -4332,9 +5012,9 @@ checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
[[package]]
name = "strict-num"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
dependencies = [
"float-cmp",
]
@@ -4347,24 +5027,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "strum"
-version = "0.24.1"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
dependencies = [
"strum_macros",
]
[[package]]
name = "strum_macros"
-version = "0.24.3"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
dependencies = [
"heck",
"proc-macro2",
"quote",
"rustversion",
- "syn 1.0.109",
+ "syn 2.0.29",
]
[[package]]
@@ -4384,155 +5064,70 @@ dependencies = [
"cfg-if",
"encoding_rs",
"futures-util",
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
"http-client",
"http-types",
"log",
- "mime_guess",
- "once_cell",
- "pin-project-lite",
- "serde",
- "serde_json",
- "web-sys",
-]
-
-[[package]]
-name = "svgtypes"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "symphonia"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3671dd6f64f4f9d5c87179525054cfc1f60de23ba1f193bd6ceab812737403f1"
-dependencies = [
- "lazy_static",
- "symphonia-bundle-flac",
- "symphonia-bundle-mp3",
- "symphonia-codec-aac",
- "symphonia-codec-adpcm",
- "symphonia-codec-pcm",
- "symphonia-codec-vorbis",
- "symphonia-core",
- "symphonia-format-isomp4",
- "symphonia-format-wav",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-bundle-flac"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dc2deed3204967871ba60f913378f95820cb47a2fe9b2eef5a9eedb417dfdc8"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-bundle-mp3"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55a0846e7a2c9a8081ff799fc83a975170417ad2a143f644a77ec2e3e82a2b73"
-dependencies = [
- "bitflags",
- "lazy_static",
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-codec-aac"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fcdd4a10695ca0528572360ec020586320357350eb62791693667e7de8c871a"
-dependencies = [
- "lazy_static",
- "log",
- "symphonia-core",
+ "mime_guess",
+ "once_cell",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "web-sys",
]
[[package]]
-name = "symphonia-codec-adpcm"
-version = "0.5.2"
+name = "svgtypes"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5cfb8d4405e26eb9593157dc45b05e102b8d774b38ed2a95946d6bb9e26e3e"
+checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564"
dependencies = [
- "log",
- "symphonia-core",
+ "siphasher",
]
[[package]]
-name = "symphonia-codec-pcm"
-version = "0.5.2"
+name = "symphonia"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cb9a9f0b9991cccf3217b74644af412d5d082a4815e5e2943f26e0ecabdf3c9"
+checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941"
dependencies = [
- "log",
+ "lazy_static",
+ "symphonia-bundle-mp3",
"symphonia-core",
+ "symphonia-metadata",
]
[[package]]
-name = "symphonia-codec-vorbis"
-version = "0.5.2"
+name = "symphonia-bundle-mp3"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfed6f7b6bfa21d7cef1acefc8eae5db80df1608a1aca91871b07cbd28d7b74"
+checksum = "0f31d7fece546f1e6973011a9eceae948133bbd18fd3d52f6073b1e38ae6368a"
dependencies = [
+ "bitflags 1.3.2",
+ "lazy_static",
"log",
"symphonia-core",
- "symphonia-utils-xiph",
+ "symphonia-metadata",
]
[[package]]
name = "symphonia-core"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869"
+checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142"
dependencies = [
"arrayvec",
- "bitflags",
+ "bitflags 1.3.2",
"bytemuck",
"lazy_static",
"log",
]
-[[package]]
-name = "symphonia-format-isomp4"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1818f6f54b4eaba5ec004a8dbcca637c57e617eb1ff4c9addbd3fc065eba437"
-dependencies = [
- "encoding_rs",
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-format-wav"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06679bd5646b3037300f88891dfc8a6e1cc4e1133206cc17a98e5d7c22f88296"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
[[package]]
name = "symphonia-metadata"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd35c263223ef6161000be79b124a75de3e065eea563bf3ef169b3e94c7bb2e"
+checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0"
dependencies = [
"encoding_rs",
"lazy_static",
@@ -4540,16 +5135,6 @@ dependencies = [
"symphonia-core",
]
-[[package]]
-name = "symphonia-utils-xiph"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce340a6c33ac06cb42de01220308ec056e8a2a3d5cc664aaf34567392557136b"
-dependencies = [
- "symphonia-core",
- "symphonia-metadata",
-]
-
[[package]]
name = "syn"
version = "1.0.109"
@@ -4563,9 +5148,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.15"
+version = "2.0.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
dependencies = [
"proc-macro2",
"quote",
@@ -4574,21 +5159,19 @@ dependencies = [
[[package]]
name = "syntect"
-version = "5.0.0"
+version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8"
+checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91"
dependencies = [
"bincode",
- "bitflags",
+ "bitflags 1.3.2",
"fancy-regex",
"flate2",
"fnv",
- "lazy_static",
"once_cell",
"plist",
- "regex-syntax 0.6.29",
+ "regex-syntax",
"serde",
- "serde_derive",
"serde_json",
"thiserror",
"walkdir",
@@ -4597,34 +5180,43 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.0.5"
+version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055"
+checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
dependencies = [
"cfg-expr",
"heck",
"pkg-config",
- "toml 0.7.3",
+ "toml 0.7.6",
"version-compare",
]
[[package]]
name = "target-lexicon"
-version = "0.12.7"
+version = "0.12.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
+checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
[[package]]
name = "tempfile"
-version = "3.5.0"
+version = "3.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
dependencies = [
"cfg-if",
- "fastrand",
+ "fastrand 2.0.0",
"redox_syscall 0.3.5",
- "rustix",
- "windows-sys 0.45.0",
+ "rustix 0.38.8",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+dependencies = [
+ "winapi-util",
]
[[package]]
@@ -4636,7 +5228,7 @@ dependencies = [
"dirs",
"fnv",
"nom",
- "phf 0.11.1",
+ "phf 0.11.2",
"phf_codegen",
]
@@ -4664,8 +5256,8 @@ version = "0.22.0"
source = "git+https://github.com/wez/wezterm?rev=3666303c7b26c6c966b3f136dbb954686d334cc3#3666303c7b26c6c966b3f136dbb954686d334cc3"
dependencies = [
"anyhow",
- "base64 0.21.0",
- "bitflags",
+ "base64 0.21.2",
+ "bitflags 1.3.2",
"filedescriptor",
"finl_unicode",
"fixedbitset",
@@ -4703,29 +5295,29 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.40"
+version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
name = "thread-id"
-version = "4.0.0"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f"
+checksum = "79474f573561cdc4871a0de34a51c92f7f5a56039113fbb5b9c9f96bdb756669"
dependencies = [
"libc",
"redox_syscall 0.2.16",
@@ -4753,6 +5345,17 @@ dependencies = [
"weezl",
]
+[[package]]
+name = "tiff"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
[[package]]
name = "time"
version = "0.2.27"
@@ -4770,21 +5373,22 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.20"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07"
dependencies = [
+ "deranged",
"itoa",
"serde",
"time-core",
- "time-macros 0.2.8",
+ "time-macros 0.2.13",
]
[[package]]
name = "time-core"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
@@ -4798,9 +5402,9 @@ dependencies = [
[[package]]
name = "time-macros"
-version = "0.2.8"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
+checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9"
dependencies = [
"time-core",
]
@@ -4818,6 +5422,15 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
[[package]]
name = "tiny-skia"
version = "0.8.4"
@@ -4869,9 +5482,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.7.3"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
dependencies = [
"serde",
"serde_spanned",
@@ -4881,20 +5494,20 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.19.8"
+version = "0.19.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
dependencies = [
- "indexmap",
+ "indexmap 2.0.0",
"serde",
"serde_spanned",
"toml_datetime",
@@ -4903,10 +5516,11 @@ dependencies = [
[[package]]
name = "tracing"
-version = "0.1.38"
+version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9cf6a813d3f40c88b0b6b6f29a5c95c6cdbf97c1f9cc53fb820200f5ad814d"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
+ "cfg-if",
"log",
"pin-project-lite",
"tracing-attributes",
@@ -4915,20 +5529,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.24"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.29",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
"valuable",
@@ -4981,9 +5595,18 @@ dependencies = [
[[package]]
name = "ttf-parser"
-version = "0.19.0"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33"
+
+[[package]]
+name = "type-map"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746"
+checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
+dependencies = [
+ "rustc-hash",
+]
[[package]]
name = "typenum"
@@ -4993,9 +5616,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
[[package]]
name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
[[package]]
name = "uds_windows"
@@ -5009,9 +5632,9 @@ dependencies = [
[[package]]
name = "unicase"
-version = "2.6.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
dependencies = [
"version_check",
]
@@ -5024,9 +5647,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
[[package]]
name = "unicode-normalization"
@@ -5043,6 +5666,18 @@ version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
[[package]]
name = "universal-hash"
version = "0.4.1"
@@ -5055,9 +5690,9 @@ dependencies = [
[[package]]
name = "url"
-version = "2.3.1"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
dependencies = [
"form_urlencoded",
"idna",
@@ -5093,12 +5728,12 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
-version = "1.3.1"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [
"atomic",
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
]
[[package]]
@@ -5109,13 +5744,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor",
- "version_check",
-]
+checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
[[package]]
name = "vcpkg"
@@ -5179,9 +5810,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -5189,24 +5820,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.29",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
dependencies = [
"cfg-if",
"js-sys",
@@ -5216,9 +5847,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -5226,22 +5857,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.29",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "wayland-client"
@@ -5249,7 +5880,7 @@ version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"downcast-rs",
"libc",
"nix 0.24.3",
@@ -5288,7 +5919,7 @@ version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"wayland-client",
"wayland-commons",
"wayland-scanner",
@@ -5330,9 +5961,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.61"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -5340,12 +5971,12 @@ dependencies = [
[[package]]
name = "webbrowser"
-version = "0.8.9"
+version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b692165700260bbd40fbc5ff23766c03e339fbaca907aeea5cb77bf0a553ca83"
+checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57"
dependencies = [
"core-foundation",
- "dirs",
+ "home",
"jni 0.21.1",
"log",
"ndk-context",
@@ -5375,7 +6006,7 @@ name = "wezterm-blob-leases"
version = "0.1.0"
source = "git+https://github.com/wez/wezterm?rev=3666303c7b26c6c966b3f136dbb954686d334cc3#3666303c7b26c6c966b3f136dbb954686d334cc3"
dependencies = [
- "getrandom 0.2.9",
+ "getrandom 0.2.10",
"mac_address",
"once_cell",
"sha2 0.9.9",
@@ -5422,7 +6053,7 @@ version = "0.1.0"
source = "git+https://github.com/wez/wezterm?rev=3666303c7b26c6c966b3f136dbb954686d334cc3#3666303c7b26c6c966b3f136dbb954686d334cc3"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 1.3.2",
"csscolorparser",
"finl_unicode",
"hex",
@@ -5443,6 +6074,112 @@ dependencies = [
"wezterm-dynamic",
]
+[[package]]
+name = "wgpu"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
+dependencies = [
+ "arrayvec",
+ "cfg-if",
+ "js-sys",
+ "log",
+ "naga",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "static_assertions",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-core"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
+dependencies = [
+ "arrayvec",
+ "bit-vec",
+ "bitflags 2.4.0",
+ "codespan-reporting",
+ "log",
+ "naga",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "rustc-hash",
+ "smallvec",
+ "thiserror",
+ "web-sys",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-hal"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
+dependencies = [
+ "android_system_properties",
+ "arrayvec",
+ "ash",
+ "bit-set",
+ "bitflags 2.4.0",
+ "block",
+ "core-graphics-types",
+ "d3d12",
+ "foreign-types",
+ "glow",
+ "gpu-alloc",
+ "gpu-allocator",
+ "gpu-descriptor",
+ "hassle-rs",
+ "js-sys",
+ "khronos-egl",
+ "libc",
+ "libloading 0.8.0",
+ "log",
+ "metal",
+ "naga",
+ "objc",
+ "parking_lot",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle",
+ "renderdoc-sys",
+ "rustc-hash",
+ "smallvec",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu-types",
+ "winapi",
+]
+
+[[package]]
+name = "wgpu-types"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
+dependencies = [
+ "bitflags 2.4.0",
+ "js-sys",
+ "web-sys",
+]
+
+[[package]]
+name = "widestring"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+
[[package]]
name = "winapi"
version = "0.3.9"
@@ -5485,43 +6222,57 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
-version = "0.42.0"
+version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0286ba339aa753e70765d521bb0242cc48e1194562bfa2a2ad7ac8a6de28f5d5"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
dependencies = [
- "windows-implement",
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.42.2",
]
[[package]]
name = "windows"
-version = "0.44.0"
+version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
dependencies = [
"windows-targets 0.42.2",
]
[[package]]
name = "windows"
-version = "0.46.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
- "windows-targets 0.42.2",
+ "windows-implement",
+ "windows-interface",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets 0.48.5",
]
[[package]]
name = "windows-implement"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9539b6bd3eadbd9de66c9666b22d802b833da7e996bc06896142e09854a61767"
+checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
dependencies = [
"proc-macro2",
"quote",
@@ -5529,18 +6280,14 @@ dependencies = [
]
[[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-interface"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
]
[[package]]
@@ -5558,7 +6305,7 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
]
[[package]]
@@ -5578,17 +6325,17 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
]
[[package]]
@@ -5599,9 +6346,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_msvc"
@@ -5611,9 +6358,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_i686_gnu"
@@ -5623,9 +6370,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_msvc"
@@ -5635,9 +6382,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_x86_64_gnu"
@@ -5647,9 +6394,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -5659,9 +6406,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_msvc"
@@ -5671,18 +6418,18 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winit"
-version = "0.28.3"
+version = "0.28.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f504e8c117b9015f618774f8d58cd4781f5a479bc41079c064f974cbb253874"
+checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196"
dependencies = [
"android-activity",
- "bitflags",
+ "bitflags 1.3.2",
"cfg_aliases",
"core-foundation",
"core-graphics",
@@ -5712,9 +6459,9 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.4.4"
+version = "0.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5617da7e1f97bf363947d767b91aaf3c2bbc19db7fda9c65af1278713d58e0a2"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
dependencies = [
"memchr",
]
@@ -5730,12 +6477,12 @@ dependencies = [
[[package]]
name = "winreg"
-version = "0.11.0"
+version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189"
+checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc"
dependencies = [
"cfg-if",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -5801,9 +6548,9 @@ dependencies = [
[[package]]
name = "xml-rs"
-version = "0.8.14"
+version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c"
+checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"
[[package]]
name = "xmlparser"
@@ -5822,18 +6569,20 @@ dependencies = [
[[package]]
name = "zbus"
-version = "3.12.0"
+version = "3.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3"
+checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948"
dependencies = [
"async-broadcast",
"async-executor",
"async-fs",
"async-io",
"async-lock",
+ "async-process",
"async-recursion",
"async-task",
"async-trait",
+ "blocking",
"byteorder",
"derivative",
"enumflags2",
@@ -5847,7 +6596,6 @@ dependencies = [
"ordered-stream",
"rand 0.8.5",
"serde",
- "serde-xml-rs",
"serde_repr",
"sha1 0.10.5",
"static_assertions",
@@ -5862,9 +6610,9 @@ dependencies = [
[[package]]
name = "zbus_macros"
-version = "3.12.0"
+version = "3.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a"
+checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5876,9 +6624,9 @@ dependencies = [
[[package]]
name = "zbus_names"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3"
+checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9"
dependencies = [
"serde",
"static_assertions",
@@ -5887,9 +6635,9 @@ dependencies = [
[[package]]
name = "zip"
-version = "0.6.4"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
dependencies = [
"byteorder",
"crc32fast",
@@ -5899,18 +6647,18 @@ dependencies = [
[[package]]
name = "zune-inflate"
-version = "0.2.53"
+version = "0.2.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "440a08fd59c6442e4b846ea9b10386c38307eae728b216e1ab2c305d1c9daaf8"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
dependencies = [
"simd-adler32",
]
[[package]]
name = "zvariant"
-version = "3.12.0"
+version = "3.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8"
+checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c"
dependencies = [
"byteorder",
"enumflags2",
@@ -5922,9 +6670,9 @@ dependencies = [
[[package]]
name = "zvariant_derive"
-version = "3.12.0"
+version = "3.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a"
+checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5935,16 +6683,11 @@ dependencies = [
[[package]]
name = "zvariant_utils"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b"
+checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
-
-[[patch.unused]]
-name = "egui_dock"
-version = "0.5.0"
-source = "git+https://github.com/Adanos020/egui_dock#9c5154bda8decfb6f187fc1e00e3f16a4115a8b5"
diff --git a/Cargo.toml b/Cargo.toml
index d0f046be..a4fec802 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,19 +18,26 @@ build = "build.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-egui = "0.21"
-eframe = { version = "0.21", features = ["persistence"] }
-egui_extras = { version = "0.21", features = ["svg", "image"] }
-egui-notify = "0.6"
-egui_dock = "0.4"
-catppuccin-egui = "2.0.1"
+egui = "0.22"
+eframe = { version = "0.22", features = [
+ "persistence",
+ "wgpu",
+], default-features = false }
+egui_extras = { version = "0.22", features = ["svg", "image"] }
+egui-notify = { version = "0.9" } # temporary patch
+egui_dock = { version = "0.6" }
+catppuccin-egui = "3.0.0"
+
+glam = { version = "0.24", features = ["bytemuck"] }
image = { version = "0.24", features = ["jpeg", "png"] }
-strum = { version = "0.24.1", features = ["derive"] }
-enum-as-inner = "0.5.1"
-num-traits = "0.2"
-num-derive = "0.3"
+strum = { version = "0.25", features = ["derive"] }
+enum-as-inner = "0.6"
+num_enum = "0.7"
+
+bitflags = "2.3"
+ouroboros = "0.18"
git-version = "0.3"
@@ -40,10 +47,11 @@ parking_lot = { version = "0.12", features = [
"hardware-lock-elision",
] }
atomic_refcell = "0.1.9"
-dashmap = "5.4.0"
+dashmap = "5.5"
+crossbeam = "0.8"
futures = "0.3"
-poll-promise = { version = "0.2.0", features = ["smol"] }
+poll-promise = { version = "0.3.0", features = ["smol"] }
surf = "2.3.2"
slab = { version = "0.4", features = ["serde"] }
@@ -55,46 +63,47 @@ syntect = { version = "5.0", features = [
rand = "0.8.5"
zip = { version = "0.6", default-features = false, features = ["deflate"] }
+notify = "6.0"
+rfd = "0.12"
+camino = "1.1"
-bytemuck = "1"
+bytemuck = { version = "1.14", features = ["derive", "min_const_generics"] }
color-eyre = "0.6"
eyre = "0.6"
+thiserror = "1.0"
paste = "1.0"
cfg-if = "1.0.0"
serde = { version = "1.0", features = ["derive"] }
-alox-48 = { version = "*", path = "alox-48" }
+alox-48 = { version = "0.4.1", default-features = false }
ron = "0.8.0"
+rust-ini = "0.19.0"
tracing = "0.1.37"
tracing-subscriber = "0.3"
-itertools = "0.10"
+itertools = "0.11"
static_assertions = "1.1.0"
-rodio = { version = "0.17.0", features = [
- "symphonia-all",
-], default-features = false }
+rodio = { version = "0.17.1" }
+rustysynth = "1.2"
command-lib = { version = "*", path = "command-lib" }
rmxp-types = { version = "*", path = "rmxp-types" }
luminol-term = { version = "*", path = "luminol-term" }
-rfd = "0.11"
-
steamworks = { version = "0.10.0", optional = true }
+crc = { version = "3.0", optional = true }
[features]
-default = ["generic-tilemap"]
-generic-tilemap = []
-steamworks = ["dep:steamworks"]
+steamworks = ["dep:steamworks", "crc"]
[target.'cfg(windows)'.dependencies]
-windows = { version = "0.46.0", features = ["Win32_System_Registry"] }
-winreg = "0.11.0"
+windows = { version = "0.51.1", features = ["Win32_System_Registry"] }
+winreg = "0.51.0"
[target.'cfg(windows)'.build-dependencies]
winres = "0.1"
@@ -107,29 +116,46 @@ ProductName = "Luminol"
[profile.release]
opt-level = 3
lto = "fat"
+debug = true
# Enable only a small amount of optimization in debug mode
[profile.dev]
opt-level = 1
-# Enable max optimizations for dependencies, but not for our code:
-[profile.dev.package."*"]
+# Enable max optimizations for certain dependencies, but not for our code
+# These dependencies are "hot" in that they are used quite frequently
+
+# Ui
+[profile.dev.package.egui]
+opt-level = 3
+
+[profile.dev.package.eframe]
+opt-level = 3
+
+# Audio
+[profile.dev.package.rodio]
+opt-level = 3
+
+[profile.dev.package.rustysynth]
+opt-level = 3
+
+# Graphics
+[profile.dev.package.wgpu]
+opt-level = 3
+
+[profile.dev.package.image]
+opt-level = 3
+
+[profile.dev.package.glam]
opt-level = 3
# See why config is set up this way.
# https://bevy-cheatbook.github.io/pitfalls/performance.html#why-not-use---release
[workspace]
-members = ["alox-48", "command-lib", "rmxp-types", "luminol-term"]
+members = ["command-lib", "rmxp-types", "luminol-term"]
[patch.crates-io]
-poll-promise = { git = "https://github.com/EmbarkStudios/poll-promise", rev = "8c4d0d6e4d693cf54e9306950cb2f6d271c77080" }
-egui_dock = { git = "https://github.com/Adanos020/egui_dock" }
-# js-sys = { git = "https://github.com/Speak2Erase/wasm-bindgen-filesystem-access-api" }
-# web-sys = { git = "https://github.com/Speak2Erase/wasm-bindgen-filesystem-access-api" }
-# wasm-bindgen = { git = "https://github.com/Speak2Erase/wasm-bindgen-filesystem-access-api" }
-
-
# If you want to use the bleeding edge version of egui and eframe:
# egui = { git = "https://github.com/emilk/egui", branch = "master" }
# eframe = { git = "https://github.com/emilk/egui", branch = "master" }
diff --git a/README.md b/README.md
index 8565c215..a074bc9a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,8 @@ Luminol *may* use `Lua` for plugins in the future. It is something I am actively
- [@Speak2Erase](https://github.com/Speak2Erase): Luminol's main contributor
- [@somedevfox](https://github.com/somedevfox): Occasional contributor and creator of rsgss (a sister project of Luminol)
-- [@Lionmeow](https://github.com/Lionmeow) designer of Luminol's icon and Lumi
+- [@white-axe](https://github.com/white-axe): New contributor
+- [@Lionmeow](https://github.com/Lionmeow): Designer of Luminol's icon and Lumi
## RGSS version support
@@ -40,6 +41,9 @@ Compatibility:
Native builds are the main focus at the moment, but no official releases will be made until Luminol is stable.
Instead, you will have to compile luminol yourself, by grabbing your favorite nightly rust toolchain from [rustup](https://rustup.rs) and running `cargo build`.
+
+If you are on Linux, you will also need to grab clang and mold from your package manager.
+
Luminol has like a bajillion dependencies right now so it may take upwards of 15 minutes to compile.
**You can not use one of the stable release channels.**
@@ -60,10 +64,10 @@ Basic functionality:
- [ ] Edit event commands
- [x] View event commands
- [x] Change tiles on map
-- [ ] Multiple brush types
-- [ ] Change autotiles on map
-- [ ] Hardware accelerated tilemap
-- [ ] Properly render blend modes and opacity
+- [x] Multiple brush types
+- [x] Change autotiles on map
+- [x] Hardware accelerated tilemap
+- [x] Properly render blend modes and opacity
- [x] Sound test
- [ ] Actor editor
- [ ] Class editor
diff --git a/alox-48 b/alox-48
deleted file mode 160000
index 833dfc7b..00000000
--- a/alox-48
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 833dfc7bc5c8c3ce0b5bff6b8f9c9050341e687b
diff --git a/command-lib/Cargo.toml b/command-lib/Cargo.toml
index 05b6c8ad..453ad195 100644
--- a/command-lib/Cargo.toml
+++ b/command-lib/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
[dependencies]
serde = { version = "1.0", features = ["derive"] }
-strum = { version = "0.24", features = ["derive"] }
+strum = { version = "0.25", features = ["derive"] }
rand = "0.8.5"
diff --git a/luminol-term/Cargo.toml b/luminol-term/Cargo.toml
index b3132078..b5d2f627 100644
--- a/luminol-term/Cargo.toml
+++ b/luminol-term/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-egui = "0.21.0"
+egui = "0.22.0"
# termwiz = "0.20.0"
crossbeam-channel = "0.5"
@@ -16,4 +16,4 @@ portable-pty = { version = "0.8.1", git = "https://github.com/wez/wezterm", rev
termwiz = { version = "0.22.0", git = "https://github.com/wez/wezterm", rev = "3666303c7b26c6c966b3f136dbb954686d334cc3" }
[dev-dependencies]
-eframe = "0.21.0"
+eframe = "0.22.0"
diff --git a/luminol-term/src/lib.rs b/luminol-term/src/lib.rs
index 57c11771..39f00e47 100644
--- a/luminol-term/src/lib.rs
+++ b/luminol-term/src/lib.rs
@@ -71,12 +71,10 @@ impl Terminal {
loop {
let Ok(len) = reader.read(&mut buf) else {
- return
+ return;
};
let actions = parser.parse_as_vec(&buf[0..len]);
- let Ok(_) = sender.send(actions) else {
- return
- };
+ let Ok(_) = sender.send(actions) else { return };
}
});
diff --git a/rmxp-types/Cargo.toml b/rmxp-types/Cargo.toml
index 81fc71da..32c2d97e 100644
--- a/rmxp-types/Cargo.toml
+++ b/rmxp-types/Cargo.toml
@@ -7,13 +7,15 @@ edition = "2021"
[dependencies]
serde = { version = "1.0", features = ["derive"] }
-alox-48 = { version = "*", path = "../alox-48" }
+alox-48 = { version = "0.4.1", default-features = false }
bytemuck = { version = "1.13.1", features = ["extern_crate_alloc"] }
num-traits = "0.2"
num-derive = "0.3"
slab = { version = "0.4", features = ["serde"] }
-strum = { version = "0.24.1", features = ["derive"] }
+strum = { version = "0.25", features = ["derive"] }
paste = "1.0"
+camino = "1.1"
+num_enum = "0.6"
rand = "0.8.5"
flate2 = "1.0"
diff --git a/rmxp-types/src/helpers/id.rs b/rmxp-types/src/helpers/id.rs
new file mode 100644
index 00000000..902328b0
--- /dev/null
+++ b/rmxp-types/src/helpers/id.rs
@@ -0,0 +1,36 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+pub fn deserialize<'de, D>(deserializer: D) -> Result
+where
+ D: serde::Deserializer<'de>,
+{
+ use serde::Deserialize;
+
+ let id = std::num::NonZeroUsize::deserialize(deserializer)?;
+
+ Ok(id.get() - 1)
+}
+
+pub fn serialize(value: &usize, serializer: S) -> Result
+where
+ S: serde::Serializer,
+{
+ use serde::Serialize;
+
+ (value + 1).serialize(serializer)
+}
diff --git a/rmxp-types/src/helpers/id_vec.rs b/rmxp-types/src/helpers/id_vec.rs
new file mode 100644
index 00000000..179c2f83
--- /dev/null
+++ b/rmxp-types/src/helpers/id_vec.rs
@@ -0,0 +1,61 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+pub fn deserialize<'de, D>(deserializer: D) -> Result, D::Error>
+where
+ D: serde::Deserializer<'de>,
+{
+ struct Visitor;
+
+ impl<'de> serde::de::Visitor<'de> for Visitor {
+ type Value = Vec;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+ formatter.write_str("a vec of nonzero usizes")
+ }
+
+ fn visit_seq(self, mut seq: A) -> Result
+ where
+ A: serde::de::SeqAccess<'de>,
+ {
+ let mut values = Vec::with_capacity(seq.size_hint().unwrap_or(0));
+
+ while let Some(value) = seq.next_element::()? {
+ values.push(value.get() - 1);
+ }
+
+ Ok(values)
+ }
+ }
+
+ deserializer.deserialize_seq(Visitor)
+}
+
+pub fn serialize(values: &Vec, serializer: S) -> Result
+where
+ S: serde::Serializer,
+{
+ use serde::ser::SerializeSeq;
+
+ let mut seq = serializer.serialize_seq(Some(values.len()))?;
+
+ for value in values {
+ seq.serialize_element(value)?;
+ }
+
+ seq.end()
+}
diff --git a/rmxp-types/src/helpers/mod.rs b/rmxp-types/src/helpers/mod.rs
new file mode 100644
index 00000000..f2ecdf10
--- /dev/null
+++ b/rmxp-types/src/helpers/mod.rs
@@ -0,0 +1,26 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+pub mod id;
+pub mod id_vec;
+pub mod nil_padded;
+pub mod optional_id;
+pub mod optional_path;
+
+mod parameter_type;
+
+pub use parameter_type::*;
diff --git a/rmxp-types/src/helpers/nil_padded.rs b/rmxp-types/src/helpers/nil_padded.rs
new file mode 100644
index 00000000..5587114d
--- /dev/null
+++ b/rmxp-types/src/helpers/nil_padded.rs
@@ -0,0 +1,79 @@
+// Copyright (C) 2022 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+pub fn deserialize<'de, D, T>(deserializer: D) -> Result, D::Error>
+where
+ D: serde::Deserializer<'de>,
+ T: serde::Deserialize<'de>,
+{
+ struct Visitor {
+ _marker: core::marker::PhantomData,
+ }
+
+ impl<'de, T> serde::de::Visitor<'de> for Visitor
+ where
+ T: serde::Deserialize<'de>,
+ {
+ type Value = Vec;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ formatter.write_str("a nil padded array")
+ }
+
+ fn visit_seq(self, mut seq: A) -> Result
+ where
+ A: serde::de::SeqAccess<'de>,
+ {
+ use serde::de::Error;
+
+ let mut values = Vec::with_capacity(seq.size_hint().unwrap_or(0));
+
+ if let Some(v) = seq.next_element::>()? {
+ if v.is_some() {
+ return Err(A::Error::custom("the first element was not nil"));
+ }
+ }
+
+ while let Some(ele) = seq.next_element::()? {
+ values.push(ele);
+ }
+
+ Ok(values)
+ }
+ }
+
+ deserializer.deserialize_seq(Visitor {
+ _marker: core::marker::PhantomData,
+ })
+}
+
+pub fn serialize(elements: &[T], serializer: S) -> Result
+where
+ S: serde::Serializer,
+ T: serde::Serialize,
+{
+ use serde::ser::SerializeSeq;
+
+ let mut seq = serializer.serialize_seq(Some(elements.len() + 1))?;
+ seq.serialize_element(&None::)?;
+
+ for v in elements {
+ seq.serialize_element(v)?;
+ }
+
+ seq.end()
+}
diff --git a/rmxp-types/src/helpers/optional_id.rs b/rmxp-types/src/helpers/optional_id.rs
new file mode 100644
index 00000000..7af74a2b
--- /dev/null
+++ b/rmxp-types/src/helpers/optional_id.rs
@@ -0,0 +1,40 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+pub fn deserialize<'de, D>(deserializer: D) -> Result, D::Error>
+where
+ D: serde::Deserializer<'de>,
+{
+ use serde::Deserialize;
+
+ Ok(match usize::deserialize(deserializer)? {
+ 0 => None,
+ v => Some(v - 1),
+ })
+}
+
+pub fn serialize(value: &Option, serializer: S) -> Result
+where
+ S: serde::Serializer,
+{
+ use serde::Serialize;
+
+ match value {
+ Some(v) => (v + 1).serialize(serializer),
+ None => 0.serialize(serializer),
+ }
+}
diff --git a/rmxp-types/src/helpers/optional_path.rs b/rmxp-types/src/helpers/optional_path.rs
new file mode 100644
index 00000000..da081415
--- /dev/null
+++ b/rmxp-types/src/helpers/optional_path.rs
@@ -0,0 +1,66 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use camino::Utf8PathBuf;
+
+pub fn serialize(path: &Option, serializer: S) -> Result
+where
+ S: serde::Serializer,
+{
+ match path {
+ Some(path) => serializer.serialize_str(path.as_str()),
+ None => serializer.serialize_str(""),
+ }
+}
+
+pub fn deserialize<'de, D>(deserializer: D) -> Result, D::Error>
+where
+ D: serde::Deserializer<'de>,
+{
+ struct Visitor;
+
+ impl serde::de::Visitor<'_> for Visitor {
+ type Value = Option;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+ formatter.write_str("a string")
+ }
+
+ fn visit_str(self, v: &str) -> Result
+ where
+ E: serde::de::Error,
+ {
+ if v.is_empty() {
+ Ok(None)
+ } else {
+ Ok(Some(v.into()))
+ }
+ }
+
+ fn visit_string(self, v: String) -> Result
+ where
+ E: serde::de::Error,
+ {
+ if v.is_empty() {
+ Ok(None)
+ } else {
+ Ok(Some(v.into()))
+ }
+ }
+ }
+
+ deserializer.deserialize_string(Visitor)
+}
diff --git a/rmxp-types/src/parameter_type.rs b/rmxp-types/src/helpers/parameter_type.rs
similarity index 98%
rename from rmxp-types/src/parameter_type.rs
rename to rmxp-types/src/helpers/parameter_type.rs
index e64dd672..f242ba5c 100644
--- a/rmxp-types/src/parameter_type.rs
+++ b/rmxp-types/src/helpers/parameter_type.rs
@@ -23,10 +23,9 @@
// Program grant you additional permission to convey the resulting work.
use crate::rgss_structs::{Color, Tone};
-use crate::rpg::{AudioFile, MoveCommand, MoveRoute};
-use serde::{Deserialize, Serialize};
+use crate::shared::{AudioFile, MoveCommand, MoveRoute};
-#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Default)]
+#[derive(Debug, serde::Deserialize, serde::Serialize, Clone, PartialEq, Default)]
#[allow(missing_docs)]
#[serde(from = "alox_48::Value")]
#[serde(into = "alox_48::Value")]
diff --git a/rmxp-types/src/lib.rs b/rmxp-types/src/lib.rs
index 8e68caf3..c694fe45 100644
--- a/rmxp-types/src/lib.rs
+++ b/rmxp-types/src/lib.rs
@@ -1,12 +1,41 @@
#![feature(min_specialization)]
+#![allow(non_upper_case_globals)]
+
+// Editor specific types
+pub mod rmxp;
+
+// Shared structs with the same layout
+mod shared;
+
+mod option_vec;
-mod nil_padded;
-mod parameter_type;
mod rgss_structs;
-pub mod rmxp_structs;
+mod helpers;
-pub use nil_padded::NilPadded;
-pub use parameter_type::ParameterType;
+pub use helpers::*;
+pub use option_vec::OptionVec;
pub use rgss_structs::{Color, Table1, Table2, Table3, Tone};
-pub use rmxp_structs as rpg;
+
+pub mod rpg {
+ pub use crate::rmxp::*;
+ pub use crate::shared::*;
+
+ pub type Actors = Vec;
+ pub type Animations = Vec;
+ pub type Armors = Vec;
+ pub type Classes = Vec;
+ pub type CommonEvents = Vec;
+ pub type Enemies = Vec;
+ pub type Items = Vec- ;
+ pub type MapInfos = std::collections::HashMap;
+ pub type Skills = Vec;
+ pub type States = Vec;
+ pub type Tilesets = Vec;
+ pub type Troops = Vec;
+ pub type Weapons = Vec;
+}
+
+pub use shared::BlendMode;
+
+pub type Path = Option;
diff --git a/rmxp-types/src/nil_padded.rs b/rmxp-types/src/nil_padded.rs
deleted file mode 100644
index 45559c0c..00000000
--- a/rmxp-types/src/nil_padded.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use std::ops::{Deref, DerefMut};
-
-// Copyright (C) 2023 Lily Lyons
-//
-// This file is part of Luminol.
-//
-// Luminol is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Luminol is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Luminol. If not, see .
-//
-// Additional permission under GNU GPL version 3 section 7
-//
-// If you modify this Program, or any covered work, by linking or combining
-// it with Steamworks API by Valve Corporation, containing parts covered by
-// terms of the Steamworks API by Valve Corporation, the licensors of this
-// Program grant you additional permission to convey the resulting work.
-
-/// An array that is serialized and deserialized as padded with a None element.
-#[derive(Debug, Clone)]
-pub struct NilPadded(pub Vec);
-
-impl<'de, T> serde::Deserialize<'de> for NilPadded
-where
- T: serde::Deserialize<'de>,
-{
- fn deserialize(deserializer: D) -> Result
- where
- D: serde::Deserializer<'de>,
- {
- struct Visitor {
- _marker: core::marker::PhantomData,
- }
-
- impl<'de, T> serde::de::Visitor<'de> for Visitor
- where
- T: serde::Deserialize<'de>,
- {
- type Value = NilPadded;
-
- fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- formatter.write_str("a nil padded array")
- }
-
- fn visit_seq(self, mut seq: A) -> Result
- where
- A: serde::de::SeqAccess<'de>,
- {
- use serde::de::Error;
-
- let mut values = Vec::with_capacity(seq.size_hint().unwrap_or(0));
-
- if let Some(v) = seq.next_element::>()? {
- if v.is_some() {
- return Err(A::Error::custom("the first element was not nil"));
- }
- }
-
- while let Some(ele) = seq.next_element::()? {
- values.push(ele);
- }
-
- Ok(values.into())
- }
- }
-
- deserializer.deserialize_seq(Visitor {
- _marker: core::marker::PhantomData,
- })
- }
-}
-
-impl serde::Serialize for NilPadded
-where
- T: serde::Serialize,
-{
- fn serialize
(&self, serializer: S) -> Result
- where
- S: serde::Serializer,
- {
- use serde::ser::SerializeSeq;
-
- let mut seq = serializer.serialize_seq(Some(self.len() + 1))?;
- seq.serialize_element(&None::)?;
-
- for v in self.iter() {
- seq.serialize_element(v)?;
- }
-
- seq.end()
- }
-}
-
-impl Deref for NilPadded {
- type Target = Vec;
-
- fn deref(&self) -> &Self::Target {
- &self.0
- }
-}
-
-impl DerefMut for NilPadded {
- fn deref_mut(&mut self) -> &mut Self::Target {
- &mut self.0
- }
-}
-
-impl Default for NilPadded {
- fn default() -> Self {
- Self(vec![])
- }
-}
-
-impl From>> for NilPadded {
- fn from(value: Vec>) -> Self {
- let mut iter = value.into_iter();
-
- assert!(
- iter.next()
- .expect("there should be at least one element")
- .is_none(),
- "the array should be padded with nil at the first index"
- );
- Self(iter.flatten().collect())
- }
-}
-
-impl From> for NilPadded {
- fn from(value: Vec) -> Self {
- Self(value)
- }
-}
diff --git a/rmxp-types/src/option_vec.rs b/rmxp-types/src/option_vec.rs
new file mode 100644
index 00000000..9f22d188
--- /dev/null
+++ b/rmxp-types/src/option_vec.rs
@@ -0,0 +1,250 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+use std::ops::{Index, IndexMut};
+
+use serde::ser::SerializeMap;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+/// A vector that can contain unused indices.
+pub struct OptionVec {
+ vec: Vec>,
+ num_values: usize,
+}
+
+pub struct Iter<'a, T> {
+ vec_iter: std::iter::Enumerate>>,
+}
+
+pub struct IterMut<'a, T> {
+ vec_iter: std::iter::Enumerate>>,
+}
+
+pub struct Visitor(std::marker::PhantomData);
+
+impl OptionVec {
+ /// Create a new OptionVec with no elements.
+ pub fn new() -> Self {
+ Self {
+ vec: Vec::new(),
+ num_values: 0,
+ }
+ }
+
+ pub fn len(&self) -> usize {
+ self.vec.len()
+ }
+
+ pub fn size(&self) -> usize {
+ self.num_values
+ }
+
+ pub fn is_empty(&self) -> bool {
+ self.vec.is_empty()
+ }
+
+ pub fn get(&self, index: usize) -> Option<&T> {
+ self.vec.get(index).and_then(|x| x.as_ref())
+ }
+
+ pub fn get_mut(&mut self, index: usize) -> Option<&mut T> {
+ self.vec.get_mut(index).and_then(|x| x.as_mut())
+ }
+
+ pub fn capacity(&self) -> usize {
+ self.vec.capacity()
+ }
+
+ pub fn reserve(&mut self, additional: usize) {
+ self.vec.reserve(additional);
+ }
+
+ pub fn iter(&self) -> Iter<'_, T> {
+ self.into_iter()
+ }
+
+ pub fn iter_mut(&mut self) -> IterMut<'_, T> {
+ self.into_iter()
+ }
+
+ /// Write the element at the given index.
+ /// If there is already an element at the given index, it will be overwritten.
+ /// If there isn't, a new element will be added at that index.
+ pub fn insert(&mut self, index: usize, element: T) {
+ if index >= self.len() {
+ let additional = index - self.len() + 1;
+ self.reserve(additional);
+ self.vec
+ .extend(std::iter::repeat_with(|| None).take(additional));
+ }
+ if self.vec[index].is_none() {
+ self.num_values += 1;
+ }
+ self.vec[index] = Some(element);
+ }
+
+ /// Remove the element at the given index.
+ /// If the OptionVec is not big enough to contain this index, this will throw an error.
+ /// If there isn't an element at that index, this will throw an error.
+ pub fn try_remove(&mut self, index: usize) -> Result<(), String> {
+ if index >= self.len() {
+ Err(String::from("index out of bounds"))
+ } else if self.vec[index].is_none() {
+ Err(String::from("index not found"))
+ } else {
+ self.num_values -= 1;
+ self.vec[index] = None;
+ Ok(())
+ }
+ }
+
+ /// Remove the element at the given index.
+ /// If the OptionVec is not big enough to contain this index, this will panic.
+ /// If there isn't an element at that index, this will panic.
+ pub fn remove(&mut self, index: usize) {
+ self.try_remove(index).unwrap()
+ }
+}
+
+impl Default for OptionVec {
+ fn default() -> Self {
+ OptionVec::new()
+ }
+}
+
+impl FromIterator<(usize, T)> for OptionVec {
+ fn from_iter>(iterable: I) -> Self {
+ let mut vec = Vec::new();
+ let mut num_values = 0;
+ for (i, v) in iterable.into_iter() {
+ if i >= vec.len() {
+ let additional = i - vec.len() + 1;
+ vec.reserve(additional);
+ vec.extend(std::iter::repeat_with(|| None).take(additional));
+ }
+ if vec[i].is_none() {
+ num_values += 1;
+ }
+ vec[i] = Some(v);
+ }
+ Self { vec, num_values }
+ }
+}
+
+impl Index for OptionVec {
+ type Output = T;
+ fn index(&self, index: usize) -> &Self::Output {
+ self.get(index).expect("index not found")
+ }
+}
+
+impl IndexMut for OptionVec {
+ fn index_mut(&mut self, index: usize) -> &mut Self::Output {
+ self.get_mut(index).expect("index not found")
+ }
+}
+
+impl<'a, T> IntoIterator for &'a OptionVec {
+ type Item = (usize, &'a T);
+ type IntoIter = Iter<'a, T>;
+ fn into_iter(self) -> Self::IntoIter {
+ Self::IntoIter {
+ vec_iter: self.vec.iter().enumerate(),
+ }
+ }
+}
+
+impl<'a, T> IntoIterator for &'a mut OptionVec {
+ type Item = (usize, &'a mut T);
+ type IntoIter = IterMut<'a, T>;
+ fn into_iter(self) -> Self::IntoIter {
+ Self::IntoIter {
+ vec_iter: self.vec.iter_mut().enumerate(),
+ }
+ }
+}
+
+impl<'a, T> Iterator for Iter<'a, T> {
+ type Item = (usize, &'a T);
+ fn next(&mut self) -> Option {
+ for (index, element) in &mut self.vec_iter {
+ if let Some(element) = element {
+ return Some((index, element));
+ }
+ }
+ None
+ }
+}
+
+impl<'a, T> Iterator for IterMut<'a, T> {
+ type Item = (usize, &'a mut T);
+ fn next(&mut self) -> Option {
+ for (index, element) in &mut self.vec_iter {
+ if let Some(element) = element {
+ return Some((index, element));
+ }
+ }
+ None
+ }
+}
+
+impl<'de, T> serde::de::Visitor<'de> for Visitor
+where
+ T: serde::Deserialize<'de>,
+{
+ type Value = OptionVec;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+ formatter.write_str("a key-value mapping")
+ }
+
+ fn visit_map(self, mut map: A) -> Result
+ where
+ A: serde::de::MapAccess<'de>,
+ {
+ std::iter::from_fn(|| map.next_entry().transpose()).collect()
+ }
+}
+
+impl<'de, T> serde::Deserialize<'de> for OptionVec
+where
+ T: serde::Deserialize<'de>,
+{
+ fn deserialize(deserializer: D) -> Result
+ where
+ D: serde::Deserializer<'de>,
+ {
+ deserializer.deserialize_map(Visitor(std::marker::PhantomData))
+ }
+}
+
+impl serde::Serialize for OptionVec
+where
+ T: serde::Serialize,
+{
+ fn serialize(&self, serializer: S) -> Result
+ where
+ S: serde::Serializer,
+ {
+ let mut ser = serializer.serialize_map(Some(self.size()))?;
+ for (index, element) in self {
+ ser.serialize_key(&index)?;
+ ser.serialize_value(element)?;
+ }
+ ser.end()
+ }
+}
diff --git a/rmxp-types/src/rgss_structs.rs b/rmxp-types/src/rgss_structs.rs
index bf8812dc..e9e187d4 100644
--- a/rmxp-types/src/rgss_structs.rs
+++ b/rmxp-types/src/rgss_structs.rs
@@ -158,8 +158,12 @@ impl Table1 {
self.data.is_empty()
}
- /// Return an iterator over all the elements in the table.
- pub fn iter(&self) -> Iter<'_, i16> {
+ pub fn resize(&mut self, xsize: usize) {
+ self.data.resize(xsize, 0);
+ self.xsize = xsize;
+ }
+
+ pub fn iter(&self) -> impl Iterator- {
self.data.iter()
}
}
@@ -261,8 +265,22 @@ impl Table2 {
self.data.is_empty()
}
- /// Return an iterator over all the elements in the table.
- pub fn iter(&self) -> Iter<'_, i16> {
+ pub fn resize(&mut self, xsize: usize, ysize: usize) {
+ let mut new_data = vec![0; xsize * ysize];
+
+ for y in 0..self.ysize.min(ysize) {
+ for x in 0..self.xsize.min(xsize) {
+ new_data[xsize * y + x] = self[(x, y)]
+ }
+ }
+
+ self.xsize = xsize;
+ self.ysize = ysize;
+
+ self.data = new_data;
+ }
+
+ pub fn iter(&self) -> impl Iterator
- {
self.data.iter()
}
}
@@ -335,8 +353,6 @@ impl From for alox_48::Userdata {
}
}
-use std::slice::Iter;
-
impl Table3 {
/// Create a new 3D table with a width of xsize, a height of ysize, and a depth of zsize.
#[must_use]
@@ -349,6 +365,17 @@ impl Table3 {
}
}
+ #[must_use]
+ pub fn new_data(xsize: usize, ysize: usize, zsize: usize, data: Vec) -> Self {
+ assert_eq!(xsize * ysize * zsize, data.len());
+ Self {
+ xsize,
+ ysize,
+ zsize,
+ data,
+ }
+ }
+
/// Width of the table.
#[must_use]
pub fn xsize(&self) -> usize {
@@ -379,8 +406,26 @@ impl Table3 {
self.data.is_empty()
}
- /// Return an iterator over all the elements in the table.
- pub fn iter(&self) -> Iter<'_, i16> {
+ pub fn resize(&mut self, xsize: usize, ysize: usize, zsize: usize) {
+ let mut new_data = vec![0; xsize * ysize];
+
+ // A naive for loop like this is optimized to a handful of memcpys.
+ for z in 0..self.zsize.min(zsize) {
+ for y in 0..self.ysize.min(ysize) {
+ for x in 0..self.xsize.min(xsize) {
+ new_data[(xsize * ysize * z) + (xsize * y) + x] = self[(x, y, z)]
+ }
+ }
+ }
+
+ self.xsize = xsize;
+ self.ysize = ysize;
+ self.zsize = zsize;
+
+ self.data = new_data;
+ }
+
+ pub fn iter(&self) -> impl Iterator
- {
self.data.iter()
}
}
@@ -389,12 +434,12 @@ impl Index<(usize, usize, usize)> for Table3 {
type Output = i16;
fn index(&self, index: (usize, usize, usize)) -> &Self::Output {
- &self.data[index.0 + (index.1 * self.xsize) + (index.2 * self.ysize)]
+ &self.data[index.0 + self.xsize * (index.1 + self.ysize * index.2)]
}
}
impl IndexMut<(usize, usize, usize)> for Table3 {
fn index_mut(&mut self, index: (usize, usize, usize)) -> &mut Self::Output {
- &mut self.data[index.0 + (index.1 * self.xsize) + (index.2 * self.ysize)]
+ &mut self.data[index.0 + self.xsize * (index.1 + self.ysize * index.2)]
}
}
diff --git a/rmxp-types/src/rmxp/actor.rs b/rmxp-types/src/rmxp/actor.rs
new file mode 100644
index 00000000..ede11fc5
--- /dev/null
+++ b/rmxp-types/src/rmxp/actor.rs
@@ -0,0 +1,53 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use crate::{id, optional_id, optional_path, Path, Table2};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Actor")]
+pub struct Actor {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ #[serde(with = "id")]
+ pub class_id: usize,
+ pub initial_level: i32,
+ pub final_level: i32,
+ pub exp_basis: i32,
+ pub exp_inflation: i32,
+ #[serde(with = "optional_path")]
+ pub character_name: Path,
+ pub character_hue: i32,
+ #[serde(with = "optional_path")]
+ pub battler_name: Path,
+ pub battler_hue: i32,
+ pub parameters: Table2,
+ #[serde(with = "optional_id")]
+ pub weapon_id: Option,
+ #[serde(with = "optional_id")]
+ pub armor1_id: Option,
+ #[serde(with = "optional_id")]
+ pub armor2_id: Option,
+ #[serde(with = "optional_id")]
+ pub armor3_id: Option,
+ #[serde(with = "optional_id")]
+ pub armor4_id: Option,
+ pub weapon_fix: bool,
+ pub armor1_fix: bool,
+ pub armor2_fix: bool,
+ pub armor3_fix: bool,
+ pub armor4_fix: bool,
+}
diff --git a/rmxp-types/src/rmxp/animation.rs b/rmxp-types/src/rmxp/animation.rs
new file mode 100644
index 00000000..607b02e7
--- /dev/null
+++ b/rmxp-types/src/rmxp/animation.rs
@@ -0,0 +1,69 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use crate::{id, optional_path, rpg::AudioFile, Color, Path, Table2};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Animation")]
+pub struct Animation {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ #[serde(with = "optional_path")]
+ pub animation_name: Path,
+ pub animation_hue: i32,
+ pub position: Position,
+ pub frame_max: i32,
+ pub frames: Vec,
+ pub timings: Vec,
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Animation::Timing")]
+pub struct Timing {
+ pub frame: i32,
+ pub se: AudioFile,
+ pub flash_scope: i32,
+ pub flash_color: Color,
+ pub flash_duration: i32,
+ pub condition: i32,
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Animation::Frame")]
+pub struct Frame {
+ pub cell_max: i32,
+ pub cell_data: Table2,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Default)]
+#[derive(
+ num_enum::TryFromPrimitive,
+ num_enum::IntoPrimitive,
+ strum::Display,
+ strum::EnumIter
+)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[repr(u8)]
+#[serde(into = "u8")]
+#[serde(try_from = "u8")]
+pub enum Position {
+ Top = 0,
+ #[default]
+ Middle = 1,
+ Bottom = 2,
+ Screen = 3,
+}
diff --git a/rmxp-types/src/rmxp/armor.rs b/rmxp-types/src/rmxp/armor.rs
new file mode 100644
index 00000000..a1f86e1e
--- /dev/null
+++ b/rmxp-types/src/rmxp/armor.rs
@@ -0,0 +1,63 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use crate::{id, id_vec, optional_id, optional_path, Path};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Armor")]
+pub struct Armor {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ #[serde(with = "optional_path")]
+ pub icon_name: Path,
+ pub description: String,
+ pub kind: Kind,
+ #[serde(with = "optional_id")]
+ pub auto_state_id: Option,
+ pub price: i32,
+ pub pdef: i32,
+ pub mdef: i32,
+ pub eva: i32,
+ pub str_plus: i32,
+ pub dex_plus: i32,
+ pub agi_plus: i32,
+ pub int_plus: i32,
+ #[serde(with = "id_vec")]
+ pub guard_element_set: Vec,
+ #[serde(with = "id_vec")]
+ pub guard_state_set: Vec,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Default)]
+#[derive(
+ num_enum::TryFromPrimitive,
+ num_enum::IntoPrimitive,
+ strum::Display,
+ strum::EnumIter
+)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[repr(u8)]
+#[serde(into = "u8")]
+#[serde(try_from = "u8")]
+pub enum Kind {
+ #[default]
+ Shield = 0,
+ Helmet = 1,
+ #[strum(to_string = "Body Armor")]
+ BodyArmor = 2,
+ Accessory = 3,
+}
diff --git a/rmxp-types/src/rmxp/class.rs b/rmxp-types/src/rmxp/class.rs
new file mode 100644
index 00000000..ea457f6f
--- /dev/null
+++ b/rmxp-types/src/rmxp/class.rs
@@ -0,0 +1,59 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+pub use crate::{id, id_vec, Table1};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Class")]
+pub struct Class {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ pub position: Position,
+ #[serde(with = "id_vec")]
+ pub weapon_set: Vec,
+ #[serde(with = "id_vec")]
+ pub armor_set: Vec,
+ pub element_ranks: Table1,
+ pub state_ranks: Table1,
+ pub learnings: Vec,
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Class::Learning")]
+pub struct Learning {
+ pub level: i32,
+ #[serde(with = "id")]
+ pub skill_id: usize,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Default)]
+#[derive(
+ num_enum::TryFromPrimitive,
+ num_enum::IntoPrimitive,
+ strum::Display,
+ strum::EnumIter
+)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[repr(u8)]
+#[serde(into = "u8")]
+#[serde(try_from = "u8")]
+pub enum Position {
+ #[default]
+ Front = 0,
+ Middle = 1,
+ Rear = 2,
+}
diff --git a/rmxp-types/src/rmxp/enemy.rs b/rmxp-types/src/rmxp/enemy.rs
new file mode 100644
index 00000000..6b2566cf
--- /dev/null
+++ b/rmxp-types/src/rmxp/enemy.rs
@@ -0,0 +1,71 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+pub use crate::{id, optional_id, optional_path, Path, Table1};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Enemy")]
+pub struct Enemy {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ #[serde(with = "optional_path")]
+ pub battler_name: Path,
+ pub battler_hue: i32,
+ pub maxhp: i32,
+ pub maxsp: i32,
+ pub str: i32,
+ pub dex: i32,
+ pub agi: i32,
+ pub int: i32,
+ pub atk: i32,
+ pub pdef: i32,
+ pub mdef: i32,
+ pub eva: i32,
+ #[serde(with = "optional_id")]
+ pub animation1_id: Option,
+ #[serde(with = "optional_id")]
+ pub animation2_id: Option,
+ pub element_ranks: Table1,
+ pub state_ranks: Table1,
+ pub actions: Vec,
+ pub exp: i32,
+ // FIXME: make optional
+ pub gold: i32,
+ #[serde(with = "optional_id")]
+ pub item_id: Option,
+ #[serde(with = "optional_id")]
+ pub weapon_id: Option,
+ #[serde(with = "optional_id")]
+ pub armor_id: Option,
+ pub treasure_prob: i32,
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Enemy::Action")]
+pub struct Action {
+ pub kind: i32,
+ pub basic: i32,
+ #[serde(with = "optional_id")]
+ pub skill_id: Option,
+ pub condition_turn_a: i32,
+ pub condition_turn_b: i32,
+ pub condition_hp: i32,
+ pub condition_level: i32,
+ #[serde(with = "optional_id")]
+ pub condition_switch_id: Option,
+ pub rating: i32,
+}
diff --git a/rmxp-types/src/rmxp/item.rs b/rmxp-types/src/rmxp/item.rs
new file mode 100644
index 00000000..3ef8f634
--- /dev/null
+++ b/rmxp-types/src/rmxp/item.rs
@@ -0,0 +1,133 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+pub use crate::{id, id_vec, optional_id, optional_path, rpg::AudioFile, Path};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[serde(rename = "RPG::Item")]
+pub struct Item {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ pub icon_name: String,
+ pub description: String,
+ pub scope: Scope,
+ pub occasion: Occasion,
+ #[serde(with = "optional_id")]
+ pub animation1_id: Option,
+ #[serde(with = "optional_id")]
+ pub animation2_id: Option,
+ pub menu_se: AudioFile,
+ #[serde(with = "optional_id")]
+ pub common_event_id: Option,
+ pub price: i32,
+ pub consumable: bool,
+ pub parameter_type: ParameterType,
+ pub parameter_points: i32,
+ pub recover_hp_rate: i32,
+ pub recover_hp: i32,
+ // These fields are missing in rmxp data *sometimes*.
+ // Why? Who knows!
+ #[serde(default)]
+ pub recover_sp_rate: i32,
+ #[serde(default)]
+ pub recover_sp: i32,
+ pub hit: i32,
+ pub pdef_f: i32,
+ pub mdef_f: i32,
+ pub variance: i32,
+ #[serde(with = "id_vec")]
+ pub element_set: Vec,
+ #[serde(with = "id_vec")]
+ pub plus_state_set: Vec,
+ #[serde(with = "id_vec")]
+ pub minus_state_set: Vec,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Default)]
+#[derive(
+ num_enum::TryFromPrimitive,
+ num_enum::IntoPrimitive,
+ strum::Display,
+ strum::EnumIter
+)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[repr(u8)]
+#[serde(into = "u8")]
+#[serde(try_from = "u8")]
+pub enum Scope {
+ #[default]
+ None = 0,
+ #[strum(to_string = "One Enemy")]
+ OneEnemy = 1,
+ #[strum(to_string = "All Enemies")]
+ AllEnemies = 2,
+ #[strum(to_string = "One Ally")]
+ OneAlly = 3,
+ #[strum(to_string = "All Allies")]
+ AllAllies = 4,
+ #[strum(to_string = "One Ally (HP 0)")]
+ OneAllyHP0 = 5,
+ #[strum(to_string = "All Allies (HP 0)")]
+ AllAlliesHP0 = 6,
+ #[strum(to_string = "The User")]
+ User = 7,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Default)]
+#[derive(
+ num_enum::TryFromPrimitive,
+ num_enum::IntoPrimitive,
+ strum::Display,
+ strum::EnumIter
+)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[repr(u8)]
+#[serde(into = "u8")]
+#[serde(try_from = "u8")]
+pub enum Occasion {
+ #[default]
+ Always = 0,
+ #[strum(to_string = "Only in battle")]
+ OnlyBattle = 1,
+ #[strum(to_string = "Only from the menu")]
+ OnlyMenu = 2,
+ Never = 3,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Default)]
+#[derive(
+ num_enum::TryFromPrimitive,
+ num_enum::IntoPrimitive,
+ strum::Display,
+ strum::EnumIter
+)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[repr(u8)]
+#[serde(into = "u8")]
+#[serde(try_from = "u8")]
+pub enum ParameterType {
+ #[default]
+ None = 0,
+ #[strum(to_string = "Max HP")]
+ MaxHP = 1,
+ #[strum(to_string = "Max SP")]
+ MaxSP = 2,
+ Str = 3,
+ Dex = 4,
+ Agi = 5,
+ Int = 6,
+}
diff --git a/rmxp-types/src/rmxp/map.rs b/rmxp-types/src/rmxp/map.rs
new file mode 100644
index 00000000..6af02c07
--- /dev/null
+++ b/rmxp-types/src/rmxp/map.rs
@@ -0,0 +1,35 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use crate::rpg::{AudioFile, Event};
+use crate::{id, option_vec, Table3};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Map")]
+pub struct Map {
+ #[serde(with = "id")]
+ pub tileset_id: usize,
+ pub width: usize,
+ pub height: usize,
+ pub autoplay_bgm: bool,
+ pub bgm: AudioFile,
+ pub autoplay_bgs: bool,
+ pub bgs: AudioFile,
+ pub encounter_list: Vec,
+ pub encounter_step: i32,
+ pub data: Table3,
+ pub events: option_vec::OptionVec,
+}
diff --git a/rmxp-types/src/rmxp/mod.rs b/rmxp-types/src/rmxp/mod.rs
new file mode 100644
index 00000000..b4a5222f
--- /dev/null
+++ b/rmxp-types/src/rmxp/mod.rs
@@ -0,0 +1,44 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+pub mod actor;
+pub mod animation;
+pub mod armor;
+pub mod class;
+pub mod enemy;
+pub mod item;
+pub mod map;
+pub mod skill;
+pub mod state;
+pub mod system;
+pub mod tileset;
+pub mod troop;
+pub mod weapon;
+
+pub use actor::Actor;
+pub use animation::Animation;
+pub use armor::Armor;
+pub use class::Class;
+pub use enemy::Enemy;
+pub use item::Item;
+pub use map::Map;
+pub use skill::Skill;
+pub use state::State;
+pub use system::System;
+pub use tileset::Tileset;
+pub use troop::Troop;
+pub use weapon::Weapon;
diff --git a/rmxp-types/src/rmxp/skill.rs b/rmxp-types/src/rmxp/skill.rs
new file mode 100644
index 00000000..191d81cd
--- /dev/null
+++ b/rmxp-types/src/rmxp/skill.rs
@@ -0,0 +1,76 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+pub use crate::{id, id_vec, optional_id, optional_path, rpg::AudioFile, Path};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Skill")]
+pub struct Skill {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ #[serde(with = "optional_path")]
+ pub icon_name: Path,
+ pub description: String,
+ pub scope: i32,
+ pub occasion: Occasion,
+ #[serde(with = "optional_id")]
+ pub animation1_id: Option,
+ #[serde(with = "optional_id")]
+ pub animation2_id: Option,
+ pub menu_se: AudioFile,
+ #[serde(with = "optional_id")]
+ pub common_event_id: Option,
+ pub sp_cost: i32,
+ pub power: i32,
+ pub atk_f: i32,
+ pub eva_f: i32,
+ pub str_f: i32,
+ pub dex_f: i32,
+ pub agi_f: i32,
+ pub int_f: i32,
+ pub hit: i32,
+ pub pdef_f: i32,
+ pub mdef_f: i32,
+ pub variance: i32,
+ #[serde(with = "id_vec")]
+ pub element_set: Vec,
+ #[serde(with = "id_vec")]
+ pub plus_state_set: Vec,
+ #[serde(with = "id_vec")]
+ pub minus_state_set: Vec,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Default)]
+#[derive(
+ num_enum::TryFromPrimitive,
+ num_enum::IntoPrimitive,
+ strum::Display,
+ strum::EnumIter
+)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[repr(u8)]
+#[serde(into = "u8")]
+#[serde(try_from = "u8")]
+pub enum Occasion {
+ #[default]
+ Always = 0,
+ #[strum(to_string = "Only in battle")]
+ OnlyBattle = 1,
+ #[strum(to_string = "Only from the menu")]
+ OnlyMenu = 2,
+ Never = 3,
+}
diff --git a/rmxp-types/src/rmxp/state.rs b/rmxp-types/src/rmxp/state.rs
new file mode 100644
index 00000000..9cecf9dd
--- /dev/null
+++ b/rmxp-types/src/rmxp/state.rs
@@ -0,0 +1,79 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use crate::{id, id_vec, optional_id};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::State")]
+pub struct State {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ #[serde(with = "optional_id")]
+ pub animation_id: Option,
+ pub restriction: Restriction,
+ pub nonresistance: bool,
+ pub zero_hp: bool,
+ pub cant_get_exp: bool,
+ pub cant_evade: bool,
+ pub slip_damage: bool,
+ pub rating: i32,
+ pub hit_rate: i32,
+ pub maxhp_rate: i32,
+ pub maxsp_rate: i32,
+ pub str_rate: i32,
+ pub dex_rate: i32,
+ pub agi_rate: i32,
+ pub int_rate: i32,
+ pub atk_rate: i32,
+ pub pdef_rate: i32,
+ pub mdef_rate: i32,
+ pub eva: i32,
+ pub battle_only: bool,
+ pub hold_turn: i32,
+ pub auto_release_prob: i32,
+ pub shock_release_prob: i32,
+ #[serde(with = "id_vec")]
+ pub guard_element_set: Vec,
+ #[serde(with = "id_vec")]
+ pub plus_state_set: Vec,
+ #[serde(with = "id_vec")]
+ pub minus_state_set: Vec,
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Default)]
+#[derive(
+ num_enum::TryFromPrimitive,
+ num_enum::IntoPrimitive,
+ strum::Display,
+ strum::EnumIter
+)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[repr(u8)]
+#[serde(into = "u8")]
+#[serde(try_from = "u8")]
+pub enum Restriction {
+ #[default]
+ None = 0,
+ #[strum(to_string = "Can't use magic")]
+ NoMagic = 1,
+ #[strum(to_string = "Always attack enemies")]
+ AttackEnemies = 2,
+ #[strum(to_string = "Always attack allies")]
+ AttackAllies = 3,
+ #[strum(to_string = "Can't move")]
+ NoMove = 4,
+}
diff --git a/rmxp-types/src/rmxp/system.rs b/rmxp-types/src/rmxp/system.rs
new file mode 100644
index 00000000..a9810c24
--- /dev/null
+++ b/rmxp-types/src/rmxp/system.rs
@@ -0,0 +1,116 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+pub use crate::{id, id_vec, nil_padded, optional_id, optional_path, rpg::AudioFile, Path};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(default)] // ??? rmxp???
+#[serde(rename = "RPG::System")]
+pub struct System {
+ pub magic_number: i32,
+ #[serde(with = "id_vec")]
+ pub party_members: Vec,
+ pub elements: Vec,
+ #[serde(with = "nil_padded")]
+ pub switches: Vec,
+ #[serde(with = "nil_padded")]
+ pub variables: Vec,
+
+ #[serde(with = "optional_path")]
+ pub windowskin_name: Path,
+ #[serde(with = "optional_path")]
+ pub title_name: Path,
+ #[serde(with = "optional_path")]
+ pub gameover_name: Path,
+ #[serde(with = "optional_path")]
+ pub battle_transition: Path,
+ pub title_bgm: AudioFile,
+ pub battle_bgm: AudioFile,
+ pub battle_end_me: AudioFile,
+ pub gameover_me: AudioFile,
+ pub cursor_se: AudioFile,
+ pub decision_se: AudioFile,
+ pub cancel_se: AudioFile,
+ pub buzzer_se: AudioFile,
+ pub equip_se: AudioFile,
+ pub shop_se: AudioFile,
+ pub save_se: AudioFile,
+ pub load_se: AudioFile,
+ pub battle_start_se: AudioFile,
+ pub escape_se: AudioFile,
+ pub actor_collapse_se: AudioFile,
+ pub enemy_collapse_se: AudioFile,
+ pub words: Words,
+ // #[serde(skip_deserializing)]
+ pub test_battlers: Vec,
+ #[serde(with = "optional_id")]
+ pub test_troop_id: Option,
+ #[serde(with = "id")]
+ pub start_map_id: usize,
+ pub start_x: i32,
+ pub start_y: i32,
+ #[serde(with = "optional_path")]
+ pub battleback_name: Path,
+ #[serde(with = "optional_path")]
+ pub battler_name: Path,
+ pub battler_hue: i32,
+ pub edit_map_id: usize,
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::System::Words")]
+#[serde(default)]
+pub struct Words {
+ gold: String,
+ hp: String,
+ sp: String,
+ str: String,
+ dex: String,
+ agi: String,
+ int: String,
+ atk: String,
+ pdef: String,
+ mdef: String,
+ weapon: String,
+ armor1: String,
+ armor2: String,
+ armor3: String,
+ armor4: String,
+ attack: String,
+ skill: String,
+ guard: String,
+ item: String,
+ equip: String,
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::System::TestBattler")]
+pub struct TestBattler {
+ level: i32,
+
+ #[serde(with = "id")]
+ actor_id: usize,
+ #[serde(with = "optional_id")]
+ weapon_id: Option,
+ #[serde(with = "optional_id")]
+ armor1_id: Option,
+ #[serde(with = "optional_id")]
+ armor2_id: Option,
+ #[serde(with = "optional_id")]
+ armor3_id: Option,
+ #[serde(with = "optional_id")]
+ armor4_id: Option,
+}
diff --git a/rmxp-types/src/rmxp/tileset.rs b/rmxp-types/src/rmxp/tileset.rs
new file mode 100644
index 00000000..a1db5b8b
--- /dev/null
+++ b/rmxp-types/src/rmxp/tileset.rs
@@ -0,0 +1,45 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+use crate::{id, optional_path, BlendMode, Path, Table1};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Tileset")]
+pub struct Tileset {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ #[serde(with = "optional_path")]
+ pub tileset_name: Path,
+ pub autotile_names: Vec,
+ #[serde(with = "optional_path")]
+ pub panorama_name: Path,
+ pub panorama_hue: i32,
+ #[serde(with = "optional_path")]
+ pub fog_name: Path,
+ pub fog_hue: i32,
+ pub fog_opacity: i32,
+ pub fog_blend_type: BlendMode,
+ pub fog_zoom: i32,
+ pub fog_sx: i32,
+ pub fog_sy: i32,
+ #[serde(with = "optional_path")]
+ pub battleback_name: Path,
+ pub passages: Table1,
+ pub priorities: Table1,
+ pub terrain_tags: Table1,
+}
diff --git a/rmxp-types/src/rmxp/troop.rs b/rmxp-types/src/rmxp/troop.rs
new file mode 100644
index 00000000..5fcdbb3c
--- /dev/null
+++ b/rmxp-types/src/rmxp/troop.rs
@@ -0,0 +1,64 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use crate::{id, optional_id, rpg::EventCommand};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Troop")]
+pub struct Troop {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ pub members: Vec,
+ pub pages: Vec,
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Troop::Member")]
+pub struct Member {
+ #[serde(with = "id")]
+ pub enemy_id: usize,
+ pub x: i32,
+ pub y: i32,
+ pub hidden: bool,
+ pub immortal: bool,
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Troop::Page")]
+pub struct Page {
+ pub condition: Condition,
+ pub span: i32,
+ pub list: Vec,
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Troop::Page::Condition")]
+pub struct Condition {
+ pub turn_valid: bool,
+ pub enemy_valid: bool,
+ pub actor_valid: bool,
+ pub switch_valid: bool,
+ pub turn_a: i32,
+ pub turn_b: i32,
+ pub enemy_index: usize,
+ pub enemy_hp: i32,
+ #[serde(with = "optional_id")]
+ pub actor_id: Option,
+ pub actor_hp: i32,
+ #[serde(with = "optional_id")]
+ pub switch_id: Option,
+}
diff --git a/rmxp-types/src/rmxp/weapon.rs b/rmxp-types/src/rmxp/weapon.rs
new file mode 100644
index 00000000..5814942b
--- /dev/null
+++ b/rmxp-types/src/rmxp/weapon.rs
@@ -0,0 +1,46 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+pub use crate::{id, id_vec, optional_id, optional_path, rpg::AudioFile, Path};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
+#[serde(rename = "RPG::Weapon")]
+pub struct Weapon {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ #[serde(with = "optional_path")]
+ pub icon_name: Path,
+ pub description: String,
+ #[serde(with = "optional_id")]
+ pub animation1_id: Option,
+ #[serde(with = "optional_id")]
+ pub animation2_id: Option,
+ pub price: i32,
+ pub atk: i32,
+ pub pdef: i32,
+ pub mdef: i32,
+ pub str_plus: i32,
+ pub dex_plus: i32,
+ pub agi_plus: i32,
+ pub int_plus: i32,
+ #[serde(with = "id_vec")]
+ pub element_set: Vec,
+ #[serde(with = "id_vec")]
+ pub plus_state_set: Vec,
+ #[serde(with = "id_vec")]
+ pub minus_state_set: Vec,
+}
diff --git a/rmxp-types/src/rmxp_structs.rs b/rmxp-types/src/rmxp_structs.rs
deleted file mode 100644
index 2c9a557b..00000000
--- a/rmxp-types/src/rmxp_structs.rs
+++ /dev/null
@@ -1,881 +0,0 @@
-#![allow(dead_code, missing_docs)]
-#![allow(clippy::struct_excessive_bools)]
-
-use std::fmt::Display;
-
-use num_derive::FromPrimitive;
-use slab::Slab;
-use strum::EnumIter;
-
-use crate::nil_padded::NilPadded;
-use crate::rgss_structs::{Color, Table1, Table2, Table3};
-use crate::ParameterType;
-use serde::{Deserialize, Serialize};
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Map")]
-pub struct Map {
- pub tileset_id: i32,
- pub width: usize,
- pub height: usize,
- pub autoplay_bgm: bool,
- pub bgm: AudioFile,
- pub autoplay_bgs: bool,
- pub bgs: AudioFile,
- pub encounter_list: Vec,
- pub encounter_step: i32,
- pub data: Table3,
- pub events: Slab,
-
- #[serde(skip)]
- /// (direction: i32, start_pos: Pos2, route: MoveRoute)
- pub preview_move_route: Option<(i32, MoveRoute)>,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, PartialEq, Eq)]
-#[serde(rename = "RPG::MapInfo")]
-pub struct MapInfo {
- pub name: String,
- pub parent_id: i32,
- pub order: i32,
- pub expanded: bool,
- pub scroll_x: i32,
- pub scroll_y: i32,
-}
-
-impl PartialOrd for MapInfo {
- fn partial_cmp(&self, other: &Self) -> Option {
- self.order.partial_cmp(&other.order)
- }
-}
-
-impl Ord for MapInfo {
- fn cmp(&self, other: &Self) -> std::cmp::Ordering {
- self.order.cmp(&other.order)
- }
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename = "RPG::Event::Page::Condition")]
-pub struct EventCondition {
- pub switch1_valid: bool,
- pub switch2_valid: bool,
- pub variable_valid: bool,
- pub self_switch_valid: bool,
- pub switch1_id: usize,
- pub switch2_id: usize,
- pub variable_id: usize,
- pub variable_value: i32,
- pub self_switch_ch: String,
-}
-
-impl Default for EventCondition {
- fn default() -> Self {
- Self {
- switch1_valid: false,
- switch2_valid: false,
- variable_valid: false,
- self_switch_valid: false,
- switch1_id: 1,
- switch2_id: 1,
- variable_id: 1,
- variable_value: 0,
- self_switch_ch: "A".to_string(),
- }
- }
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename = "RPG::Event::Page::Graphic")]
-pub struct Graphic {
- pub tile_id: i32,
- pub character_name: String,
- pub character_hue: i32,
- pub direction: i32,
- pub pattern: i32,
- pub opacity: i32,
- pub blend_type: i32,
-}
-
-impl Default for Graphic {
- fn default() -> Self {
- Self {
- tile_id: 0,
- character_name: String::new(),
- character_hue: 0,
- direction: 2,
- pattern: 0,
- opacity: 255,
- blend_type: 0,
- }
- }
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename = "RPG::Event::Page")]
-pub struct EventPage {
- pub condition: EventCondition,
- pub graphic: Graphic,
- pub move_type: usize,
- pub move_speed: usize,
- pub move_frequency: usize,
- pub move_route: MoveRoute,
- pub walk_anime: bool,
- pub step_anime: bool,
- pub direction_fix: bool,
- pub through: bool,
- pub always_on_top: bool,
- pub trigger: i32,
- pub list: Vec,
-}
-
-impl Default for EventPage {
- fn default() -> Self {
- Self {
- condition: EventCondition::default(),
- graphic: Graphic::default(),
- move_type: 0,
- move_speed: 3,
- move_frequency: 3,
- move_route: MoveRoute::default(),
- walk_anime: true,
- step_anime: false,
- direction_fix: false,
- through: false,
- always_on_top: false,
- trigger: 0,
- list: vec![],
- }
- }
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[serde(rename = "RPG::Event")]
-pub struct Event {
- pub id: usize,
- pub name: String,
- pub x: i32,
- pub y: i32,
- pub pages: Vec,
-}
-
-impl Event {
- #[must_use]
- pub fn new(x: i32, y: i32, id: usize) -> Self {
- Self {
- id,
- name: format!("EV{id:0>3}"),
- x,
- y,
- pages: vec![EventPage::default()],
- }
- }
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone, PartialEq)]
-#[serde(rename = "RPG::MoveRoute")]
-pub struct MoveRoute {
- pub repeat: bool,
- pub skippable: bool,
- pub list: Vec,
-}
-
-impl From for MoveRoute {
- fn from(obj: alox_48::Object) -> Self {
- MoveRoute {
- repeat: obj.fields["repeat"].clone().into_bool().unwrap(),
- skippable: obj.fields["skippable"].clone().into_bool().unwrap(),
- list: obj.fields["list"]
- .clone()
- .into_array()
- .unwrap()
- .into_iter()
- .map(|obj| {
- let obj = obj.into_object().unwrap();
- obj.into()
- })
- .collect(),
- }
- }
-}
-
-impl From for alox_48::Object {
- fn from(value: MoveRoute) -> Self {
- let mut fields = alox_48::value::RbFields::with_capacity(3);
- fields.insert("repeat".into(), alox_48::Value::Bool(value.repeat));
- fields.insert("skippable".into(), alox_48::Value::Bool(value.skippable));
- fields.insert(
- "list".into(),
- alox_48::Value::Array(
- value
- .list
- .into_iter()
- .map(Into::into)
- .map(alox_48::Value::Object)
- .collect(),
- ),
- );
-
- alox_48::Object {
- class: "RPG::MoveRoute".into(),
- fields,
- }
- }
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Actor")]
-pub struct Actor {
- pub id: i32,
- pub name: String,
- pub class_id: i32,
- pub initial_level: i32,
- pub final_level: i32,
- pub exp_basis: i32,
- pub exp_inflation: i32,
- pub character_name: String,
- pub character_hue: i32,
- pub battler_name: String,
- pub battler_hue: i32,
- pub parameters: Table2,
- pub weapon_id: i32,
- pub armor1_id: i32,
- pub armor2_id: i32,
- pub armor3_id: i32,
- pub armor4_id: i32,
- pub weapon_fix: bool,
- pub armor1_fix: bool,
- pub armor2_fix: bool,
- pub armor3_fix: bool,
- pub armor4_fix: bool,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Class::Learning")]
-pub struct Learning {
- pub level: i32,
- pub skill_id: i32,
-}
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Class")]
-pub struct Class {
- pub id: i32,
- pub name: String,
- pub position: i32,
- pub weapon_set: Vec,
- pub armor_set: Vec,
- pub element_ranks: Table1,
- pub state_ranks: Table1,
- pub learnings: Vec,
-}
-
-// FIXME: I don't use the battle system, so I'm unsure what some of these types *should* be.
-// I plan to support the battle system but that comes after everything else.
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Skill")]
-pub struct Skill {
- pub id: i32,
- pub name: String,
- pub icon_name: String,
- pub description: String,
- pub scope: i32,
- pub occasion: i32,
- pub animation1_id: i32,
- pub animation2_id: i32,
- pub menu_se: AudioFile,
- pub common_event_id: i32,
- pub sp_cost: i32,
- pub power: i32,
- pub atk_f: i32,
- pub eva_f: i32,
- pub str_f: i32,
- pub dex_f: i32,
- pub agi_f: i32,
- pub int_f: i32,
- pub hit: i32,
- pub pdef_f: i32,
- pub mdef_f: i32,
- pub variance: i32,
- pub element_set: Vec,
- pub plus_state_set: Vec,
- pub minus_state_set: Vec,
-}
-
-#[derive(Debug, EnumIter, FromPrimitive)]
-pub enum ItemScope {
- None,
- OneEnemy,
- AllEnemies,
- OneAlly,
- AllAllies,
- OneAllyHP0,
- AllAlliesHP0,
- TheUser,
-}
-impl Display for ItemScope {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- use ItemScope::{
- AllAllies, AllAlliesHP0, AllEnemies, None, OneAlly, OneAllyHP0, OneEnemy, TheUser,
- };
-
- write!(
- f,
- "{}",
- match self {
- None => "None",
- OneEnemy => "One Enemy",
- AllEnemies => "All Enemies",
- OneAlly => "One Ally",
- AllAllies => "All Allies",
- OneAllyHP0 => "One Ally (HP 0)",
- AllAlliesHP0 => "All Allies (HP 0)",
- TheUser => "The User",
- }
- )
- }
-}
-
-#[derive(Debug, FromPrimitive, EnumIter)]
-pub enum ItemOccasion {
- Always,
- OnlyInBattle,
- OnlyFromTheMenu,
- Never,
-}
-impl Display for ItemOccasion {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- use ItemOccasion::*;
-
- write!(
- f,
- "{}",
- match self {
- Always => "Always",
- OnlyInBattle => "Only in Battle",
- OnlyFromTheMenu => "Only from the Menu",
- Never => "Never",
- },
- )
- }
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone)]
-#[serde(rename = "RPG::Item")]
-pub struct Item {
- pub id: i32,
- pub name: String,
- pub icon_name: String,
- pub description: String,
- pub scope: i32,
- pub occasion: i32,
- pub animation1_id: i32,
- pub animation2_id: i32,
- pub menu_se: AudioFile,
- pub common_event_id: i32,
- pub price: i32,
- pub consumable: bool,
- pub parameter_type: i32,
- pub parameter_points: i32,
- pub recover_hp_rate: i32,
- pub recover_hp: i32,
- // These fields are missing in rmxp data *sometimes*.
- // Why? Who knows!
- #[serde(default)]
- pub recover_sp_rate: i32,
- #[serde(default)]
- pub recover_sp: i32,
- pub hit: i32,
- pub pdef_f: i32,
- pub mdef_f: i32,
- pub variance: i32,
- pub element_set: Vec,
- pub plus_state_set: Vec,
- pub minus_state_set: Vec,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Weapon")]
-pub struct Weapon {
- pub id: i32,
- pub name: String,
- pub icon_name: String,
- pub description: String,
- pub animation1_id: i32,
- pub animation2_id: i32,
- pub price: i32,
- pub atk: i32,
- pub pdef: i32,
- pub mdef: i32,
- pub str_plus: i32,
- pub dex_plus: i32,
- pub agi_plus: i32,
- pub int_plus: i32,
- pub element_set: Vec,
- pub plus_state_set: Vec,
- pub minus_state_set: Vec,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Armor")]
-pub struct Armor {
- pub id: i32,
- pub name: String,
- pub icon_name: String,
- pub description: String,
- pub kind: i32,
- pub auto_state_id: i32,
- pub price: i32,
- pub pdef: i32,
- pub mdef: i32,
- pub eva: i32,
- pub str_plus: i32,
- pub dex_plus: i32,
- pub agi_plus: i32,
- pub int_plus: i32,
- pub guard_element_set: Vec,
- pub guard_state_set: Vec,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Enemy::Action")]
-pub struct Action {
- pub kind: i32,
- pub basic: i32,
- pub skill_id: i32,
- pub condition_turn_a: i32,
- pub condition_turn_b: i32,
- pub condition_hp: i32,
- pub condition_level: i32,
- pub condition_switch_id: i32,
- pub rating: i32,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Enemy")]
-pub struct Enemy {
- pub id: i32,
- pub name: String,
- pub battler_name: String,
- pub battler_hue: i32,
- pub maxhp: i32,
- pub maxsp: i32,
- pub str: i32,
- pub dex: i32,
- pub agi: i32,
- pub int: i32,
- pub atk: i32,
- pub pdef: i32,
- pub mdef: i32,
- pub eva: i32,
- pub animation1_id: i32,
- pub animation2_id: i32,
- pub element_ranks: Table1,
- pub state_ranks: Table1,
- pub actions: Vec,
- pub exp: i32,
- pub gold: i32,
- pub item_id: i32,
- pub weapon_id: i32,
- pub armor_id: i32,
- pub treasure_prob: i32,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Troop::Member")]
-pub struct Member {
- pub enemy_id: i32,
- pub x: i32,
- pub y: i32,
- pub hidden: bool,
- pub immortal: bool,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Troop::Page::Condition")]
-pub struct TroopCondition {
- pub turn_valid: bool,
- pub enemy_valid: bool,
- pub actor_valid: bool,
- pub switch_valid: bool,
- pub turn_a: i32,
- pub turn_b: i32,
- pub enemy_index: i32,
- pub enemy_hp: i32,
- pub actor_id: i32,
- pub actor_hp: i32,
- pub switch_id: i32,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Troop::Page")]
-pub struct TroopPage {
- pub condition: TroopCondition,
- pub span: i32,
- pub list: Vec,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Troop")]
-pub struct Troop {
- pub id: i32,
- pub name: String,
- pub members: Vec,
- pub pages: Vec,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::State")]
-pub struct State {
- pub id: i32,
- pub name: String,
- pub animation_id: i32,
- pub restriction: i32,
- pub nonresistance: bool,
- pub zero_hp: bool,
- pub cant_get_exp: bool,
- pub cant_evade: bool,
- pub slip_damage: bool,
- pub rating: i32,
- pub hit_rate: i32,
- pub maxhp_rate: i32,
- pub maxsp_rate: i32,
- pub str_rate: i32,
- pub dex_rate: i32,
- pub agi_rate: i32,
- pub int_rate: i32,
- pub atk_rate: i32,
- pub pdef_rate: i32,
- pub mdef_rate: i32,
- pub eva: i32,
- pub battle_only: bool,
- pub hold_turn: i32,
- pub auto_release_prob: i32,
- pub shock_release_prob: i32,
- pub guard_element_set: Vec,
- pub plus_state_set: Vec,
- pub minus_state_set: Vec,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Animation::Frame")]
-pub struct Frame {
- pub cell_max: i32,
- pub cell_data: Table2,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Animation::Timing")]
-pub struct Timing {
- pub frame: i32,
- pub se: AudioFile,
- pub flash_scope: i32,
- pub flash_color: Color,
- pub flash_duration: i32,
- pub condition: i32,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Animation")]
-pub struct Animation {
- pub id: i32,
- pub name: String,
- pub animation_name: String,
- pub animation_hue: i32,
- pub position: i32,
- pub frame_max: i32,
- pub frames: Vec,
- pub timings: Vec,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::Tileset")]
-pub struct Tileset {
- pub id: i32,
- pub name: String,
- pub tileset_name: String,
- pub autotile_names: Vec,
- pub panorama_name: String,
- pub panorama_hue: i32,
- pub fog_name: String,
- pub fog_hue: i32,
- pub fog_opacity: i32,
- pub fog_blend_type: i32,
- pub fog_zoom: i32,
- pub fog_sx: i32,
- pub fog_sy: i32,
- pub battleback_name: String,
- pub passages: Table1,
- pub priorities: Table1,
- pub terrain_tags: Table1,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone)]
-#[serde(rename = "RPG::CommonEvent")]
-pub struct CommonEvent {
- pub id: usize,
- pub name: String,
- pub trigger: usize,
- pub switch_id: usize,
- pub list: Vec,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::System::Words")]
-#[serde(default)]
-pub struct Words {
- gold: String,
- hp: String,
- sp: String,
- str: String,
- dex: String,
- agi: String,
- int: String,
- atk: String,
- pdef: String,
- mdef: String,
- weapon: String,
- armor1: String,
- armor2: String,
- armor3: String,
- armor4: String,
- attack: String,
- skill: String,
- guard: String,
- item: String,
- equip: String,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(rename = "RPG::System::TestBattler")]
-pub struct TestBattler {
- actor_id: i32,
- level: i32,
- weapon_id: i32,
- armor1_id: i32,
- armor2_id: i32,
- armor3_id: i32,
- armor4_id: i32,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize)]
-#[serde(default)] // ??? rmxp???
-#[serde(rename = "RPG::System")]
-pub struct System {
- pub magic_number: i32,
- pub party_members: Vec,
- pub elements: Vec,
- pub switches: NilPadded,
- pub variables: NilPadded,
- pub windowskin_name: String,
- pub title_name: String,
- pub gameover_name: String,
- pub battle_transition: String,
- pub title_bgm: AudioFile,
- pub battle_bgm: AudioFile,
- pub battle_end_me: AudioFile,
- pub gameover_me: AudioFile,
- pub cursor_se: AudioFile,
- pub decision_se: AudioFile,
- pub cancel_se: AudioFile,
- pub buzzer_se: AudioFile,
- pub equip_se: AudioFile,
- pub shop_se: AudioFile,
- pub save_se: AudioFile,
- pub load_se: AudioFile,
- pub battle_start_se: AudioFile,
- pub escape_se: AudioFile,
- pub actor_collapse_se: AudioFile,
- pub enemy_collapse_se: AudioFile,
- pub words: Words,
- #[serde(skip_deserializing)]
- pub test_battlers: Vec,
- pub test_troop_id: i32,
- pub start_map_id: i32,
- pub start_x: i32,
- pub start_y: i32,
- pub battleback_name: String,
- pub battler_name: String,
- pub battler_hue: i32,
- pub edit_map_id: i32,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone, PartialEq)]
-#[serde(rename = "RPG::AudioFile")]
-pub struct AudioFile {
- pub name: String,
- pub volume: u8,
- pub pitch: u8,
-}
-
-impl From for AudioFile {
- fn from(obj: alox_48::Object) -> Self {
- AudioFile {
- name: obj.fields["name"]
- .clone()
- .into_string()
- .unwrap()
- .to_string()
- .unwrap(),
- volume: obj.fields["volume"].clone().into_integer().unwrap() as _,
- pitch: obj.fields["pitch"].clone().into_integer().unwrap() as _,
- }
- }
-}
-
-impl From for alox_48::Object {
- fn from(a: AudioFile) -> Self {
- let mut fields = alox_48::value::RbFields::with_capacity(3);
- fields.insert("name".into(), a.name.into());
- fields.insert("volume".into(), alox_48::Value::Integer(a.volume as _));
- fields.insert("pitch".into(), alox_48::Value::Integer(a.pitch as _));
-
- alox_48::Object {
- class: "RPG::AudioFile".into(),
- fields,
- }
- }
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-#[allow(missing_docs)]
-#[serde(rename = "RPG::EventCommand")]
-pub struct EventCommand {
- pub code: u16,
- pub indent: usize,
- pub parameters: Vec,
-
- #[serde(default = "rand::random")]
- #[serde(skip)]
- pub guid: u16,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone, PartialEq)]
-#[allow(missing_docs)]
-#[serde(rename = "RPG::MoveCommand")]
-pub struct MoveCommand {
- pub code: u16,
- pub parameters: Vec,
-
- #[serde(default = "rand::random")]
- #[serde(skip)]
- pub guid: u16,
-}
-
-impl From for MoveCommand {
- fn from(obj: alox_48::Object) -> Self {
- MoveCommand {
- code: obj.fields["code"].clone().into_integer().unwrap() as _,
- parameters: obj.fields["parameters"]
- .clone()
- .into_array()
- .unwrap()
- .into_iter()
- .map(Into::into)
- .collect(),
-
- guid: rand::random(),
- }
- }
-}
-
-impl From for alox_48::Object {
- fn from(c: MoveCommand) -> Self {
- let mut fields = alox_48::value::RbFields::with_capacity(2);
- fields.insert("code".into(), alox_48::Value::Integer(c.code as _));
- fields.insert(
- "parameters".into(),
- alox_48::Value::Array(c.parameters.into_iter().map(Into::into).collect()),
- );
-
- alox_48::Object {
- class: "RPG::MoveCommand".into(),
- fields,
- }
- }
-}
-
-// FIXME: add custom serialize impl
-#[allow(missing_docs)]
-#[derive(Debug, Clone)]
-pub struct Script {
- pub name: String,
- pub script_text: String,
-}
-
-impl<'de> serde::Deserialize<'de> for Script {
- fn deserialize(deserializer: D) -> Result
- where
- D: serde::Deserializer<'de>,
- {
- struct Visitor;
-
- impl<'de> serde::de::Visitor<'de> for Visitor {
- type Value = Script;
-
- fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- formatter.write_str("an array")
- }
-
- fn visit_seq(self, mut seq: A) -> Result
- where
- A: serde::de::SeqAccess<'de>,
- {
- use serde::de::Error;
- use std::io::Read;
-
- let Some(_) = seq.next_element::()? else {
- return Err(A::Error::missing_field("id"));
- };
-
- let Some(name) = seq.next_element()? else {
- return Err(A::Error::missing_field("name"));
- };
-
- let Some(data) = seq.next_element::()? else {
- return Err(A::Error::missing_field("data"));
- };
-
- let mut decoder = flate2::bufread::ZlibDecoder::new(data.data.as_slice());
- let mut script = String::new();
- decoder
- .read_to_string(&mut script)
- .map_err(A::Error::custom)?;
-
- Ok(Script {
- name,
- script_text: script,
- })
- }
- }
-
- deserializer.deserialize_any(Visitor)
- }
-}
-
-impl Serialize for Script {
- fn serialize
(&self, serializer: S) -> Result
- where
- S: serde::Serializer,
- {
- use serde::ser::Error;
- use serde::ser::SerializeSeq;
- use std::io::Write;
-
- let mut seq = serializer.serialize_seq(Some(3))?;
-
- let mut encoder = flate2::write::ZlibEncoder::new(Vec::new(), Default::default());
- let data = encoder
- .write_all(self.script_text.as_bytes())
- .and_then(|_| encoder.finish())
- .map_err(S::Error::custom)?;
-
- seq.serialize_element(&0usize)?;
- seq.serialize_element(&self.name)?;
- seq.serialize_element(&alox_48::RbString {
- data,
- ..Default::default()
- })?;
-
- seq.end()
- }
-}
diff --git a/rmxp-types/src/shared/audio_file.rs b/rmxp-types/src/shared/audio_file.rs
new file mode 100644
index 00000000..46bbd4b5
--- /dev/null
+++ b/rmxp-types/src/shared/audio_file.rs
@@ -0,0 +1,64 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use crate::{optional_path, Path};
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone, PartialEq)]
+#[serde(rename = "RPG::AudioFile")]
+pub struct AudioFile {
+ #[serde(with = "optional_path")]
+ pub name: Path,
+ pub volume: u8,
+ pub pitch: u8,
+}
+
+impl From for AudioFile {
+ fn from(obj: alox_48::Object) -> Self {
+ let name = obj.fields["name"]
+ .clone()
+ .into_string()
+ .unwrap()
+ .to_string()
+ .unwrap();
+ let name = if name.is_empty() {
+ None
+ } else {
+ Some(name.into())
+ };
+ AudioFile {
+ name,
+ volume: obj.fields["volume"].clone().into_integer().unwrap() as _,
+ pitch: obj.fields["pitch"].clone().into_integer().unwrap() as _,
+ }
+ }
+}
+
+impl From for alox_48::Object {
+ fn from(a: AudioFile) -> Self {
+ let mut fields = alox_48::value::RbFields::with_capacity(3);
+ fields.insert(
+ "name".into(),
+ a.name.map(camino::Utf8PathBuf::into_string).into(),
+ );
+ fields.insert("volume".into(), alox_48::Value::Integer(a.volume as _));
+ fields.insert("pitch".into(), alox_48::Value::Integer(a.pitch as _));
+
+ alox_48::Object {
+ class: "RPG::AudioFile".into(),
+ fields,
+ }
+ }
+}
diff --git a/rmxp-types/src/shared/event.rs b/rmxp-types/src/shared/event.rs
new file mode 100644
index 00000000..3192ec2b
--- /dev/null
+++ b/rmxp-types/src/shared/event.rs
@@ -0,0 +1,174 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use crate::{id, optional_id, optional_path, rpg::MoveRoute, BlendMode, ParameterType, Path};
+
+#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[serde(rename = "RPG::Event")]
+pub struct Event {
+ // #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ pub x: i32,
+ pub y: i32,
+ pub pages: Vec,
+
+ #[serde(skip)]
+ pub extra_data: EventExtraData,
+}
+
+#[derive(Debug, Default, Clone)]
+pub struct EventExtraData {
+ /// Whether or not the event editor for this event is open
+ pub is_editor_open: bool,
+}
+
+impl Event {
+ #[must_use]
+ pub fn new(x: i32, y: i32, id: usize) -> Self {
+ Self {
+ id,
+ name: format!("EV{id:0>3}"),
+ x,
+ y,
+ pages: vec![EventPage::default()],
+
+ extra_data: EventExtraData::default(),
+ }
+ }
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[serde(rename = "RPG::CommonEvent")]
+pub struct CommonEvent {
+ #[serde(with = "id")]
+ pub id: usize,
+ pub name: String,
+ pub trigger: usize,
+ pub switch_id: usize,
+ pub list: Vec,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[serde(rename = "RPG::Event::Page")]
+pub struct EventPage {
+ pub condition: EventCondition,
+ pub graphic: Graphic,
+ pub move_type: usize,
+ pub move_speed: usize,
+ pub move_frequency: usize,
+ pub move_route: MoveRoute,
+ pub walk_anime: bool,
+ pub step_anime: bool,
+ pub direction_fix: bool,
+ pub through: bool,
+ pub always_on_top: bool,
+ pub trigger: i32,
+ pub list: Vec,
+}
+
+impl Default for EventPage {
+ fn default() -> Self {
+ Self {
+ condition: EventCondition::default(),
+ graphic: Graphic::default(),
+ move_type: 0,
+ move_speed: 3,
+ move_frequency: 3,
+ move_route: MoveRoute::default(),
+ walk_anime: true,
+ step_anime: false,
+ direction_fix: false,
+ through: false,
+ always_on_top: false,
+ trigger: 0,
+ list: vec![],
+ }
+ }
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[serde(rename = "RPG::Event::Page::Graphic")]
+pub struct Graphic {
+ #[serde(with = "optional_id")]
+ pub tile_id: Option,
+ #[serde(with = "optional_path")]
+ pub character_name: Path,
+ pub character_hue: i32,
+ pub direction: i32,
+ pub pattern: i32,
+ pub opacity: i32,
+ pub blend_type: BlendMode,
+}
+
+impl Default for Graphic {
+ fn default() -> Self {
+ Self {
+ tile_id: None,
+ character_name: None,
+ character_hue: 0,
+ direction: 2,
+ pattern: 0,
+ opacity: 255,
+ blend_type: BlendMode::Normal,
+ }
+ }
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[serde(rename = "RPG::Event::Page::Condition")]
+pub struct EventCondition {
+ pub switch1_valid: bool,
+ pub switch2_valid: bool,
+ pub variable_valid: bool,
+ pub self_switch_valid: bool,
+ #[serde(with = "id")]
+ pub switch1_id: usize,
+ #[serde(with = "id")]
+ pub switch2_id: usize,
+ pub variable_id: usize,
+ pub variable_value: i32,
+ pub self_switch_ch: String,
+}
+
+impl Default for EventCondition {
+ fn default() -> Self {
+ Self {
+ switch1_valid: false,
+ switch2_valid: false,
+ variable_valid: false,
+ self_switch_valid: false,
+ switch1_id: 0,
+ switch2_id: 0,
+ variable_id: 0,
+ variable_value: 0,
+ self_switch_ch: "A".to_string(),
+ }
+ }
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[allow(missing_docs)]
+#[serde(rename = "RPG::EventCommand")]
+pub struct EventCommand {
+ pub code: u16,
+ pub indent: usize,
+ pub parameters: Vec,
+
+ #[serde(default = "rand::random")]
+ #[serde(skip)]
+ pub guid: u16,
+}
diff --git a/rmxp-types/src/shared/mapinfo.rs b/rmxp-types/src/shared/mapinfo.rs
new file mode 100644
index 00000000..f001f0e4
--- /dev/null
+++ b/rmxp-types/src/shared/mapinfo.rs
@@ -0,0 +1,42 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize, PartialEq, Eq)]
+#[serde(rename = "RPG::MapInfo")]
+pub struct MapInfo {
+ pub name: String,
+ // because mapinfos is stored in a hash, we dont actually need to modify values! this can just stay as a usize.
+ // it would be slightly more accurate to store this as an option, but no other values (off the top of my head) are like this. maybe event tile ids.
+ // I'll need to think on this a bit.
+ pub parent_id: usize,
+ pub order: i32,
+ pub expanded: bool,
+ pub scroll_x: i32,
+ pub scroll_y: i32,
+}
+
+impl PartialOrd for MapInfo {
+ fn partial_cmp(&self, other: &Self) -> Option {
+ Some(self.cmp(other))
+ }
+}
+
+impl Ord for MapInfo {
+ fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+ self.order.cmp(&other.order)
+ }
+}
diff --git a/rmxp-types/src/shared/mod.rs b/rmxp-types/src/shared/mod.rs
new file mode 100644
index 00000000..069bd4a8
--- /dev/null
+++ b/rmxp-types/src/shared/mod.rs
@@ -0,0 +1,46 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+mod audio_file;
+mod event;
+mod mapinfo;
+mod move_route;
+mod script;
+
+pub use audio_file::*;
+pub use event::*;
+pub use mapinfo::*;
+pub use move_route::*;
+pub use script::*;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord, Default, Hash)]
+#[derive(
+ num_enum::TryFromPrimitive,
+ num_enum::IntoPrimitive,
+ strum::Display,
+ strum::EnumIter
+)]
+#[derive(serde::Deserialize, serde::Serialize)]
+#[repr(u8)]
+#[serde(into = "u8")]
+#[serde(try_from = "u8")]
+pub enum BlendMode {
+ #[default]
+ Normal = 0,
+ Add = 1,
+ Subtract = 2,
+}
diff --git a/rmxp-types/src/shared/move_route.rs b/rmxp-types/src/shared/move_route.rs
new file mode 100644
index 00000000..97c732b2
--- /dev/null
+++ b/rmxp-types/src/shared/move_route.rs
@@ -0,0 +1,113 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+use crate::helpers::ParameterType;
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone, PartialEq)]
+#[serde(rename = "RPG::MoveRoute")]
+pub struct MoveRoute {
+ pub repeat: bool,
+ pub skippable: bool,
+ pub list: Vec,
+}
+
+impl From for MoveRoute {
+ fn from(obj: alox_48::Object) -> Self {
+ MoveRoute {
+ repeat: obj.fields["repeat"].clone().into_bool().unwrap(),
+ skippable: obj.fields["skippable"].clone().into_bool().unwrap(),
+ list: obj.fields["list"]
+ .clone()
+ .into_array()
+ .unwrap()
+ .into_iter()
+ .map(|obj| {
+ let obj = obj.into_object().unwrap();
+ obj.into()
+ })
+ .collect(),
+ }
+ }
+}
+
+impl From for alox_48::Object {
+ fn from(value: MoveRoute) -> Self {
+ let mut fields = alox_48::value::RbFields::with_capacity(3);
+ fields.insert("repeat".into(), alox_48::Value::Bool(value.repeat));
+ fields.insert("skippable".into(), alox_48::Value::Bool(value.skippable));
+ fields.insert(
+ "list".into(),
+ alox_48::Value::Array(
+ value
+ .list
+ .into_iter()
+ .map(Into::into)
+ .map(alox_48::Value::Object)
+ .collect(),
+ ),
+ );
+
+ alox_48::Object {
+ class: "RPG::MoveRoute".into(),
+ fields,
+ }
+ }
+}
+
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone, PartialEq)]
+#[allow(missing_docs)]
+#[serde(rename = "RPG::MoveCommand")]
+pub struct MoveCommand {
+ pub code: u16,
+ pub parameters: Vec,
+
+ #[serde(default = "rand::random")]
+ #[serde(skip)]
+ pub guid: u16,
+}
+
+impl From for MoveCommand {
+ fn from(obj: alox_48::Object) -> Self {
+ MoveCommand {
+ code: obj.fields["code"].clone().into_integer().unwrap() as _,
+ parameters: obj.fields["parameters"]
+ .clone()
+ .into_array()
+ .unwrap()
+ .into_iter()
+ .map(Into::into)
+ .collect(),
+
+ guid: rand::random(),
+ }
+ }
+}
+
+impl From for alox_48::Object {
+ fn from(c: MoveCommand) -> Self {
+ let mut fields = alox_48::value::RbFields::with_capacity(2);
+ fields.insert("code".into(), alox_48::Value::Integer(c.code as _));
+ fields.insert(
+ "parameters".into(),
+ alox_48::Value::Array(c.parameters.into_iter().map(Into::into).collect()),
+ );
+
+ alox_48::Object {
+ class: "RPG::MoveCommand".into(),
+ fields,
+ }
+ }
+}
diff --git a/rmxp-types/src/shared/script.rs b/rmxp-types/src/shared/script.rs
new file mode 100644
index 00000000..6c3fb3db
--- /dev/null
+++ b/rmxp-types/src/shared/script.rs
@@ -0,0 +1,101 @@
+// Copyright (C) 2023 Lily Lyons
+//
+// This file is part of Luminol.
+//
+// Luminol is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Luminol is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Luminol. If not, see .
+
+#[allow(missing_docs)]
+#[derive(Debug, Clone)]
+pub struct Script {
+ pub name: String,
+ pub script_text: String,
+}
+
+impl<'de> serde::Deserialize<'de> for Script {
+ fn deserialize(deserializer: D) -> Result
+ where
+ D: serde::Deserializer<'de>,
+ {
+ struct Visitor;
+
+ impl<'de> serde::de::Visitor<'de> for Visitor {
+ type Value = Script;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ formatter.write_str("an array")
+ }
+
+ fn visit_seq(self, mut seq: A) -> Result
+ where
+ A: serde::de::SeqAccess<'de>,
+ {
+ use serde::de::Error;
+ use std::io::Read;
+
+ let Some(_) = seq.next_element::()? else {
+ return Err(A::Error::missing_field("id"));
+ };
+
+ let Some(name) = seq.next_element()? else {
+ return Err(A::Error::missing_field("name"));
+ };
+
+ let Some(data) = seq.next_element::()? else {
+ return Err(A::Error::missing_field("data"));
+ };
+
+ let mut decoder = flate2::bufread::ZlibDecoder::new(data.data.as_slice());
+ let mut script = String::new();
+ decoder
+ .read_to_string(&mut script)
+ .map_err(A::Error::custom)?;
+
+ Ok(Script {
+ name,
+ script_text: script,
+ })
+ }
+ }
+
+ deserializer.deserialize_any(Visitor)
+ }
+}
+
+impl serde::Serialize for Script {
+ fn serialize