diff --git a/Cargo.toml b/Cargo.toml index 239937a..47c8abb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,6 +7,9 @@ build = "build.rs" [lib] name = "imgui" +[features] +default = ["glium"] + [dependencies] bitflags = "0.3" libc = "0.1" @@ -22,3 +25,11 @@ optional = true [build-dependencies] gcc = "0.3" + +[dev-dependencies] +time = "0.1" + +[dev-dependencies.glium] +version = "0.8" +features = ["glutin"] +default-features = false diff --git a/examples/test_window/src/main.rs b/examples/support/mod.rs similarity index 88% rename from examples/test_window/src/main.rs rename to examples/support/mod.rs index 31ed576..6ec192f 100644 --- a/examples/test_window/src/main.rs +++ b/examples/support/mod.rs @@ -1,18 +1,11 @@ -#[macro_use] -extern crate glium; -extern crate imgui; -extern crate time; - -use glium::DisplayBuild; -use glium::Surface; +use glium::{DisplayBuild, Surface}; use glium::glutin; use glium::glutin::{ElementState, Event, MouseButton, VirtualKeyCode}; -use imgui::ImGui; +use imgui::{ImGui, Frame}; use imgui::glium_renderer::Renderer; use time::SteadyTime; -fn main() { - +pub fn main_with_frame<'a, F: Fn(&Frame<'a>)>(f: F) { let display = glutin::WindowBuilder::new() .build_glium() .unwrap(); @@ -37,8 +30,8 @@ fn main() { target.clear_color(1.0, 1.0, 1.0, 1.0); let (width, height) = target.get_dimensions(); - let mut frame = imgui.frame(width, height, delta_f); - frame.show_test_window(); + let frame = imgui.frame(width, height, delta_f); + f(&frame); renderer.render(&mut target, frame).unwrap(); target.finish().unwrap(); diff --git a/examples/test_window.rs b/examples/test_window.rs new file mode 100644 index 0000000..28a51e8 --- /dev/null +++ b/examples/test_window.rs @@ -0,0 +1,12 @@ +#[macro_use] +extern crate glium; +extern crate imgui; +extern crate time; + +mod support; + +fn main() { + support::main_with_frame(|frame| { + frame.show_test_window(); + }); +} diff --git a/examples/test_window/Cargo.toml b/examples/test_window/Cargo.toml deleted file mode 100644 index 243d87d..0000000 --- a/examples/test_window/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "test_window" -version = "0.0.0" -authors = ["Joonas Javanainen "] - -[dependencies] -glium = "0.8" -time = "0.1" - -[dependencies.imgui-rs] -path = "../../" -features = ["glium"]