diff --git a/Cargo.lock b/Cargo.lock index 1648dcb..a5fe8a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -988,21 +988,30 @@ name = "ecolor" version = "0.34.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a05fbfa222ffb51989d5ccf33e5f7aebfcf96c5023413856b0c3618a7f79896e" +dependencies = [ + "emath 0.34.3", +] + +[[package]] +name = "ecolor" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6758be723a3f298bbfda4db75748bc2ba0abafe096b6383c7c32da264764fbc3" dependencies = [ "bytemuck", - "emath", + "emath 0.35.0", ] [[package]] name = "eframe" -version = "0.34.3" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98fe83b2589105b69dd25ca1e0fa2135a6e864d502fd8e08978f937e128cfef" +checksum = "8dc8234e2f681b2afd2b2e8c332fa614de2fddbdcb28d0acf5c420449682ea90" dependencies = [ "ahash", "bytemuck", "document-features", - "egui", + "egui 0.35.0", "egui-wgpu", "egui-winit", "egui_glow", @@ -1038,8 +1047,27 @@ dependencies = [ "accesskit", "ahash", "bitflags 2.13.0", - "emath", - "epaint", + "emath 0.34.3", + "epaint 0.34.3", + "log", + "nohash-hasher", + "profiling", + "smallvec", + "unicode-segmentation", +] + +[[package]] +name = "egui" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2796c98d50b79631281d516343a6f6e93c0666462ca36e2c93b39f25d7793325" +dependencies = [ + "accesskit", + "ahash", + "bitflags 2.13.0", + "emath 0.35.0", + "epaint 0.35.0", + "itertools", "log", "nohash-hasher", "profiling", @@ -1049,15 +1077,15 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.34.3" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0c0559ac5598a1b887a6206dccbab7e3e6246c57cb00ae287262bd44776c9c" +checksum = "d2e6cfac0725563555fa4f91e9f799b9d7c6c5dd831fca6abc8234afc64b7a34" dependencies = [ "ahash", "bytemuck", "document-features", - "egui", - "epaint", + "egui 0.35.0", + "epaint 0.35.0", "log", "profiling", "thiserror 2.0.18", @@ -1069,14 +1097,14 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.34.3" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967c5b323625d46d46a59b5daba3fef742248d27693cc18972458619858c4239" +checksum = "9ea6bf3608db949588b95b8b341ee358d0c3f95cf4dc3f53d8d76717edee87db" dependencies = [ "accesskit_winit", "arboard", "bytemuck", - "egui", + "egui 0.35.0", "log", "objc2 0.6.4", "objc2-foundation 0.3.2", @@ -1096,7 +1124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598d8675f6fd9088db8a93d8c7aacda936b2f3d0c2b0660ad1744a45b5caf922" dependencies = [ "ahash", - "egui", + "egui 0.34.3", "enum-map", "log", "mime_guess2", @@ -1105,18 +1133,16 @@ dependencies = [ [[package]] name = "egui_glow" -version = "0.34.3" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b652957fa7e1ab01e8fecbfbf4e35f6e43a53fa98af8a562b50d5403cd44b9" +checksum = "52274b9bfb8d8e252cd0f00c9f6214f360d75a0962baa77a2d62ddb002fe99d4" dependencies = [ "bytemuck", - "egui", + "egui 0.35.0", "glow", "log", "memoffset", "profiling", - "wasm-bindgen", - "web-sys", "winit", ] @@ -1126,7 +1152,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6afc56194563064faa79d5acc18f2a4d32bd6dfacc949e1d5b5c8058a46e82cf" dependencies = [ - "egui", + "egui 0.34.3", ] [[package]] @@ -1140,6 +1166,12 @@ name = "emath" version = "0.34.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b53f0d33a479321da6b0caa71366c9f67e8a2c149762d90bdc0d16e601ee8ecb" + +[[package]] +name = "emath" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd4ec073c9898516584d8c6cfdcee95b530b3d941cd5031ef4050aa36812308b" dependencies = [ "bytemuck", ] @@ -1196,21 +1228,45 @@ name = "epaint" version = "0.34.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6675898a291ec212fc3df04f537d177fce8496120244590e6359dcaa4c25da79" +dependencies = [ + "ahash", + "ecolor 0.34.3", + "emath 0.34.3", + "epaint_default_fonts 0.34.3", + "font-types", + "log", + "nohash-hasher", + "parking_lot", + "profiling", + "self_cell", + "skrifa 0.40.0", + "smallvec", + "vello_cpu 0.0.6", +] + +[[package]] +name = "epaint" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e60a8888b51da911df23918fd7301359b1d43a406a0ff3b8863af093dd7fc6c" dependencies = [ "ahash", "bytemuck", - "ecolor", - "emath", - "epaint_default_fonts", + "ecolor 0.35.0", + "emath 0.35.0", + "epaint_default_fonts 0.35.0", "font-types", + "harfrust", "log", "nohash-hasher", "parking_lot", "profiling", "self_cell", - "skrifa", + "skrifa 0.42.1", "smallvec", - "vello_cpu", + "unicode-general-category", + "unicode-segmentation", + "vello_cpu 0.0.9", ] [[package]] @@ -1219,6 +1275,12 @@ version = "0.34.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8970033a4282a7bcf899b38b5ed3a58b732fe093d03785d58648515d8d309da" +[[package]] +name = "epaint_default_fonts" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13ee4e1f553a3584c301f3a56ff1a775f1384781396cea301c8d952e9b93f560" + [[package]] name = "equivalent" version = "1.0.2" @@ -1307,6 +1369,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "fearless_simd" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693" + [[package]] name = "filetime" version = "0.2.29" @@ -1538,6 +1606,22 @@ dependencies = [ "xml-rs", ] +[[package]] +name = "glifo" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d99fc21d493812643aae86d53b7bbd02f376434a90317e8a790bc209fdd6605e" +dependencies = [ + "bytemuck", + "foldhash 0.2.0", + "hashbrown 0.17.1", + "log", + "peniko", + "skrifa 0.42.1", + "smallvec", + "vello_common 0.0.9", +] + [[package]] name = "glow" version = "0.17.0" @@ -1650,6 +1734,15 @@ dependencies = [ "bitflags 2.13.0", ] +[[package]] +name = "guillotiere" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b17e70c989c36bad147b27a58d148c0741c51448aa5653436547323e524d0ab" +dependencies = [ + "euclid", +] + [[package]] name = "half" version = "2.7.1" @@ -1662,6 +1755,18 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "harfrust" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0431e8e389aa0f1e72bb9d1c2db8957a1a7a3580e8ed97db819c14837aac9b3e" +dependencies = [ + "bitflags 2.13.0", + "bytemuck", + "read-fonts 0.39.2", + "smallvec", +] + [[package]] name = "hashbrown" version = "0.15.5" @@ -1687,6 +1792,9 @@ name = "hashbrown" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +dependencies = [ + "foldhash 0.2.0", +] [[package]] name = "heck" @@ -2206,9 +2314,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "lzma-rust2" @@ -3257,6 +3365,16 @@ dependencies = [ "font-types", ] +[[package]] +name = "read-fonts" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81" +dependencies = [ + "bytemuck", + "font-types", +] + [[package]] name = "recycle_vec" version = "1.1.2" @@ -3601,7 +3719,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac" dependencies = [ "bytemuck", - "read-fonts", + "read-fonts 0.37.0", +] + +[[package]] +name = "skrifa" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564" +dependencies = [ + "bytemuck", + "read-fonts 0.39.2", ] [[package]] @@ -4044,6 +4172,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" +[[package]] +name = "unicode-general-category" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f" + [[package]] name = "unicode-ident" version = "1.0.24" @@ -4157,14 +4291,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bd1a4c633ce09e7d713df1a6e036644a125e15e0c169cfb5180ddf5836ca04b" dependencies = [ "bytemuck", - "fearless_simd", + "fearless_simd 0.3.0", "hashbrown 0.16.1", "log", "peniko", - "skrifa", + "skrifa 0.40.0", "smallvec", ] +[[package]] +name = "vello_common" +version = "0.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d672facaa2d697285a786cd9d44d614cd2ce54cdc022504bf339f8fff3b750" +dependencies = [ + "bytemuck", + "fearless_simd 0.4.1", + "guillotiere", + "hashbrown 0.17.1", + "log", + "peniko", + "smallvec", + "thiserror 2.0.18", +] + [[package]] name = "vello_cpu" version = "0.0.6" @@ -4173,7 +4323,19 @@ checksum = "0162bfe48aabf6a9fdcd401b628c7d9f260c2cbabb343c70a65feba6f7849edc" dependencies = [ "bytemuck", "hashbrown 0.16.1", - "vello_common", + "vello_common 0.0.6", +] + +[[package]] +name = "vello_cpu" +version = "0.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588691169aed86b5c8fb487266afee01323234e6fd0a3f2aaec0eaa8e4007f23" +dependencies = [ + "bytemuck", + "glifo", + "hashbrown 0.17.1", + "vello_common 0.0.9", ] [[package]] diff --git a/gui/Cargo.toml b/gui/Cargo.toml index d9547bb..97af935 100644 --- a/gui/Cargo.toml +++ b/gui/Cargo.toml @@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false } mmm-core = { path = "../core" } mmm-edit = { path = "../edit" } nary_tree = { workspace = true } -eframe = "0.34" +eframe = "0.35" egui_extras = "0.34" egui_ltreeview = "0.7" rfd = "0.17"