Skip to content

Commit

Permalink
Simplify egui features
Browse files Browse the repository at this point in the history
  • Loading branch information
hakolao committed Oct 2, 2024
1 parent 4e33494 commit b2055ba
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
9 changes: 4 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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"] }
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion run_all_examples.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion run_all_examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down

0 comments on commit b2055ba

Please sign in to comment.