From 9bcf0bd8e669e45b6b921a179067d61006127fb8 Mon Sep 17 00:00:00 2001 From: pillowtrucker Date: Fri, 16 Feb 2024 13:12:12 +0100 Subject: [PATCH] unjank almost all dependencies (glam25 needs a temporary hack) --- Cargo.lock | 271 ++++++++++++------ brainworms_arson/Cargo.toml | 9 +- brainworms_arson/src/lib.rs | 4 +- brainworms_lib/Cargo.toml | 5 +- brainworms_lib/src/lib.rs | 17 +- .../basement/cla.rs | 1 - .../play/backstage/plumbing.rs | 7 +- .../play/scene/actors.rs | 14 +- inox2d | 2 +- rend3 | 2 +- 10 files changed, 219 insertions(+), 113 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a2be64..c9d9625 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -373,7 +373,8 @@ dependencies = [ "cfg-if", "enum_dispatch", "env_logger", - "glam", + "glam 0.24.2", + "glam 0.25.0", "gltf", "image", "indoc", @@ -398,7 +399,6 @@ dependencies = [ "uuid", "webbrowser", "wgpu", - "wgpu-profiler", "winit", ] @@ -577,10 +577,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "com-rs" -version = "0.2.1" +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "combine" @@ -738,9 +763,9 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.7.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ "bitflags 2.4.1", "libloading 0.8.1", @@ -941,6 +966,15 @@ dependencies = [ "libloading 0.8.1", ] +[[package]] +name = "document-features" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.0" @@ -949,16 +983,18 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "ecolor" -version = "0.25.0" -source = "git+https://github.com/emilk/egui.git?branch=master#7733d1d87c31849d4ac8a3039131c8ad3e71b547" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03cfe80b1890e1a8cdbffc6044d6872e814aaf6011835a2a5e2db0e5c5c4ef4e" dependencies = [ "bytemuck", ] [[package]] name = "egui" -version = "0.25.0" -source = "git+https://github.com/emilk/egui.git?branch=master#7733d1d87c31849d4ac8a3039131c8ad3e71b547" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180f595432a5b615fc6b74afef3955249b86cfea72607b40740a4cd60d5297d0" dependencies = [ "ahash", "epaint", @@ -968,28 +1004,31 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.25.0" -source = "git+https://github.com/emilk/egui.git?branch=master#7733d1d87c31849d4ac8a3039131c8ad3e71b547" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f2d75e1e70228e7126f828bac05f9fe0e7ea88e9660c8cebe609bb114c61d4" dependencies = [ "bytemuck", + "document-features", "egui", "epaint", "log", "thiserror", "type-map", + "web-time", "wgpu", - "winit", ] [[package]] name = "egui-winit" -version = "0.25.0" -source = "git+https://github.com/emilk/egui.git?branch=master#7733d1d87c31849d4ac8a3039131c8ad3e71b547" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4d44f8d89f70d4480545eb2346b76ea88c3022e9f4706cebc799dbe8b004a2" dependencies = [ "arboard", "egui", "log", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "smithay-clipboard", "web-time", "webbrowser", @@ -1004,8 +1043,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" -version = "0.25.0" -source = "git+https://github.com/emilk/egui.git?branch=master#7733d1d87c31849d4ac8a3039131c8ad3e71b547" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6916301ecf80448f786cdf3eb51d9dbdd831538732229d49119e2d4312eaaf09" dependencies = [ "bytemuck", ] @@ -1017,8 +1057,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" dependencies = [ "const_panic", - "encase_derive", - "glam", + "encase_derive 0.6.1", + "glam 0.24.2", + "thiserror", +] + +[[package]] +name = "encase" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103" +dependencies = [ + "const_panic", + "encase_derive 0.7.0", + "glam 0.25.0", "thiserror", ] @@ -1028,7 +1080,16 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" dependencies = [ - "encase_derive_impl", + "encase_derive_impl 0.6.1", +] + +[[package]] +name = "encase_derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a" +dependencies = [ + "encase_derive_impl 0.7.0", ] [[package]] @@ -1042,6 +1103,17 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "encase_derive_impl" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92959a9e8d13eaa13b8ae8c7b583c3bf1669ca7a8e7708a088d12587ba86effc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "enum-primitive-derive" version = "0.2.2" @@ -1080,8 +1152,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.25.0" -source = "git+https://github.com/emilk/egui.git?branch=master#7733d1d87c31849d4ac8a3039131c8ad3e71b547" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b9fdf617dd7f58b0c8e6e9e4a1281f730cde0831d40547da446b2bb76a47af" dependencies = [ "ab_glyph", "ahash", @@ -1312,6 +1385,15 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "glam" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" +dependencies = [ + "bytemuck", +] + [[package]] name = "glicol_synth" version = "0.13.2" @@ -1330,9 +1412,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -1406,11 +1488,10 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" dependencies = [ - "backtrace", "log", "presser", "thiserror", @@ -1473,14 +1554,14 @@ dependencies = [ [[package]] name = "hassle-rs" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 1.3.2", - "com-rs", + "bitflags 2.4.1", + "com", "libc", - "libloading 0.7.4", + "libloading 0.8.1", "thiserror", "widestring", "winapi", @@ -1611,14 +1692,15 @@ dependencies = [ [[package]] name = "inox2d" -version = "0.1.0" +version = "0.2.0" dependencies = [ "clap", - "glam", + "glam 0.25.0", "image", "indextree", "json", "owo-colors", + "simple-tga-reader", "thiserror", "tracing", ] @@ -1628,8 +1710,8 @@ name = "inox2d-wgpu" version = "0.1.0" dependencies = [ "bytemuck", - "encase", - "glam", + "encase 0.7.0", + "glam 0.25.0", "inox2d", "thiserror", "tracing", @@ -1692,9 +1774,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -1838,6 +1920,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93d1d1b0528cc76bed22884ae4f56f5548d80643f848d6df0c652032f7ca6165" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.11" @@ -1942,9 +2030,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.14.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" +checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" dependencies = [ "bit-set", "bitflags 2.4.1", @@ -1967,7 +2055,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", - "glam", + "glam 0.24.2", "matrixmultiply", "nalgebra-macros", "num-complex", @@ -2022,7 +2110,6 @@ dependencies = [ "log", "ndk-sys 0.5.0+25.2.9519653", "num_enum 0.7.1", - "raw-window-handle 0.5.2", "raw-window-handle 0.6.0", "thiserror", ] @@ -2347,9 +2434,9 @@ dependencies = [ [[package]] name = "owo-colors" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" [[package]] name = "parking_lot" @@ -2653,9 +2740,9 @@ dependencies = [ "bitflags 2.4.1", "bumpalo", "bytemuck", - "encase", + "encase 0.6.1", "flume", - "glam", + "glam 0.24.2", "handlebars", "indexmap", "list-any", @@ -2684,7 +2771,7 @@ version = "0.3.0" dependencies = [ "egui", "egui-wgpu", - "glam", + "glam 0.24.2", "rend3", "wgpu", "wgpu-types", @@ -2699,7 +2786,7 @@ dependencies = [ "bytemuck", "ddsfile", "float-ord", - "glam", + "glam 0.24.2", "gltf", "image", "ktx2", @@ -2720,9 +2807,9 @@ dependencies = [ "bitflags 2.4.1", "bytemuck", "codespan-reporting", - "encase", + "encase 0.6.1", "flume", - "glam", + "glam 0.24.2", "log", "naga", "ordered-float", @@ -2743,8 +2830,8 @@ dependencies = [ "bitflags 2.4.1", "bytemuck", "cfg-if", - "encase", - "glam", + "encase 0.6.1", + "glam 0.24.2", "list-any", "once_cell", "thiserror", @@ -2951,6 +3038,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simple-tga-reader" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad547583b5ef3f75a69312acb93a12c5df278de0540b76196247a313de48d89" + [[package]] name = "slab" version = "0.4.9" @@ -3064,12 +3157,11 @@ dependencies = [ [[package]] name = "spirv" -version = "0.2.0+1.5.4" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", - "num-traits", + "bitflags 2.4.1", ] [[package]] @@ -3401,9 +3493,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3411,9 +3503,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", @@ -3426,9 +3518,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -3438,9 +3530,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3448,9 +3540,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", @@ -3461,9 +3553,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wayland-backend" @@ -3576,9 +3668,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -3619,19 +3711,19 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wgpu" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" +checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" dependencies = [ "arrayvec", "cfg-if", - "flume", + "cfg_aliases", "js-sys", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "smallvec", "static_assertions", "wasm-bindgen", @@ -3644,19 +3736,22 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" +checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.4.1", + "cfg_aliases", "codespan-reporting", + "indexmap", "log", "naga", + "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "rustc-hash", "smallvec", "thiserror", @@ -3667,9 +3762,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9" +checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" dependencies = [ "android_system_properties", "arrayvec", @@ -3677,6 +3772,7 @@ dependencies = [ "bit-set", "bitflags 2.4.1", "block", + "cfg_aliases", "core-graphics-types", "d3d12", "glow", @@ -3697,7 +3793,7 @@ dependencies = [ "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", "renderdoc-sys", "rustc-hash", "smallvec", @@ -3710,19 +3806,21 @@ dependencies = [ [[package]] name = "wgpu-profiler" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdc78911971a06b86a57a9a8e1c861fbc90c62dcbc96bff0b2831c1e853b7bd" +checksum = "9d5026bcb9625f0ad9bc0570811b40b4bc5249548a992feb695542d15faeadac" dependencies = [ + "parking_lot", "thiserror", + "web-sys", "wgpu", ] [[package]] name = "wgpu-types" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" +checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" dependencies = [ "bitflags 2.4.1", "js-sys", @@ -4029,7 +4127,6 @@ dependencies = [ "once_cell", "orbclient", "percent-encoding", - "raw-window-handle 0.5.2", "raw-window-handle 0.6.0", "redox_syscall 0.3.5", "rustix", diff --git a/brainworms_arson/Cargo.toml b/brainworms_arson/Cargo.toml index 4b1b100..11fdf2e 100644 --- a/brainworms_arson/Cargo.toml +++ b/brainworms_arson/Cargo.toml @@ -6,9 +6,12 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -egui = { version = "0.25", git = "https://github.com/emilk/egui.git", branch="master"} -egui-wgpu = {version = "0.25", git = "https://github.com/emilk/egui.git", branch="master", features = ["winit"] } -egui-winit = {version = "0.25", git = "https://github.com/emilk/egui.git", branch="master", default-features = false, features = ["clipboard", "links", "wayland"] } +#egui = { version = "0.26", git = "https://github.com/emilk/egui.git", branch="master"} +#egui-wgpu = {version = "0.26", git = "https://github.com/emilk/egui.git", branch="master", features = ["winit"] } +#egui-winit = {version = "0.26", git = "https://github.com/emilk/egui.git", branch="master", default-features = false, features = ["clipboard", "links", "wayland"] } +egui = { version = "0.26"} +egui-wgpu = {version = "0.26"} +egui-winit = {version = "0.26"} nanorand = { version = "0.7", default-features = false, features = ["wyrand"] } nom = "7" anyhow = "1" diff --git a/brainworms_arson/src/lib.rs b/brainworms_arson/src/lib.rs index c1a1811..23bfc27 100644 --- a/brainworms_arson/src/lib.rs +++ b/brainworms_arson/src/lib.rs @@ -345,6 +345,7 @@ impl Widget for KineticLabel { angle: 0.0, fallback_color: response_color, override_text_color: Some(response_color), + opacity_factor: 1., }); }; if self.kinesis.is_none() { @@ -359,7 +360,8 @@ impl Widget for KineticLabel { underline, angle: 0.0, fallback_color: response_color, - override_text_color: None, // override_text_color: Some(response_color), + override_text_color: None, + opacity_factor: 1., // override_text_color: Some(response_color), }; let clipped_shape: ClippedShape = ClippedShape { clip_rect: Rect::EVERYTHING, diff --git a/brainworms_lib/Cargo.toml b/brainworms_lib/Cargo.toml index 308750d..e2c877d 100644 --- a/brainworms_lib/Cargo.toml +++ b/brainworms_lib/Cargo.toml @@ -13,7 +13,7 @@ keywords = ["wgpu", "rend3", "not-bevy", "no-ecs", "game", "program"] [dependencies] brainworms_arson = {path = "../brainworms_arson"} brainworms_farting_noises = {path = "../brainworms_farting_noises"} -wgpu = { version = "0.18", default-features = false } +wgpu = { version = "0.19", default-features = false } pollster = "0.3.0" log = "0.4.20" @@ -26,6 +26,7 @@ env_logger = "0.10.2" # Linear algebra library glam = "0.24" +glam25compat = {package = "glam", version = "0.25"} # Importing png's image = { version = "0.24.3", default-features = false, features = ["png","jpeg","tiff"] } # Renderer core @@ -45,7 +46,7 @@ inox2d-wgpu = {path = "../inox2d/inox2d-wgpu"} bytemuck = { version = "1.14.1", features = ["derive"] } pico-args = "0.5" -wgpu-profiler = "0.15.0" +#wgpu-profiler = "0.15.0" #gluon = {git = "https://github.com/gluon-lang/gluon", branch = "master"} cfg-if = "1" diff --git a/brainworms_lib/src/lib.rs b/brainworms_lib/src/lib.rs index 03668da..6271bc0 100644 --- a/brainworms_lib/src/lib.rs +++ b/brainworms_lib/src/lib.rs @@ -22,7 +22,10 @@ pub use parry3d; use rend3::types::DirectionalLight; pub use rend3_routine; use rend3_routine::base::BaseRenderGraph; -use std::{sync::Arc, time}; +use std::{ + sync::Arc, + time::{self, Duration}, +}; pub use the_great_mind_palace_of_theatrical_arts as theater; use theater::{ basement::{ @@ -120,6 +123,7 @@ impl< .unwrap(); let window_size = window.inner_size(); + let window = Arc::new(window); // The one line of unsafe needed. We just need to guarentee that the window // outlives the use of the surface. // @@ -129,7 +133,7 @@ impl< None } else { Some(Arc::new( - unsafe { iad.instance.create_surface(&window) }.unwrap(), + iad.instance.create_surface(window.clone()).unwrap(), )) }; let renderer = rend3::Renderer::new( @@ -138,7 +142,7 @@ impl< Some(window_size.width as f32 / window_size.height as f32), ) .unwrap(); - self.state.window = Some(Arc::new(window)); + self.state.window = Some(window.clone()); self.state.renderer = Some(renderer.clone()); let window = self.state.window.clone().unwrap(); // Get the preferred format for the surface. @@ -209,7 +213,7 @@ impl< let mut control_flow = event_loop_window_target.control_flow(); if let Some(suspend) = Self::handle_surface( &mut self, - &window, + window.clone(), &event, &iad.instance, &mut surface, @@ -386,6 +390,7 @@ impl< .unwrap() { let t = game_data.timestamp_start.elapsed().as_secs_f32(); + let dt = game_state.last_update.unwrap().elapsed().as_secs_f32(); let actresses = cs_implementation.actresses.values(); for a in actresses { let renderer = Arc::clone(&renderer); @@ -393,7 +398,7 @@ impl< // this kind of makes self.spawn at best useless and probably counter-productive self.rts.as_ref().map(|rts| { rts.spawn(async move { - draw_actor(a, renderer, t); + draw_actor(a, renderer, t, dt); }) }); } @@ -427,7 +432,7 @@ impl< match event { WindowEvent::CloseRequested => { let the_rt = self.rts.take(); - the_rt.unwrap().shutdown_background(); + the_rt.unwrap().shutdown_timeout(Duration::from_secs(10)); event_loop_window_target.exit(); } winit::event::WindowEvent::Resized(size) => { diff --git a/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/basement/cla.rs b/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/basement/cla.rs index 94d560d..2138aeb 100644 --- a/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/basement/cla.rs +++ b/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/basement/cla.rs @@ -48,7 +48,6 @@ pub(crate) fn extract_backend(value: &str) -> Result { Ok(match value.to_lowercase().as_str() { "vulkan" | "vk" => Backend::Vulkan, "dx12" | "12" => Backend::Dx12, - "dx11" | "11" => Backend::Dx11, "metal" | "mtl" => Backend::Metal, "opengl" | "gl" => Backend::Gl, _ => return Err("unknown backend"), diff --git a/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/play/backstage/plumbing.rs b/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/play/backstage/plumbing.rs index bcc98cc..aff6f54 100644 --- a/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/play/backstage/plumbing.rs +++ b/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/play/backstage/plumbing.rs @@ -97,7 +97,7 @@ impl + 'static, InputContextEnum: Inpu #[allow(clippy::too_many_arguments)] pub(crate) fn handle_surface( &mut self, - window: &Window, + window: Arc, event: &Event, instance: &Instance, surface: &mut Option>, @@ -109,9 +109,7 @@ impl + 'static, InputContextEnum: Inpu Event::Resumed => { if surface.is_none() { // uhh this is still the same one line of unsafe I guess but for android - *surface = Some(Arc::new( - unsafe { instance.create_surface(window) }.unwrap(), - )); + *surface = Some(Arc::new(instance.create_surface(window.clone()).unwrap())); } Some(false) } @@ -154,6 +152,7 @@ impl + 'static, InputContextEnum: Inpu present_mode: wgpu::PresentMode::Immediate, alpha_mode, view_formats: Vec::new(), + desired_maximum_frame_latency: 2, }; surface diff --git a/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/play/scene/actors.rs b/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/play/scene/actors.rs index 3bbb9ee..6b4faec 100644 --- a/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/play/scene/actors.rs +++ b/brainworms_lib/src/the_great_mind_palace_of_theatrical_arts/play/scene/actors.rs @@ -1,6 +1,6 @@ use std::{num::NonZeroU32, sync::Arc}; -use glam::{uvec2, vec2, Vec2}; +use glam::uvec2; use inox2d::formats::inp::parse_inp; use parking_lot::Mutex; use rend3::{types::MipmapCount, Renderer}; @@ -35,7 +35,7 @@ pub enum AstinkSprite { Loaded((String, uuid::Uuid, Actress)), } -pub(crate) fn draw_actor(a: Arc>, renderer: Arc, t: f32) { +pub(crate) fn draw_actor(a: Arc>, renderer: Arc, t: f32, dt: f32) { let mut a = a.lock(); let AstinkSprite::Loaded((_, _, ref mut actress)) = *a else { return; @@ -46,9 +46,9 @@ pub(crate) fn draw_actor(a: Arc>, renderer: Arc, t puppet.begin_set_params(); - puppet.set_param("Head:: Yaw-Pitch", vec2(t.cos(), t.sin())); + puppet.set_named_param("Head:: Yaw-Pitch", glam25compat::vec2(t.cos(), t.sin())); - puppet.end_set_params(); + puppet.end_set_params(dt); } let inox_texture_rend3_handle = actress.texture_rend3_handle.clone(); @@ -93,7 +93,7 @@ pub async fn create_actor( ) { let path = format!("{}/{}.inp", &directory, name); let format = TextureFormat::Bgra8Unorm; - let texture_size_uvec2 = uvec2(8192, 8192); // we no longer care about the surface size for the sprite texture + let texture_size_uvec2 = glam25compat::uvec2(8192, 8192); // we no longer care about the surface size for the sprite texture let texture_size = wgpu::Extent3d { width: texture_size_uvec2.x, @@ -112,7 +112,7 @@ pub async fn create_actor( texture_size_uvec2, ); - inox_renderer.camera.scale = Vec2::splat(1.0); + inox_renderer.camera.scale = glam25compat::Vec2::splat(1.0); let inox_texture_descriptor = wgpu::TextureDescriptor { size: texture_size, @@ -132,7 +132,7 @@ pub async fn create_actor( base_mip_level: 0, ..Default::default() }); - + let texture_size_uvec2 = uvec2(8192, 8192); // we no longer care about the surface size for the sprite texture let inox_texture_rend3 = rend3::types::Texture { label: Some("inox texture but rend3".to_owned()), format, diff --git a/inox2d b/inox2d index 7f52e39..1a0c527 160000 --- a/inox2d +++ b/inox2d @@ -1 +1 @@ -Subproject commit 7f52e3939b23748e36927a3749eaaa5a6cd0278e +Subproject commit 1a0c527e8c68ba7221bff15324007e524225e9cb diff --git a/rend3 b/rend3 index a68c76a..c7c2d85 160000 --- a/rend3 +++ b/rend3 @@ -1 +1 @@ -Subproject commit a68c76a2809cf545484d727e32a222400134d085 +Subproject commit c7c2d859256972654c3ede7a9b95d8d607f9a0de