diff --git a/Cargo.lock b/Cargo.lock index 0d69370..e61c521 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1154,7 +1154,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6758be723a3f298bbfda4db75748bc2ba0abafe096b6383c7c32da264764fbc3" dependencies = [ "bytemuck", - "emath", + "emath 0.35.0", +] + +[[package]] +name = "ecolor" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0656a7530b9e2841ee7a5f983965bdd9840c32f4012f759cfd44b912cced6b34" +dependencies = [ + "emath 0.36.2", ] [[package]] @@ -1166,8 +1175,8 @@ dependencies = [ "accesskit", "ahash", "bitflags 2.13.2", - "emath", - "epaint", + "emath 0.35.0", + "epaint 0.35.0", "itertools 0.14.0", "log", "nohash-hasher", @@ -1176,6 +1185,26 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "egui" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc938cc27cd911415e1e4d151bc56ff9df063d8db081374e87aeb805ea74b2ba" +dependencies = [ + "accesskit", + "ahash", + "bitflags 2.13.2", + "emath 0.36.2", + "epaint 0.36.2", + "itertools 0.15.0", + "log", + "nohash-hasher", + "profiling", + "smallvec", + "unicode-segmentation", + "web-sys", +] + [[package]] name = "egui-wgpu" version = "0.35.0" @@ -1185,7 +1214,7 @@ dependencies = [ "ahash", "bytemuck", "document-features", - "epaint", + "epaint 0.35.0", "log", "profiling", "thiserror 2.0.21", @@ -1201,7 +1230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea6bf3608db949588b95b8b341ee358d0c3f95cf4dc3f53d8d76717edee87db" dependencies = [ "bytemuck", - "egui", + "egui 0.35.0", "log", "objc2 0.6.5", "objc2-foundation 0.3.2", @@ -1228,6 +1257,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "emath" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52c8d4141cf0f60fb2f7aefaf352d3ffa5171ef0ab09731c64391801e95e48f1" + [[package]] name = "embedded-io" version = "0.4.0" @@ -1254,28 +1289,51 @@ checksum = "4e60a8888b51da911df23918fd7301359b1d43a406a0ff3b8863af093dd7fc6c" dependencies = [ "ahash", "bytemuck", - "ecolor", - "emath", + "ecolor 0.35.0", + "emath 0.35.0", + "font-types 0.11.3", + "harfrust 0.7.0", + "log", + "nohash-hasher", + "parking_lot", + "profiling", + "self_cell", + "skrifa 0.42.1", + "smallvec", + "unicode-general-category", + "unicode-segmentation", + "vello_cpu 0.0.9", +] + +[[package]] +name = "epaint" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0ec0308dc23130fc1a7d4623a8534c2ed069c6dc84e258ee4f3de99615aa1a3" +dependencies = [ + "ahash", + "ecolor 0.36.2", + "emath 0.36.2", "epaint_default_fonts", - "font-types", - "harfrust", + "font-types 0.12.6", + "harfrust 0.12.0", "log", "nohash-hasher", "parking_lot", "profiling", "self_cell", - "skrifa", + "skrifa 0.44.0", "smallvec", "unicode-general-category", "unicode-segmentation", - "vello_cpu", + "vello_cpu 0.1.0", ] [[package]] name = "epaint_default_fonts" -version = "0.35.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13ee4e1f553a3584c301f3a56ff1a775f1384781396cea301c8d952e9b93f560" +checksum = "773fa9c96dd0dbef887e39d0ed6177f141cce4d68e6041df77570aa3702dfa13" [[package]] name = "equivalent" @@ -1389,6 +1447,15 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "font-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c92d9081c7ab3bd83ef1eecdfad090f3d966e3ce74106779664114cfe1a6274" +dependencies = [ + "bytemuck", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -1586,9 +1653,25 @@ dependencies = [ "hashbrown 0.17.1", "log", "peniko", - "skrifa", + "skrifa 0.42.1", "smallvec", - "vello_common", + "vello_common 0.0.9", +] + +[[package]] +name = "glifo" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4a1bb24121291d27230c1b1b44e07d6a9b28cefdb32fe1581dfb84e14f940a" +dependencies = [ + "bytemuck", + "foldhash 0.2.0", + "hashbrown 0.17.1", + "log", + "peniko", + "skrifa 0.44.0", + "smallvec", + "vello_common 0.1.0", ] [[package]] @@ -1692,7 +1775,19 @@ checksum = "0431e8e389aa0f1e72bb9d1c2db8957a1a7a3580e8ed97db819c14837aac9b3e" dependencies = [ "bitflags 2.13.2", "bytemuck", - "read-fonts", + "read-fonts 0.39.2", + "smallvec", +] + +[[package]] +name = "harfrust" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03d949a14aa089bbb282f7dd76a498a7f684428e4257202efc119ec010376f9" +dependencies = [ + "bitflags 2.13.2", + "bytemuck", + "read-fonts 0.41.0", "smallvec", ] @@ -1985,6 +2080,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.18" @@ -3506,7 +3610,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81" dependencies = [ "bytemuck", - "font-types", + "font-types 0.11.3", +] + +[[package]] +name = "read-fonts" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709" +dependencies = [ + "bytemuck", + "font-types 0.12.6", + "once_cell", ] [[package]] @@ -3762,7 +3877,7 @@ dependencies = [ "console_error_panic_hook", "cpal", "directories", - "egui", + "egui 0.36.2", "egui-wgpu", "egui-winit", "gilrs", @@ -4097,7 +4212,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564" dependencies = [ "bytemuck", - "read-fonts", + "read-fonts 0.39.2", +] + +[[package]] +name = "skrifa" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819ab7d62b1d3e72d9d9dea5650bac30424f9111364bb94928dbf5ecad1baa68" +dependencies = [ + "bytemuck", + "read-fonts 0.41.0", ] [[package]] @@ -4922,6 +5047,21 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "vello_common" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e9aed918117e8152c9eddfd8362d73c465c23f26c44786aa331707b8a64fa2" +dependencies = [ + "bytemuck", + "fearless_simd", + "guillotiere", + "log", + "peniko", + "smallvec", + "thiserror 2.0.21", +] + [[package]] name = "vello_cpu" version = "0.0.9" @@ -4929,9 +5069,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "588691169aed86b5c8fb487266afee01323234e6fd0a3f2aaec0eaa8e4007f23" dependencies = [ "bytemuck", - "glifo", + "glifo 0.1.1", + "hashbrown 0.17.1", + "vello_common 0.0.9", +] + +[[package]] +name = "vello_cpu" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac7349e1f55f6b801c7c277958df4ea53e7f20f21e8014910ad888b2ecda93ea" +dependencies = [ + "bytemuck", + "glifo 0.2.0", "hashbrown 0.17.1", - "vello_common", + "vello_common 0.1.0", ] [[package]] diff --git a/crates/rusty2600-frontend/Cargo.toml b/crates/rusty2600-frontend/Cargo.toml index 365742f..472ed8e 100644 --- a/crates/rusty2600-frontend/Cargo.toml +++ b/crates/rusty2600-frontend/Cargo.toml @@ -158,7 +158,7 @@ winit = "0.30" # and its honest, unresolved conclusion. wgpu = { version = "29", default-features = false, features = ["wgsl", "std"] } cpal = "0.18" -egui = "0.35" +egui = "0.36" egui-wgpu = "0.35" egui-winit = { version = "0.35", default-features = false, features = ["links", "wayland", "x11"] } thiserror = "2.0"