From 012be7b81843ebc8eef75b1a69d4702b6291ac20 Mon Sep 17 00:00:00 2001 From: Paris DOUADY Date: Thu, 11 Jan 2024 13:26:03 +0100 Subject: [PATCH] update to official egui release 0.25 --- Cargo.lock | 141 +++++++++++++------------ Cargo.toml | 6 +- engine/Cargo.toml | 4 +- native_app/src/gui/windows/settings.rs | 11 +- 4 files changed, 82 insertions(+), 80 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7103d219..0922676a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -111,7 +111,7 @@ dependencies = [ "ndk 0.8.0", "ndk-context", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.1", + "num_enum 0.7.2", "thiserror", ] @@ -317,9 +317,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd7cf50912cddc06dc5ea7c08c5e81c1b2c842a70d19def1848d54c586fed92" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" dependencies = [ "objc-sys", ] @@ -630,34 +630,28 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "cursor-icon" @@ -780,8 +774,9 @@ checksum = "0fe5e0c7c863ab37184b6310b4ff6b857c71814ff38e93c5b99fbda1467a5a32" [[package]] name = "ecolor" -version = "0.24.2" -source = "git+https://github.com/emilk/egui#1efa66014981b39f0357b8a49599e7266a96ad79" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57539aabcdbb733b6806ef421b66dec158dc1582107ad6d51913db3600303354" dependencies = [ "bytemuck", "serde", @@ -789,8 +784,9 @@ dependencies = [ [[package]] name = "egui" -version = "0.24.2" -source = "git+https://github.com/emilk/egui#1efa66014981b39f0357b8a49599e7266a96ad79" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0bf640ed7f3bf3d14ebf00d73bacc09c886443ee84ca6494bde37953012c9e3" dependencies = [ "accesskit", "ahash", @@ -821,8 +817,9 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.24.2" -source = "git+https://github.com/emilk/egui#1efa66014981b39f0357b8a49599e7266a96ad79" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c38c12e04316687dd1b74f3dfe83a885214dfe7f356118a2d3bee2b39740813" dependencies = [ "bytemuck", "egui", @@ -835,8 +832,9 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.24.2" -source = "git+https://github.com/emilk/egui#1efa66014981b39f0357b8a49599e7266a96ad79" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d95d9762056c541bd2724de02910d8bccf3af8e37689dc114b21730e64f80a0" dependencies = [ "egui", "log", @@ -847,8 +845,9 @@ dependencies = [ [[package]] name = "egui_extras" -version = "0.24.2" -source = "git+https://github.com/emilk/egui#1efa66014981b39f0357b8a49599e7266a96ad79" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "753c36d3e2f7a32425af5290af2e52efb3471ea3a263b87f003b5433351b0fd7" dependencies = [ "egui", "enum-map", @@ -859,8 +858,9 @@ dependencies = [ [[package]] name = "egui_plot" -version = "0.24.2" -source = "git+https://github.com/emilk/egui#1efa66014981b39f0357b8a49599e7266a96ad79" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a159fffebf052f79d1fd26d48e68906a21fec2fce808f7c0a982ec14ed506be" dependencies = [ "egui", ] @@ -873,8 +873,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" -version = "0.24.2" -source = "git+https://github.com/emilk/egui#1efa66014981b39f0357b8a49599e7266a96ad79" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee58355767587db7ba3738930d93cad3052cd834c2b48b9ef6ef26fe4823b7e" dependencies = [ "bytemuck", "serde", @@ -970,8 +971,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.24.2" -source = "git+https://github.com/emilk/egui#1efa66014981b39f0357b8a49599e7266a96ad79" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e638cb066bff0903bbb6143116cfd134a42279c7d68f19c0352a94f15a402de7" dependencies = [ "ab_glyph", "ahash", @@ -1157,9 +1159,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -1619,9 +1621,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "libloading" @@ -1688,9 +1690,9 @@ dependencies = [ [[package]] name = "loom" -version = "0.5.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +checksum = "7e045d70ddfbc984eacfa964ded019534e8f6cbf36f6410aee0ed5cefa5a9175" dependencies = [ "cfg-if", "generator", @@ -1909,7 +1911,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.1", + "num_enum 0.7.2", "raw-window-handle 0.5.2", "raw-window-handle 0.6.0", "thiserror", @@ -2050,11 +2052,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.1", + "num_enum_derive 0.7.2", ] [[package]] @@ -2071,11 +2073,11 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 2.0.1", + "proc-macro-crate 3.0.0", "proc-macro2", "quote", "syn 2.0.48", @@ -2275,9 +2277,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pathfinding" -version = "4.8.0" +version = "4.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f4a3f5089b981000cb50ec24320faf7a19649a45e8730e4adf49f78f066528" +checksum = "9b425bfb8934d227558811f4b8c94d6fe64c9069c1387deed0f586bc418271b2" dependencies = [ "deprecate-until", "fixedbitset", @@ -2405,12 +2407,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "6b2685dd208a3771337d8d386a89840f0f43cd68be8dae90a5f8c2384effc9cd" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.21.0", ] [[package]] @@ -2439,9 +2440,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.75" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -2707,9 +2708,9 @@ checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.194" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] @@ -2725,9 +2726,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.194" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", @@ -2976,9 +2977,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -3110,9 +3111,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" @@ -3127,9 +3128,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "toml_datetime", @@ -3199,9 +3200,9 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.16.4" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82da0d50d9df1106619b1e5b118f39de779f7d8b9c3504485b291cb16fabd20f" +checksum = "307e6b7030112fe9640fdd87988a40795549ba75c355f59485d14e6b444d2987" dependencies = [ "loom", "once_cell", @@ -3210,9 +3211,9 @@ dependencies = [ [[package]] name = "tracy-client-sys" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db0b1cc1bb12a70457300d9affc07acb587390d971a796dac2f4d9bca8df776" +checksum = "078c7ed72141b0e4369671a7f7af0eecffe18d753bf0296adca9c7add7276c9d" dependencies = [ "cc", ] @@ -3882,9 +3883,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winit" -version = "0.29.8" +version = "0.29.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc1a7ae1076890701c7dd71ea35b2aebaf9aeb7b8868ac2d33b1c7e8ef93c00" +checksum = "c2376dab13e09c01ad8b679f0dbc7038af4ec43d9a91344338e37bd686481550" dependencies = [ "ahash", "android-activity", @@ -3931,9 +3932,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.32" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index db326764..ba954efa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,10 +18,10 @@ resolver = "2" default-members = ["native_app"] [workspace.dependencies] -egui = { git = "https://github.com/emilk/egui" } +egui = "0.25.0" flat_spatial = "0.6" -egui_extras = { git = "https://github.com/emilk/egui" } -egui_plot = { git = "https://github.com/emilk/egui" } +egui_extras = "0.25.0" +egui_plot = "0.25.0" ordered-float = { version = "4.2.0", default-features = false } oddio = "0.7.4" derive_more = "0.99.17" diff --git a/engine/Cargo.toml b/engine/Cargo.toml index 1e704f8c..db755d97 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -16,7 +16,7 @@ derive_more = { workspace = true } wgpu = { version = "0.18.0", default-features = false, features=["wgsl"] } winit = { version = "0.29.4" } smol_str = { version = "0.2.0", features = ["serde"] } -egui-winit = { git = "https://github.com/emilk/egui", default-features = false } +egui-winit = { version = "0.25.0", default-features = false } bytemuck = "1.7.2" image = { version = "0.24.3", default-features = false, features = ["png"] } log = "0.4.11" @@ -27,7 +27,7 @@ rayon = "1.6" beul = "1.0.0" slotmapd = "1.0" inline_tweak = "1.0.8" -egui-wgpu = { git = "https://github.com/emilk/egui" } +egui-wgpu = "0.25.0" cpal = "0.15.0" lewton = "0.10.2" serde = { version = "1.0.183", features = ["derive"] } diff --git a/native_app/src/gui/windows/settings.rs b/native_app/src/gui/windows/settings.rs index e42e99c6..3e258efd 100644 --- a/native_app/src/gui/windows/settings.rs +++ b/native_app/src/gui/windows/settings.rs @@ -252,14 +252,15 @@ pub fn settings(window: egui::Window<'_>, ui: &Context, uiworld: &mut UiWorld, _ }); }) .body(|body| { - body.rows(25.0, sorted_inps.len(), |i, mut ui| { + body.rows(25.0, sorted_inps.len(), |mut row| { + let i = row.index(); let action = &sorted_inps[i]; let comb = bindings.0.get_mut(action).unwrap(); - ui.col(|ui| { + row.col(|ui| { ui.label(action.to_string()); }); - ui.col(|ui| { + row.col(|ui| { let resp = if !comb.0.is_empty() { ui.button(format!("{}", comb.0[0])) } else { @@ -274,7 +275,7 @@ pub fn settings(window: egui::Window<'_>, ui: &Context, uiworld: &mut UiWorld, _ } if resp.clicked() {} }); - ui.col(|ui| { + row.col(|ui| { let resp = if comb.0.len() > 1 { ui.button(format!("{}", comb.0[1])) } else { @@ -289,7 +290,7 @@ pub fn settings(window: egui::Window<'_>, ui: &Context, uiworld: &mut UiWorld, _ } if resp.clicked() {} }); - ui.col(|ui| { + row.col(|ui| { if ui.button("↺").clicked() { comb.0 = Bindings::default().0.remove(action).unwrap().0; }