diff --git a/Cargo.toml b/Cargo.toml index 11e1515..86c9b7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,4 +16,11 @@ travis-ci = { repository = "Gekkio/imgui-rs" } imgui-sys = { version = "0.0.22-pre", path = "imgui-sys" } [workspace] -members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer", "imgui-glutin-support"] +members = [ + "imgui-examples", + "imgui-glium-examples", + "imgui-sys", + "imgui-gfx-renderer", + "imgui-glium-renderer", + "imgui-glutin-support" +] diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml index 3e8000f..a4e755a 100644 --- a/imgui-examples/Cargo.toml +++ b/imgui-examples/Cargo.toml @@ -11,8 +11,6 @@ publish = false [dev-dependencies] gfx = "0.17" gfx_window_glutin = "0.26" -glium = { version = "0.22", default-features = true } glutin = "0.18" imgui = { version = "0.0.22-pre", path = "../" } imgui-gfx-renderer = { version = "0.0.22-pre", path = "../imgui-gfx-renderer" } -imgui-glium-renderer = { version = "0.0.22-pre", path = "../imgui-glium-renderer" } diff --git a/imgui-glium-examples/Cargo.toml b/imgui-glium-examples/Cargo.toml new file mode 100644 index 0000000..18742af --- /dev/null +++ b/imgui-glium-examples/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "imgui-glium-examples" +version = "0.0.22-pre" +authors = ["Joonas Javanainen ", "imgui-rs contributors"] +description = "imgui crate examples using Glium backend" +homepage = "https://github.com/Gekkio/imgui-rs" +repository = "https://github.com/Gekkio/imgui-rs" +license = "MIT/Apache-2.0" +publish = false + +[dev-dependencies] +glium = { version = "0.22", default-features = true } +imgui = { version = "0.0.22-pre", path = "../" } +imgui-glium-renderer = { version = "0.0.22-pre", path = "../imgui-glium-renderer" } diff --git a/imgui-glium-examples/examples/LICENSE.mplus b/imgui-glium-examples/examples/LICENSE.mplus new file mode 100644 index 0000000..e8fa893 --- /dev/null +++ b/imgui-glium-examples/examples/LICENSE.mplus @@ -0,0 +1,16 @@ +M+ FONTS Copyright (C) 2002-2017 M+ FONTS PROJECT + +- + +LICENSE_E + + + + +These fonts are free software. +Unlimited permission is granted to use, copy, and distribute them, with +or without modification, either commercially or noncommercially. +THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY. + + +http://mplus-fonts.osdn.jp diff --git a/imgui-examples/examples/color_button.rs b/imgui-glium-examples/examples/color_button.rs similarity index 100% rename from imgui-examples/examples/color_button.rs rename to imgui-glium-examples/examples/color_button.rs diff --git a/imgui-examples/examples/hello_world.rs b/imgui-glium-examples/examples/hello_world.rs similarity index 100% rename from imgui-examples/examples/hello_world.rs rename to imgui-glium-examples/examples/hello_world.rs diff --git a/imgui-glium-examples/examples/mplus-1p-regular.ttf b/imgui-glium-examples/examples/mplus-1p-regular.ttf new file mode 100644 index 0000000..4775e3a Binary files /dev/null and b/imgui-glium-examples/examples/mplus-1p-regular.ttf differ diff --git a/imgui-examples/examples/support/mod.rs b/imgui-glium-examples/examples/support/mod.rs similarity index 100% rename from imgui-examples/examples/support/mod.rs rename to imgui-glium-examples/examples/support/mod.rs diff --git a/imgui-examples/examples/test_drawing_channels_split.rs b/imgui-glium-examples/examples/test_drawing_channels_split.rs similarity index 100% rename from imgui-examples/examples/test_drawing_channels_split.rs rename to imgui-glium-examples/examples/test_drawing_channels_split.rs diff --git a/imgui-examples/examples/test_window.rs b/imgui-glium-examples/examples/test_window.rs similarity index 100% rename from imgui-examples/examples/test_window.rs rename to imgui-glium-examples/examples/test_window.rs diff --git a/imgui-examples/examples/test_window_impl.rs b/imgui-glium-examples/examples/test_window_impl.rs similarity index 100% rename from imgui-examples/examples/test_window_impl.rs rename to imgui-glium-examples/examples/test_window_impl.rs