From 8340966d15e345dfc77fe60d644065d2e6340018 Mon Sep 17 00:00:00 2001 From: starlord Date: Fri, 27 Sep 2024 16:46:10 +0300 Subject: [PATCH 1/3] bumped egui version --- Cargo.lock | 1044 +++++++++++++------------- Cargo.toml | 4 +- examples/animated_nodes/Cargo.toml | 4 +- examples/basic/Cargo.toml | 4 +- examples/bevy_basic/Cargo.toml | 6 +- examples/bevy_basic/src/main.rs | 11 +- examples/demo/Cargo.toml | 4 +- examples/flex_nodes/Cargo.toml | 4 +- examples/interactive/Cargo.toml | 4 +- examples/label_change/Cargo.toml | 4 +- examples/multiple/Cargo.toml | 4 +- examples/multiple/src/main.rs | 39 +- examples/rainbow_edges/Cargo.toml | 4 +- examples/undirected/Cargo.toml | 4 +- examples/wasm_custom_draw/Cargo.toml | 4 +- examples/window/Cargo.toml | 4 +- 16 files changed, 552 insertions(+), 596 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fd5777..ee62695 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,27 +20,32 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" -dependencies = [ - "enumn", - "serde", -] +checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448" [[package]] name = "accesskit" -version = "0.14.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448" +checksum = "ef7442f1f520649b8e11ee3af6caeec24123fed4b63bc36a85b67308d8514fdf" +dependencies = [ + "enumn", + "serde", +] [[package]] -name = "accesskit_consumer" -version = "0.16.1" +name = "accesskit_atspi_common" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" +checksum = "ab9d2b364833ae6e2eae9359a374108b1c5488877a9f43d26f0cb700560af9ae" dependencies = [ - "accesskit 0.12.3", + "accesskit 0.16.1", + "accesskit_consumer 0.24.1", + "atspi-common", + "serde", + "thiserror", + "zvariant", ] [[package]] @@ -54,15 +59,13 @@ dependencies = [ ] [[package]] -name = "accesskit_macos" -version = "0.10.1" +name = "accesskit_consumer" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" +checksum = "7072a4f17b8e7440a88ce08eb657d1ec84be061b1a94be78f9699aa18e583885" dependencies = [ - "accesskit 0.12.3", - "accesskit_consumer 0.16.1", - "objc2 0.3.0-beta.3.patch-leaks.3", - "once_cell", + "accesskit 0.16.1", + "immutable-chunkmap", ] [[package]] @@ -73,41 +76,42 @@ checksum = "c236a84ff1111defc280cee755eaa953d0b24398786851b9d28322c6d3bb1ebd" dependencies = [ "accesskit 0.14.0", "accesskit_consumer 0.22.0", - "objc2 0.5.2", + "objc2", "objc2-app-kit", "objc2-foundation", "once_cell", ] [[package]] -name = "accesskit_unix" -version = "0.6.2" +name = "accesskit_macos" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f46c18d99ba61ad7123dd13eeb0c104436ab6af1df6a1cd8c11054ed394a08" +checksum = "716698a26b5113812348a9f99ec250cb7b4154c89a83bc55a8b7d8678a1ecf02" dependencies = [ - "accesskit 0.12.3", - "accesskit_consumer 0.16.1", - "async-channel", - "async-once-cell", - "atspi", - "futures-lite 1.13.0", + "accesskit 0.16.1", + "accesskit_consumer 0.24.1", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", - "serde", - "zbus", ] [[package]] -name = "accesskit_windows" -version = "0.15.1" +name = "accesskit_unix" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" +checksum = "fd552c7bae0cd2ba1131fb0cedad32f8915743e0ed086f989fd706431641f56e" dependencies = [ - "accesskit 0.12.3", - "accesskit_consumer 0.16.1", - "once_cell", - "paste", - "static_assertions", - "windows 0.48.0", + "accesskit 0.16.1", + "accesskit_atspi_common", + "async-channel", + "async-executor", + "async-task", + "atspi", + "futures-lite 1.13.0", + "futures-util", + "serde", + "zbus", ] [[package]] @@ -124,16 +128,17 @@ dependencies = [ ] [[package]] -name = "accesskit_winit" -version = "0.16.1" +name = "accesskit_windows" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5284218aca17d9e150164428a0ebc7b955f70e3a9a78b4c20894513aabf98a67" +checksum = "4d134e9eb16c98b35d1ff7056a027d7482968bcab0d8b625e7e72895b748d705" dependencies = [ - "accesskit 0.12.3", - "accesskit_macos 0.10.1", - "accesskit_unix", - "accesskit_windows 0.15.1", - "winit 0.29.15", + "accesskit 0.16.1", + "accesskit_consumer 0.24.1", + "paste", + "static_assertions", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] @@ -145,8 +150,22 @@ dependencies = [ "accesskit 0.14.0", "accesskit_macos 0.15.0", "accesskit_windows 0.20.0", - "raw-window-handle 0.6.2", - "winit 0.30.5", + "raw-window-handle", + "winit", +] + +[[package]] +name = "accesskit_winit" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "156c5066e7b3ac9a82fb80fc18dcee42f79967c47e0ff431bae23e7ee8412a83" +dependencies = [ + "accesskit 0.16.1", + "accesskit_macos 0.17.1", + "accesskit_unix", + "accesskit_windows 0.23.0", + "raw-window-handle", + "winit", ] [[package]] @@ -205,27 +224,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "android-activity" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" -dependencies = [ - "android-properties", - "bitflags 2.6.0", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk 0.8.0", - "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum", - "thiserror", -] - [[package]] name = "android-activity" version = "0.6.0" @@ -273,8 +271,8 @@ name = "animated_nodes" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "petgraph", ] @@ -346,7 +344,7 @@ dependencies = [ "core-graphics", "image", "log", - "objc2 0.5.2", + "objc2", "objc2-app-kit", "objc2-foundation", "parking_lot", @@ -381,6 +379,15 @@ dependencies = [ "libloading 0.7.4", ] +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading 0.8.5", +] + [[package]] name = "async-broadcast" version = "0.5.1" @@ -498,12 +505,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-once-cell" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" - [[package]] name = "async-process" version = "1.8.1" @@ -644,8 +645,8 @@ name = "basic" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "petgraph", ] @@ -787,7 +788,7 @@ version = "0.1.0" dependencies = [ "bevy", "bevy_egui", - "egui_graphs", + "egui_graphs 0.21.1", "petgraph", ] @@ -803,7 +804,7 @@ dependencies = [ "encase", "serde", "thiserror", - "wgpu-types", + "wgpu-types 0.20.0", ] [[package]] @@ -916,7 +917,7 @@ dependencies = [ "bytemuck", "console_log", "crossbeam-channel", - "egui", + "egui 0.28.1", "js-sys", "log", "thread_local", @@ -924,8 +925,8 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webbrowser", - "wgpu-types", - "winit 0.30.5", + "wgpu-types 0.20.0", + "winit", ] [[package]] @@ -1240,7 +1241,7 @@ dependencies = [ "image", "js-sys", "ktx2", - "naga", + "naga 0.20.0", "naga_oil", "nonmax", "ruzstd", @@ -1250,7 +1251,7 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu", + "wgpu 0.20.1", ] [[package]] @@ -1443,7 +1444,7 @@ dependencies = [ "hashbrown", "thread_local", "tracing", - "web-time 1.1.0", + "web-time", ] [[package]] @@ -1469,7 +1470,7 @@ dependencies = [ "bevy_math", "bevy_reflect", "bevy_utils", - "raw-window-handle 0.6.2", + "raw-window-handle", "smol_str", ] @@ -1495,10 +1496,10 @@ dependencies = [ "bevy_window", "cfg-if", "crossbeam-channel", - "raw-window-handle 0.6.2", + "raw-window-handle", "wasm-bindgen", "web-sys", - "winit 0.30.5", + "winit", ] [[package]] @@ -1527,7 +1528,16 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec", + "bit-vec 0.6.3", +] + +[[package]] +name = "bit-set" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" +dependencies = [ + "bit-vec 0.7.0", ] [[package]] @@ -1536,6 +1546,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bit-vec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" + [[package]] name = "bitflags" version = "1.3.2" @@ -1579,51 +1595,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.1.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" -dependencies = [ - "objc-sys 0.2.0-beta.2", -] - -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys 0.3.5", -] - -[[package]] -name = "block2" -version = "0.2.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" -dependencies = [ - "block-sys 0.1.0-beta.1", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys 0.2.1", - "objc2 0.4.1", -] - [[package]] name = "block2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "objc2 0.5.2", + "objc2", ] [[package]] @@ -1683,20 +1661,6 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.7.3", - "rustix 0.38.34", - "slab", - "thiserror", -] - [[package]] name = "calloop" version = "0.13.0" @@ -1711,25 +1675,13 @@ dependencies = [ "thiserror", ] -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop 0.12.4", - "rustix 0.38.34", - "wayland-backend", - "wayland-client", -] - [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.13.0", + "calloop", "rustix 0.38.34", "wayland-backend", "wayland-client", @@ -2129,8 +2081,8 @@ version = "0.1.0" dependencies = [ "crossbeam", "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "fdg", "petgraph", "rand", @@ -2201,43 +2153,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8" dependencies = [ "bytemuck", - "emath", + "emath 0.28.1", +] + +[[package]] +name = "ecolor" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5629649a8ae57c73f175f4a96419905a8102cfbfcbce96ea25a826bbf468e990" +dependencies = [ + "bytemuck", + "emath 0.29.0", "serde", ] [[package]] name = "eframe" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6490ef800b2e41ee129b1f32f9ac15f713233fe3bc18e241a1afe1e4fb6811e0" +checksum = "712634e63d86f5eb8e30f880bc4803b79dcc82539aec1a28fde86ed839daed24" dependencies = [ "ahash", "bytemuck", "document-features", - "egui", + "egui 0.29.0", "egui-wgpu", "egui-winit", "egui_glow", - "glow", + "glow 0.14.1", "glutin", "glutin-winit", "image", "js-sys", "log", - "objc2 0.5.2", + "objc2", "objc2-app-kit", "objc2-foundation", "parking_lot", "percent-encoding", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.2", + "raw-window-handle", "static_assertions", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "web-time 0.2.4", + "web-time", "winapi", - "winit 0.29.15", + "windows-sys 0.52.0", + "winit", ] [[package]] @@ -2246,10 +2208,22 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798" dependencies = [ - "accesskit 0.12.3", "ahash", - "emath", - "epaint", + "emath 0.28.1", + "epaint 0.28.1", + "nohash-hasher", +] + +[[package]] +name = "egui" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26bab3b3572566257a497b5f87d2cccaf7f7f122d4b8b620cba0493becc7955e" +dependencies = [ + "accesskit 0.16.1", + "ahash", + "emath 0.29.0", + "epaint 0.29.0", "log", "nohash-hasher", "serde", @@ -2257,64 +2231,75 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c7a7c707877c3362a321ebb4f32be811c0b91f7aebf345fb162405c0218b4c" +checksum = "ba69456826abf572ed95b658b265c01f07a23d615d6f029eedc9ee5f13ddf788" dependencies = [ "ahash", "bytemuck", "document-features", - "egui", - "epaint", + "egui 0.29.0", + "epaint 0.29.0", "log", "thiserror", "type-map", - "web-time 0.2.4", - "wgpu", - "winit 0.29.15", + "web-time", + "wgpu 22.1.0", + "winit", ] [[package]] name = "egui-winit" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac4e066af341bf92559f60dbdf2020b2a03c963415349af5f3f8d79ff7a4926" +checksum = "642c749bf221b5a3ecae3144c98b837729d87b9fde6c39a6ad00f07b71dbee94" dependencies = [ - "accesskit_winit 0.16.1", + "accesskit_winit 0.22.1", "ahash", "arboard", - "egui", + "egui 0.29.0", "log", - "raw-window-handle 0.6.2", + "raw-window-handle", "smithay-clipboard", - "web-time 0.2.4", + "web-time", "webbrowser", - "winit 0.29.15", + "winit", ] [[package]] name = "egui_glow" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2bdc8b38cfa17cc712c4ae079e30c71c00cd4c2763c9e16dc7860a02769103" +checksum = "ea182206896187f7a2fcc207a1573785fc31330cb245f6cebcf663ea933f8d20" dependencies = [ "ahash", "bytemuck", - "egui", - "glow", + "egui 0.29.0", + "glow 0.14.1", "log", "memoffset 0.9.1", "wasm-bindgen", "web-sys", - "winit 0.29.15", + "winit", ] [[package]] name = "egui_graphs" version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1908479c6946869bd37be4948545fef74b1a5a86c60e9e693c19e0987839f8d5" +dependencies = [ + "egui 0.28.1", + "petgraph", + "rand", +] + +[[package]] +name = "egui_graphs" +version = "0.22.0" dependencies = [ "crossbeam", - "egui", + "egui 0.29.0", "petgraph", "rand", "serde", @@ -2332,6 +2317,15 @@ name = "emath" version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "emath" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af86c4efae11da2a3dcbb4afebd0e9ed1916345e8d187b4051d443c8bd79af93" dependencies = [ "bytemuck", "serde", @@ -2433,14 +2427,36 @@ dependencies = [ "ab_glyph", "ahash", "bytemuck", - "ecolor", - "emath", + "ecolor 0.28.1", + "emath 0.28.1", + "nohash-hasher", + "parking_lot", +] + +[[package]] +name = "epaint" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e11ec86a4d85e1350578ba20b2d89977ed937f3faab32e1c3ec81d20c1842" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor 0.29.0", + "emath 0.29.0", + "epaint_default_fonts", "log", "nohash-hasher", "parking_lot", "serde", ] +[[package]] +name = "epaint_default_fonts" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5202b64bef2b2c42a7f6e2e5b40fa83dd04aa61fdb08bfd116553adc149fe47a" + [[package]] name = "equivalent" version = "1.0.1" @@ -2584,8 +2600,8 @@ name = "flex_nodes" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "petgraph", ] @@ -2671,6 +2687,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "futures-sink" version = "0.3.30" @@ -2691,6 +2718,7 @@ checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", + "futures-macro", "futures-sink", "futures-task", "memchr", @@ -2806,6 +2834,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "glow" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4a888dbe8181a7535853469c21c67ca9a1cea9460b16808fc018ea9e55d248" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gltf" version = "1.4.1" @@ -2844,55 +2884,56 @@ dependencies = [ [[package]] name = "glutin" -version = "0.31.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" +checksum = "ec69412a0bf07ea7607e638b415447857a808846c2b685a43c8aa18bc6d5e499" dependencies = [ "bitflags 2.6.0", - "cfg_aliases 0.1.1", + "cfg_aliases 0.2.1", "cgl", "core-foundation", "dispatch", "glutin_egl_sys", "glutin_glx_sys", - "glutin_wgl_sys", - "icrate", + "glutin_wgl_sys 0.6.0", "libloading 0.8.5", - "objc2 0.4.1", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", - "raw-window-handle 0.5.2", + "raw-window-handle", "wayland-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", ] [[package]] name = "glutin-winit" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" +checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f" dependencies = [ - "cfg_aliases 0.1.1", + "cfg_aliases 0.2.1", "glutin", - "raw-window-handle 0.5.2", - "winit 0.29.15", + "raw-window-handle", + "winit", ] [[package]] name = "glutin_egl_sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" +checksum = "cae99fff4d2850dbe6fb8c1fa8e4fead5525bab715beaacfccf3fb994e01c827" dependencies = [ "gl_generator", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "glutin_glx_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" +checksum = "9c2b2d3918e76e18e08796b55eb64e8fe6ec67d5a6b2e2a7e2edce224ad24c63" dependencies = [ "gl_generator", "x11-dl", @@ -2907,6 +2948,15 @@ dependencies = [ "gl_generator", ] +[[package]] +name = "glutin_wgl_sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" +dependencies = [ + "gl_generator", +] + [[package]] name = "glyph_brush_layout" version = "0.2.4" @@ -2950,6 +3000,19 @@ dependencies = [ "windows 0.52.0", ] +[[package]] +name = "gpu-allocator" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" +dependencies = [ + "log", + "presser", + "thiserror", + "winapi", + "windows 0.52.0", +] + [[package]] name = "gpu-descriptor" version = "0.3.0" @@ -3061,17 +3124,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - [[package]] name = "idna" version = "0.5.0" @@ -3157,8 +3209,8 @@ name = "interactive" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "petgraph", ] @@ -3281,8 +3333,8 @@ name = "label_change" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "petgraph", ] @@ -3481,6 +3533,21 @@ dependencies = [ "paste", ] +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3502,8 +3569,8 @@ name = "multiple" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "petgraph", ] @@ -3514,7 +3581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" dependencies = [ "arrayvec", - "bit-set", + "bit-set 0.5.3", "bitflags 2.6.0", "codespan-reporting", "hexf-parse", @@ -3529,17 +3596,38 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "naga" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" +dependencies = [ + "arrayvec", + "bit-set 0.6.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + [[package]] name = "naga_oil" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "275d9720a7338eedac966141089232514c84d76a246a58ef501af88c5edf402f" dependencies = [ - "bit-set", + "bit-set 0.5.3", "codespan-reporting", "data-encoding", "indexmap", - "naga", + "naga 0.20.0", "once_cell", "regex", "regex-syntax 0.8.4", @@ -3589,8 +3677,6 @@ dependencies = [ "log", "ndk-sys 0.5.0+25.2.9519653", "num_enum", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.2", "thiserror", ] @@ -3605,7 +3691,7 @@ dependencies = [ "log", "ndk-sys 0.6.0+11769913", "num_enum", - "raw-window-handle 0.6.2", + "raw-window-handle", "thiserror", ] @@ -3777,47 +3863,20 @@ dependencies = [ "malloc_buf", ] -[[package]] -name = "objc-sys" -version = "0.2.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" - [[package]] name = "objc-sys" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" -[[package]] -name = "objc2" -version = "0.3.0-beta.3.patch-leaks.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" -dependencies = [ - "block2 0.2.0-alpha.6", - "objc-sys 0.2.0-beta.2", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys 0.3.5", - "objc2-encode 3.0.0", -] - [[package]] name = "objc2" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "objc-sys 0.3.5", - "objc2-encode 4.0.3", + "objc-sys", + "objc2-encode", ] [[package]] @@ -3827,9 +3886,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", + "block2", "libc", - "objc2 0.5.2", + "objc2", "objc2-core-data", "objc2-core-image", "objc2-foundation", @@ -3843,8 +3902,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-core-location", "objc2-foundation", ] @@ -3855,8 +3914,8 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-foundation", ] @@ -3867,8 +3926,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-foundation", ] @@ -3878,8 +3937,8 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-foundation", "objc2-metal", ] @@ -3890,27 +3949,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-contacts", "objc2-foundation", ] -[[package]] -name = "objc2-encode" -version = "2.0.0-pre.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" -dependencies = [ - "objc-sys 0.2.0-beta.2", -] - -[[package]] -name = "objc2-encode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" - [[package]] name = "objc2-encode" version = "4.0.3" @@ -3924,10 +3968,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", + "block2", "dispatch", "libc", - "objc2 0.5.2", + "objc2", ] [[package]] @@ -3936,8 +3980,8 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-app-kit", "objc2-foundation", ] @@ -3949,8 +3993,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-foundation", ] @@ -3961,8 +4005,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-foundation", "objc2-metal", ] @@ -3973,7 +4017,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" dependencies = [ - "objc2 0.5.2", + "objc2", "objc2-foundation", ] @@ -3984,8 +4028,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-cloud-kit", "objc2-core-data", "objc2-core-image", @@ -4004,8 +4048,8 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-foundation", ] @@ -4016,8 +4060,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-core-location", "objc2-foundation", ] @@ -4327,8 +4371,8 @@ name = "rainbow_edges" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "petgraph", ] @@ -4378,12 +4422,6 @@ 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - [[package]] name = "raw-window-handle" version = "0.6.2" @@ -4422,15 +4460,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb" -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4600,19 +4629,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sctk-adwaita" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" -dependencies = [ - "ab_glyph", - "log", - "memmap2", - "smithay-client-toolkit 0.18.1", - "tiny-skia", -] - [[package]] name = "sctk-adwaita" version = "0.10.1" @@ -4622,7 +4638,7 @@ dependencies = [ "ab_glyph", "log", "memmap2", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "tiny-skia", ] @@ -4753,31 +4769,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2", - "rustix 0.38.34", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" @@ -4785,8 +4776,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop", + "calloop-wayland-source", "cursor-icon", "libc", "log", @@ -4797,8 +4788,8 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.3", - "wayland-protocols-wlr 0.3.3", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkeysym", ] @@ -4810,7 +4801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -5176,8 +5167,8 @@ name = "undirected" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "petgraph", ] @@ -5359,8 +5350,8 @@ name = "wasm_custom_draw" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "env_logger", "getrandom", "instant", @@ -5417,18 +5408,6 @@ dependencies = [ "xcursor", ] -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - [[package]] name = "wayland-protocols" version = "0.32.3" @@ -5441,19 +5420,6 @@ dependencies = [ "wayland-scanner", ] -[[package]] -name = "wayland-protocols-plasma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", - "wayland-scanner", -] - [[package]] name = "wayland-protocols-plasma" version = "0.3.3" @@ -5463,20 +5429,7 @@ dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] @@ -5489,7 +5442,7 @@ dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", + "wayland-protocols", "wayland-scanner", ] @@ -5526,16 +5479,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "web-time" version = "1.1.0" @@ -5552,13 +5495,13 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" dependencies = [ - "block2 0.5.1", + "block2", "core-foundation", "home", "jni", "log", "ndk-context", - "objc2 0.5.2", + "objc2", "objc2-foundation", "url", "web-sys", @@ -5582,18 +5525,42 @@ dependencies = [ "document-features", "js-sys", "log", - "naga", + "naga 0.20.0", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.21.1", + "wgpu-hal 0.21.1", + "wgpu-types 0.20.0", +] + +[[package]] +name = "wgpu" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" +dependencies = [ + "arrayvec", + "cfg_aliases 0.1.1", + "document-features", + "js-sys", + "log", "parking_lot", "profiling", - "raw-window-handle 0.6.2", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 22.1.0", + "wgpu-hal 22.0.0", + "wgpu-types 22.0.0", ] [[package]] @@ -5603,24 +5570,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" dependencies = [ "arrayvec", - "bit-vec", + "bit-vec 0.6.3", "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", "document-features", "indexmap", "log", - "naga", + "naga 0.20.0", "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.2", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.21.1", + "wgpu-types 0.20.0", +] + +[[package]] +name = "wgpu-core" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" +dependencies = [ + "arrayvec", + "bit-vec 0.7.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "document-features", + "indexmap", + "log", + "naga 22.1.0", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "wgpu-hal 22.0.0", + "wgpu-types 22.0.0", ] [[package]] @@ -5631,17 +5623,17 @@ checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" dependencies = [ "android_system_properties", "arrayvec", - "ash", - "bit-set", + "ash 0.37.3+1.3.251", + "bit-set 0.5.3", "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", "d3d12", - "glow", - "glutin_wgl_sys", + "glow 0.13.1", + "glutin_wgl_sys 0.5.0", "gpu-alloc", - "gpu-allocator", + "gpu-allocator 0.25.0", "gpu-descriptor", "hassle-rs", "js-sys", @@ -5649,22 +5641,63 @@ dependencies = [ "libc", "libloading 0.8.5", "log", - "metal", - "naga", + "metal 0.28.0", + "naga 0.20.0", "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.6.2", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.20.0", + "winapi", +] + +[[package]] +name = "wgpu-hal" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash 0.38.0+1.3.281", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "core-graphics-types", + "glow 0.13.1", + "glutin_wgl_sys 0.6.0", + "gpu-alloc", + "gpu-allocator 0.26.0", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.5", + "log", + "metal 0.29.0", + "naga 22.1.0", + "ndk-sys 0.5.0+25.2.9519653", + "objc", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 22.0.0", "winapi", ] @@ -5679,6 +5712,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wgpu-types" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" +dependencies = [ + "bitflags 2.6.0", + "js-sys", + "web-sys", +] + [[package]] name = "wide" version = "0.7.28" @@ -5731,22 +5775,11 @@ name = "window" version = "0.1.0" dependencies = [ "eframe", - "egui", - "egui_graphs", + "egui 0.29.0", + "egui_graphs 0.22.0", "petgraph", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement 0.48.0", - "windows-interface 0.48.0", - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" @@ -5811,17 +5844,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-implement" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "windows-implement" version = "0.53.0" @@ -5844,17 +5866,6 @@ dependencies = [ "syn 2.0.74", ] -[[package]] -name = "windows-interface" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "windows-interface" version = "0.53.0" @@ -6119,55 +6130,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winit" -version = "0.29.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" -dependencies = [ - "ahash", - "android-activity 0.5.2", - "atomic-waker", - "bitflags 2.6.0", - "bytemuck", - "calloop 0.12.4", - "cfg_aliases 0.1.1", - "core-foundation", - "core-graphics", - "cursor-icon", - "icrate", - "js-sys", - "libc", - "log", - "memmap2", - "ndk 0.8.0", - "ndk-sys 0.5.0+25.2.9519653", - "objc2 0.4.1", - "once_cell", - "orbclient", - "percent-encoding", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.2", - "redox_syscall 0.3.5", - "rustix 0.38.34", - "sctk-adwaita 0.8.3", - "smithay-client-toolkit 0.18.1", - "smol_str", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", - "wayland-protocols-plasma 0.2.0", - "web-sys", - "web-time 0.2.4", - "windows-sys 0.48.0", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] - [[package]] name = "winit" version = "0.30.5" @@ -6175,12 +6137,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ "ahash", - "android-activity 0.6.0", + "android-activity", "atomic-waker", "bitflags 2.6.0", - "block2 0.5.1", + "block2", "bytemuck", - "calloop 0.13.0", + "calloop", "cfg_aliases 0.2.1", "concurrent-queue", "core-foundation", @@ -6191,18 +6153,18 @@ dependencies = [ "libc", "memmap2", "ndk 0.9.0", - "objc2 0.5.2", + "objc2", "objc2-app-kit", "objc2-foundation", "objc2-ui-kit", "orbclient", "percent-encoding", "pin-project", - "raw-window-handle 0.6.2", + "raw-window-handle", "redox_syscall 0.4.1", "rustix 0.38.34", - "sctk-adwaita 0.10.1", - "smithay-client-toolkit 0.19.2", + "sctk-adwaita", + "smithay-client-toolkit", "smol_str", "tracing", "unicode-segmentation", @@ -6210,10 +6172,10 @@ dependencies = [ "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", - "wayland-protocols-plasma 0.3.3", + "wayland-protocols", + "wayland-protocols-plasma", "web-sys", - "web-time 1.1.0", + "web-time", "windows-sys 0.52.0", "x11-dl", "x11rb", diff --git a/Cargo.toml b/Cargo.toml index deffe19..5f5bbf0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "egui_graphs" -version = "0.21.1" +version = "0.22.0" authors = ["Dmitrii Samsonov "] license = "MIT" homepage = "https://github.com/blitzarx1/egui_graphs" @@ -11,7 +11,7 @@ keywords = ["egui", "ui", "graph", "node-graph"] categories = ["gui", "visualization"] [dependencies] -egui = { version = "0.28", default-features = false } +egui = { version = "0.29", default-features = false } rand = "0.8" petgraph = { version = "0.6", default-features = false, features = [ "stable_graph", diff --git a/examples/animated_nodes/Cargo.toml b/examples/animated_nodes/Cargo.toml index f45f4c3..e05f39e 100644 --- a/examples/animated_nodes/Cargo.toml +++ b/examples/animated_nodes/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" diff --git a/examples/basic/Cargo.toml b/examples/basic/Cargo.toml index ad395b7..9464d44 100644 --- a/examples/basic/Cargo.toml +++ b/examples/basic/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" diff --git a/examples/bevy_basic/Cargo.toml b/examples/bevy_basic/Cargo.toml index bdba160..bddba0b 100644 --- a/examples/bevy_basic/Cargo.toml +++ b/examples/bevy_basic/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" edition = "2021" [dependencies] -egui_graphs = { path = "../../" } -bevy = "0.14.2" -bevy_egui = "0.29.0" +egui_graphs = "0.21" +bevy = "0.14" +bevy_egui = "0.29" petgraph = "0.6" diff --git a/examples/bevy_basic/src/main.rs b/examples/bevy_basic/src/main.rs index f357dde..feb381a 100644 --- a/examples/bevy_basic/src/main.rs +++ b/examples/bevy_basic/src/main.rs @@ -1,6 +1,6 @@ use bevy::prelude::*; use bevy_egui::{egui, EguiContexts, EguiPlugin}; -use egui_graphs::{DefaultEdgeShape, DefaultNodeShape, Graph, GraphView}; +use egui_graphs::{Graph, GraphView}; use petgraph::stable_graph::StableGraph; fn main() { @@ -46,13 +46,6 @@ fn update_graph(mut contexts: EguiContexts, mut q_graph: Query<&mut BasicGraph>) let mut graph = q_graph.single_mut(); egui::CentralPanel::default().show(ctx, |ui| { - ui.add(&mut GraphView::< - _, - _, - _, - _, - DefaultNodeShape, - DefaultEdgeShape, - >::new(&mut graph.0)); + ui.add(&mut GraphView::new(&mut graph.0)); }); } diff --git a/examples/demo/Cargo.toml b/examples/demo/Cargo.toml index f29cdab..ca7447d 100644 --- a/examples/demo/Cargo.toml +++ b/examples/demo/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../", features = ["events"] } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" serde_json = "1.0" petgraph = "0.6" fdg = { git = "https://github.com/grantshandy/fdg" } diff --git a/examples/flex_nodes/Cargo.toml b/examples/flex_nodes/Cargo.toml index 689d8ab..359e10a 100644 --- a/examples/flex_nodes/Cargo.toml +++ b/examples/flex_nodes/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" diff --git a/examples/interactive/Cargo.toml b/examples/interactive/Cargo.toml index cbbf2c7..9373f94 100644 --- a/examples/interactive/Cargo.toml +++ b/examples/interactive/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" diff --git a/examples/label_change/Cargo.toml b/examples/label_change/Cargo.toml index ddcf88f..779b963 100644 --- a/examples/label_change/Cargo.toml +++ b/examples/label_change/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" diff --git a/examples/multiple/Cargo.toml b/examples/multiple/Cargo.toml index 1952265..2858c81 100644 --- a/examples/multiple/Cargo.toml +++ b/examples/multiple/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" diff --git a/examples/multiple/src/main.rs b/examples/multiple/src/main.rs index 614d9ea..f55c99f 100644 --- a/examples/multiple/src/main.rs +++ b/examples/multiple/src/main.rs @@ -23,25 +23,26 @@ impl App for BasicApp { .default_width(available_width / 3.) .resizable(true) .show(ctx, |ui| { - ui.child_ui(ui.max_rect(), Layout::default(), None); - ui.add( - &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new( - &mut self.g, - ) - .with_navigations( - &SettingsNavigation::default() - .with_fit_to_screen_enabled(false) - .with_zoom_and_pan_enabled(true), - ) - .with_interactions( - &SettingsInteraction::default() - .with_node_selection_multi_enabled(true) - .with_node_selection_enabled(true) - .with_edge_selection_enabled(true) - .with_edge_selection_multi_enabled(true) - .with_dragging_enabled(true), - ), - ) + ui.allocate_ui_with_layout(ui.max_rect().size(), Layout::default(), |ui| { + ui.add( + &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new( + &mut self.g, + ) + .with_navigations( + &SettingsNavigation::default() + .with_fit_to_screen_enabled(false) + .with_zoom_and_pan_enabled(true), + ) + .with_interactions( + &SettingsInteraction::default() + .with_node_selection_multi_enabled(true) + .with_node_selection_enabled(true) + .with_edge_selection_enabled(true) + .with_edge_selection_multi_enabled(true) + .with_dragging_enabled(true), + ), + ); + }); }); SidePanel::right("right_panel") .default_width(available_width / 3.) diff --git a/examples/rainbow_edges/Cargo.toml b/examples/rainbow_edges/Cargo.toml index ac99f93..647231f 100644 --- a/examples/rainbow_edges/Cargo.toml +++ b/examples/rainbow_edges/Cargo.toml @@ -5,6 +5,6 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" diff --git a/examples/undirected/Cargo.toml b/examples/undirected/Cargo.toml index 1a712fa..0ee055d 100644 --- a/examples/undirected/Cargo.toml +++ b/examples/undirected/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" diff --git a/examples/wasm_custom_draw/Cargo.toml b/examples/wasm_custom_draw/Cargo.toml index bb08852..b5ab7bf 100644 --- a/examples/wasm_custom_draw/Cargo.toml +++ b/examples/wasm_custom_draw/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" # Wasm related dependencies diff --git a/examples/window/Cargo.toml b/examples/window/Cargo.toml index 9748bf6..d041b7b 100644 --- a/examples/window/Cargo.toml +++ b/examples/window/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] egui_graphs = { path = "../../" } -egui = "0.28" -eframe = "0.28" +egui = "0.29" +eframe = "0.29" petgraph = "0.6" From 4542e31b87160ff5a09c4eeaad95e26bcba3989d Mon Sep 17 00:00:00 2001 From: starlord Date: Fri, 27 Sep 2024 16:53:17 +0300 Subject: [PATCH 2/3] default usage fix --- examples/demo/src/main.rs | 4 +-- examples/interactive/src/main.rs | 6 ++-- examples/label_change/src/main.rs | 19 +++++----- examples/multiple/src/main.rs | 58 ++++++++++++++----------------- examples/undirected/src/main.rs | 11 ++---- examples/window/src/main.rs | 11 ++---- 6 files changed, 42 insertions(+), 67 deletions(-) diff --git a/examples/demo/src/main.rs b/examples/demo/src/main.rs index 73ee499..6f4a4d4 100644 --- a/examples/demo/src/main.rs +++ b/examples/demo/src/main.rs @@ -5,7 +5,7 @@ use drawers::ValuesSectionDebug; use eframe::{run_native, App, CreationContext}; use egui::{CollapsingHeader, Context, Pos2, ScrollArea, Ui, Vec2}; use egui_graphs::events::Event; -use egui_graphs::{to_graph, DefaultEdgeShape, DefaultNodeShape, Edge, Graph, GraphView, Node}; +use egui_graphs::{to_graph, Edge, Graph, GraphView, Node}; use fdg::fruchterman_reingold::{FruchtermanReingold, FruchtermanReingoldConfiguration}; use fdg::nalgebra::{Const, OPoint}; use fdg::{Force, ForceGraph}; @@ -511,7 +511,7 @@ impl App for DemoApp { let settings_style = &egui_graphs::SettingsStyle::new() .with_labels_always(self.settings_style.labels_always); ui.add( - &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(&mut self.g) + &mut GraphView::new(&mut self.g) .with_interactions(settings_interaction) .with_navigations(settings_navigation) .with_styles(settings_style) diff --git a/examples/interactive/src/main.rs b/examples/interactive/src/main.rs index c581e2f..8dbf120 100644 --- a/examples/interactive/src/main.rs +++ b/examples/interactive/src/main.rs @@ -1,8 +1,6 @@ use eframe::{run_native, App, CreationContext}; use egui::Context; -use egui_graphs::{ - DefaultEdgeShape, DefaultNodeShape, Graph, GraphView, SettingsInteraction, SettingsStyle, -}; +use egui_graphs::{Graph, GraphView, SettingsInteraction, SettingsStyle}; use petgraph::stable_graph::StableGraph; pub struct InteractiveApp { @@ -29,7 +27,7 @@ impl App for InteractiveApp { .with_edge_selection_multi_enabled(true); let style_settings = &SettingsStyle::new().with_labels_always(true); ui.add( - &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(&mut self.g) + &mut GraphView::new(&mut self.g) .with_styles(style_settings) .with_interactions(interaction_settings), ); diff --git a/examples/label_change/src/main.rs b/examples/label_change/src/main.rs index 8ff32b9..acd8666 100644 --- a/examples/label_change/src/main.rs +++ b/examples/label_change/src/main.rs @@ -1,8 +1,6 @@ use eframe::{run_native, App, CreationContext}; use egui::{CentralPanel, Context, SidePanel, TextEdit}; -use egui_graphs::{ - DefaultEdgeShape, DefaultNodeShape, Graph, GraphView, SettingsInteraction, SettingsStyle, -}; +use egui_graphs::{Graph, GraphView, SettingsInteraction, SettingsStyle}; use petgraph::stable_graph::{EdgeIndex, NodeIndex, StableGraph}; pub struct LabelChangeApp { @@ -54,14 +52,13 @@ impl LabelChangeApp { } }); CentralPanel::default().show(ctx, |ui| { - let widget = - &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(&mut self.g) - .with_interactions( - &SettingsInteraction::default() - .with_node_selection_enabled(true) - .with_edge_selection_enabled(true), - ) - .with_styles(&SettingsStyle::default().with_labels_always(true)); + let widget = &mut GraphView::new(&mut self.g) + .with_interactions( + &SettingsInteraction::default() + .with_node_selection_enabled(true) + .with_edge_selection_enabled(true), + ) + .with_styles(&SettingsStyle::default().with_labels_always(true)); ui.add(widget); }); } diff --git a/examples/multiple/src/main.rs b/examples/multiple/src/main.rs index f55c99f..5ceec53 100644 --- a/examples/multiple/src/main.rs +++ b/examples/multiple/src/main.rs @@ -1,8 +1,6 @@ use eframe::{run_native, App, CreationContext, Frame}; use egui::{CentralPanel, Context, Layout, SidePanel}; -use egui_graphs::{ - DefaultEdgeShape, DefaultNodeShape, Graph, GraphView, SettingsInteraction, SettingsNavigation, -}; +use egui_graphs::{Graph, GraphView, SettingsInteraction, SettingsNavigation}; use petgraph::stable_graph::StableGraph; pub struct BasicApp { @@ -25,9 +23,29 @@ impl App for BasicApp { .show(ctx, |ui| { ui.allocate_ui_with_layout(ui.max_rect().size(), Layout::default(), |ui| { ui.add( - &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new( - &mut self.g, - ) + &mut GraphView::new(&mut self.g) + .with_navigations( + &SettingsNavigation::default() + .with_fit_to_screen_enabled(false) + .with_zoom_and_pan_enabled(true), + ) + .with_interactions( + &SettingsInteraction::default() + .with_node_selection_multi_enabled(true) + .with_node_selection_enabled(true) + .with_edge_selection_enabled(true) + .with_edge_selection_multi_enabled(true) + .with_dragging_enabled(true), + ), + ); + }); + }); + SidePanel::right("right_panel") + .default_width(available_width / 3.) + .resizable(true) + .show(ctx, |ui| { + ui.add( + &mut GraphView::new(&mut self.g) .with_navigations( &SettingsNavigation::default() .with_fit_to_screen_enabled(false) @@ -41,35 +59,11 @@ impl App for BasicApp { .with_edge_selection_multi_enabled(true) .with_dragging_enabled(true), ), - ); - }); - }); - SidePanel::right("right_panel") - .default_width(available_width / 3.) - .resizable(true) - .show(ctx, |ui| { - ui.add( - &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new( - &mut self.g, - ) - .with_navigations( - &SettingsNavigation::default() - .with_fit_to_screen_enabled(false) - .with_zoom_and_pan_enabled(true), - ) - .with_interactions( - &SettingsInteraction::default() - .with_node_selection_multi_enabled(true) - .with_node_selection_enabled(true) - .with_edge_selection_enabled(true) - .with_edge_selection_multi_enabled(true) - .with_dragging_enabled(true), - ), ) }); CentralPanel::default().show(ctx, |ui| { ui.add( - &mut GraphView::<_, _, _, _, DefaultNodeShape, DefaultEdgeShape>::new(&mut self.g) + &mut GraphView::new(&mut self.g) .with_navigations( &SettingsNavigation::default() .with_fit_to_screen_enabled(false) @@ -105,7 +99,7 @@ fn generate_graph() -> StableGraph<(), ()> { fn main() { let native_options = eframe::NativeOptions::default(); run_native( - "egui_graphs_basic_demo", + "egui_graphs_multiple_demo", native_options, Box::new(|cc| Ok(Box::new(BasicApp::new(cc)))), ) diff --git a/examples/undirected/src/main.rs b/examples/undirected/src/main.rs index 2984c5e..1196710 100644 --- a/examples/undirected/src/main.rs +++ b/examples/undirected/src/main.rs @@ -1,6 +1,6 @@ use eframe::{run_native, App, CreationContext}; use egui::Context; -use egui_graphs::{DefaultEdgeShape, DefaultNodeShape, Graph, GraphView}; +use egui_graphs::{Graph, GraphView}; use petgraph::{ stable_graph::{DefaultIx, StableGraph, StableUnGraph}, Undirected, @@ -20,14 +20,7 @@ impl UndirectedApp { impl App for UndirectedApp { fn update(&mut self, ctx: &Context, _: &mut eframe::Frame) { egui::CentralPanel::default().show(ctx, |ui| { - ui.add(&mut GraphView::< - _, - _, - _, - _, - DefaultNodeShape, - DefaultEdgeShape, - >::new(&mut self.g)); + ui.add(&mut GraphView::new(&mut self.g)); }); } } diff --git a/examples/window/src/main.rs b/examples/window/src/main.rs index 3b735ab..5ba2ac3 100644 --- a/examples/window/src/main.rs +++ b/examples/window/src/main.rs @@ -1,6 +1,6 @@ use eframe::{run_native, App, CreationContext}; use egui::{Context, Window}; -use egui_graphs::{DefaultEdgeShape, DefaultNodeShape, Graph, GraphView}; +use egui_graphs::{Graph, GraphView}; use petgraph::stable_graph::StableGraph; pub struct WindowApp { @@ -17,14 +17,7 @@ impl WindowApp { impl App for WindowApp { fn update(&mut self, ctx: &Context, _: &mut eframe::Frame) { Window::new("graph").show(ctx, |ui| { - ui.add(&mut GraphView::< - _, - _, - _, - _, - DefaultNodeShape, - DefaultEdgeShape, - >::new(&mut self.g)); + ui.add(&mut GraphView::new(&mut self.g)); }); } } From 34959d0f61328d94296b47ef558b6830b0a8bb03 Mon Sep 17 00:00:00 2001 From: starlord Date: Fri, 27 Sep 2024 16:55:55 +0300 Subject: [PATCH 3/3] readme update --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 349591c..85ad534 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ Combining this feature with custom node draw function allows to implement custom ### Persistence To use egui `persistence` feature you need to enable `egui_persistence` feature of this crate. For example: ```toml -egui_graphs = { version = "0.21", features = ["egui_persistence"]} -egui = {version="0.23", features = ["persistence"]} +egui_graphs = { version = "0.22", features = ["egui_persistence"]} +egui = {version="0.29", features = ["persistence"]} ``` ## Examples