From e059d0bd07858d05fa7c335a8af87289e242a661 Mon Sep 17 00:00:00 2001 From: Nathan Lilienthal Date: Thu, 29 Aug 2024 15:57:16 -0400 Subject: [PATCH] Don't use multiple versions of bevy_egui https://github.com/Plonq/bevy_panorbit_camera/issues/75#issuecomment-2317995787 --- Cargo.lock | 24 ++---------------------- starmap/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5fb6a54..2dcd3ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -924,25 +924,6 @@ name = "bevy_egui" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e4a90f30f2849a07d91e393b10c0cc05df09b5773c010ddde57dd8b583be230" -dependencies = [ - "bevy", - "bytemuck", - "console_log", - "crossbeam-channel", - "egui", - "js-sys", - "log", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winit", -] - -[[package]] -name = "bevy_egui" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128438a8163e49528207aabf20d3ff0890fd6be0f0054626915995efac87922b" dependencies = [ "arboard", "bevy", @@ -957,7 +938,6 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webbrowser", - "wgpu-types", "winit", ] @@ -1262,7 +1242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c2cabf0bb712d94c47aa982f787e3c9e9e906a9c2b9279f55297e77f9bd89cf" dependencies = [ "bevy", - "bevy_egui 0.28.0", + "bevy_egui", ] [[package]] @@ -5694,7 +5674,7 @@ version = "0.1.0" dependencies = [ "async-std", "bevy", - "bevy_egui 0.29.0", + "bevy_egui", "bevy_infinite_grid", "bevy_mod_picking", "bevy_panorbit_camera", diff --git a/starmap/Cargo.toml b/starmap/Cargo.toml index 4e31f72..54c7b25 100644 --- a/starmap/Cargo.toml +++ b/starmap/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" bevy = { version = "*", features = ["shader_format_glsl"] } bevy_panorbit_camera = { version = "*", features = ["bevy_egui"] } bevy_infinite_grid = "*" -bevy_egui = "*" +bevy_egui = "0.28" bevy_mod_picking = "*" async-std = "*" galos_db = { path = "../galos_db" }