diff --git a/Cargo.toml b/Cargo.toml index fcf4e80..c1d2ce9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,10 +7,8 @@ edition = "2021" [features] default = [] -egui_gui = ["egui-wgpu", "egui-winit", "egui"] -egui_extra = ["egui_gui", "egui_extras"] -egui_demo = ["egui_gui", "egui_demo_lib", "egui_demo_lib/syntect"] -egui_persistence = ["egui_gui", "egui_demo", "egui/persistence", "egui_demo_lib/serde"] +egui_gui = ["egui-wgpu", "egui-winit", "egui", "egui_extras", "egui_plot", "egui_demo_lib", "egui_demo_lib/syntect"] +egui_persistence = ["egui_gui", "egui/persistence", "egui_demo_lib/serde"] wgpu_serde = ["wgpu/serde"] [dependencies] @@ -31,6 +29,7 @@ egui-wgpu = { version = "0.29", optional = true } egui-winit = { version = "0.29", optional = true } egui_extras = { version = "0.29", optional = true } egui_demo_lib = { version = "0.29", optional = true } +egui_plot = { version = "0.29", optional = true } [dev-dependencies] rapier2d = { version = "0.22", features = ["default", "debug-render"] } @@ -92,7 +91,7 @@ description = "Example that renders a basic Triangle" [[example]] name = "egui_gui" path = "examples/egui_gui.rs" -required-features = ["egui_gui", "egui_demo"] +required-features = ["egui_gui"] [package.metadata.example.egui_gui] name = "Egui Gui" diff --git a/run_all_examples.ps1 b/run_all_examples.ps1 index df5580f..1d79c34 100644 --- a/run_all_examples.ps1 +++ b/run_all_examples.ps1 @@ -5,4 +5,4 @@ cargo run --example quad cargo run --example multiple_windows cargo run --example game_of_life cargo run --example lines -cargo run --example egui_gui --features "egui_gui egui_demo" +cargo run --example egui_gui --features "egui_gui" diff --git a/run_all_examples.sh b/run_all_examples.sh index df5580f..1d79c34 100755 --- a/run_all_examples.sh +++ b/run_all_examples.sh @@ -5,4 +5,4 @@ cargo run --example quad cargo run --example multiple_windows cargo run --example game_of_life cargo run --example lines -cargo run --example egui_gui --features "egui_gui egui_demo" +cargo run --example egui_gui --features "egui_gui" diff --git a/src/lib.rs b/src/lib.rs index ee39061..ab24684 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,10 +10,10 @@ pub mod window; // For convenience, export egui libs when that feature is enabled #[cfg(feature = "egui_gui")] pub use egui; -#[cfg(all(feature = "egui_demo_lib", feature = "egui_gui"))] +#[cfg(feature = "egui_gui")] pub use egui_demo_lib; -#[cfg(all(feature = "egui_extra", feature = "egui_gui"))] -pub use egui_extras; +#[cfg(feature = "egui_gui")] +pub use egui_plot; #[cfg(feature = "egui_gui")] pub use egui_wgpu; #[cfg(feature = "egui_gui")]