Skip to content

Commit 15c5c8a

Browse files
committed
Remove egui from deps
1 parent e33fb13 commit 15c5c8a

File tree

4 files changed

+9
-27
lines changed

4 files changed

+9
-27
lines changed

Cargo.toml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ edition = "2021"
77

88
[features]
99
default = []
10-
egui_gui = ["egui-wgpu", "egui-winit", "egui", "egui_extras", "egui_extras/all_loaders", "egui_demo_lib", "egui_demo_lib/syntect"]
11-
egui_persistence = ["egui_gui", "egui/persistence", "egui_demo_lib/serde"]
1210
wgpu_serde = ["wgpu/serde"]
1311

1412
[dependencies]
@@ -23,17 +21,13 @@ notify = "8.0"
2321
flume = "0.11"
2422
log = "0.4"
2523

26-
# Optional Egui
27-
# ToDo: Update to 0.32 when can
28-
egui = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628", optional = true }
29-
egui-wgpu = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628", optional = true }
30-
egui-winit = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628", optional = true }
31-
[target.'cfg(target_os = "linux")'.dependencies]
32-
egui-winit = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628", optional = true, features = ["smithay-clipboard"] }
33-
egui_extras = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628", optional = true }
34-
egui_demo_lib = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628", optional = true }
35-
3624
[dev-dependencies]
25+
# ToDo: Update to 0.32 when can
26+
egui = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628" }
27+
egui-wgpu = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628" }
28+
egui-winit = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628" }
29+
egui_extras = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628" }
30+
egui_demo_lib = { version = "0.31", git = "https://github.com/emilk/egui.git", rev = "81b7e7f05a6b03fa2cd5bdc6d4ce5f598e16c628" }
3731
rapier2d = { version = "0.26", features = ["default", "debug-render"] }
3832
rand = "0.9"
3933
glam = "0.30"
@@ -94,7 +88,7 @@ description = "Example that renders a basic Triangle"
9488
[[example]]
9589
name = "egui_gui"
9690
path = "examples/egui_gui.rs"
97-
required-features = ["egui_gui"]
91+
required-features = []
9892

9993
[package.metadata.example.egui_gui]
10094
name = "Egui Gui"

run_all_examples.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ cargo run --example quad
55
cargo run --example multiple_windows
66
cargo run --example game_of_life
77
cargo run --example lines
8-
cargo run --example egui_gui --features "egui_gui"
8+
cargo run --example egui_gui

run_all_examples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ cargo run --example quad
55
cargo run --example multiple_windows
66
cargo run --example game_of_life
77
cargo run --example lines
8-
cargo run --example egui_gui --features "egui_gui"
8+
cargo run --example egui_gui

src/lib.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,6 @@ pub mod texture;
77
pub mod utils;
88
pub mod window;
99

10-
// For convenience, export egui libs when that feature is enabled
11-
#[cfg(feature = "egui_gui")]
12-
pub use egui;
13-
#[cfg(feature = "egui_gui")]
14-
pub use egui_demo_lib;
15-
#[cfg(feature = "egui_gui")]
16-
pub use egui_extras;
17-
#[cfg(feature = "egui_gui")]
18-
pub use egui_wgpu;
19-
#[cfg(feature = "egui_gui")]
20-
pub use egui_winit;
21-
// --
2210
pub use image;
2311
pub use wgpu;
2412
pub use winit;

0 commit comments

Comments
 (0)