elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-22 19:08:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to gfx 0.16

Browse Source
This commit is contained in:
Joonas Javanainen 2017-06-17 14:23:47 +03:00
parent 16d19c1855
commit 68fec8a870
No known key found for this signature in database
GPG Key ID: D39CCA5CB19B9179
5 changed files with 157 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
imgui-examples/Cargo.toml
View File

@ -9,10 +9,10 @@ license = "MIT/Apache-2.0"
publish = false publish = false
[dev-dependencies] [dev-dependencies]
gfx = "0.15" gfx = "0.16"
gfx_window_glutin = "0.15" gfx_window_glutin = "0.16"
glium = { version = "0.16", default-features = true } glium = { version = "0.16", default-features = true }
glutin = "0.7" glutin = "0.8"
imgui = { version = "0.0.14-pre", path = "../" } imgui = { version = "0.0.14-pre", path = "../" }
imgui-gfx-renderer = { version = "0.0.14-pre", path = "../imgui-gfx-renderer" } imgui-gfx-renderer = { version = "0.0.14-pre", path = "../imgui-gfx-renderer" }
imgui-glium-renderer = { version = "0.0.14-pre", path = "../imgui-glium-renderer" } imgui-glium-renderer = { version = "0.0.14-pre", path = "../imgui-glium-renderer" }

51
imgui-examples/examples/hello_gfx.rs
View File

@ -1,65 +1,18 @@
extern crate gfx; extern crate gfx;
extern crate gfx_window_glutin; extern crate gfx_window_glutin;
extern crate glutin; extern crate glutin;
#[macro_use] #[macro_use]
extern crate imgui; extern crate imgui;
extern crate imgui_gfx_renderer; extern crate imgui_gfx_renderer;
extern crate imgui_sys;
use gfx::Device;
use imgui::*; use imgui::*;
use imgui_gfx_renderer::Renderer;
mod support_gfx; mod support_gfx;
const CLEAR_COLOR: [f32; 4] = [1.0, 1.0, 1.0, 1.0]; const CLEAR_COLOR: [f32; 4] = [1.0, 1.0, 1.0, 1.0];
pub type ColorFormat = gfx::format::Rgba8; fn main() {
pub type DepthFormat = gfx::format::DepthStencil; support_gfx::run("hello_gfx.rs".to_owned(), CLEAR_COLOR, hello_world);
pub fn main() {
let mut support = support_gfx::Support::init();
let builder = glutin::WindowBuilder::new()
.with_title("Hello World (GFX)".to_string())
.with_dimensions(1024, 768)
.with_vsync();
let (window, mut device, mut factory, mut main_color, mut main_depth) =
gfx_window_glutin::init::<ColorFormat, DepthFormat>(builder);
let mut encoder: gfx::Encoder<_, _> = factory.create_command_buffer().into();
let mut renderer = Renderer::init(&mut support.imgui, &mut factory, main_color.clone())
.expect("Failed to initialize renderer");
'main: loop {
for event in window.poll_events() {
support.update_event(&event);
match event {
glutin::Event::KeyboardInput(_, _, Some(glutin::VirtualKeyCode::Escape)) |
glutin::Event::Closed => break 'main,
glutin::Event::Resized(_width, _height) => {
gfx_window_glutin::update_views(&window, &mut main_color, &mut main_depth);
renderer.update_render_target(main_color.clone());
}
_ => (),
}
}
support.update_mouse();
let size_points = window.get_inner_size_points().unwrap();
let size_pixels = window.get_inner_size_pixels().unwrap();
let ui = support.imgui.frame(size_points, size_pixels, 1.0 / 16.0);
hello_world(&ui);
encoder.clear(&mut main_color, CLEAR_COLOR);
renderer.render(ui, &mut factory, &mut encoder)
.expect("Rendering failed");
encoder.flush(&mut device);
window.swap_buffers().unwrap();
device.cleanup();
}
} }
fn hello_world<'a>(ui: &Ui<'a>) { fn hello_world<'a>(ui: &Ui<'a>) {

253
imgui-examples/examples/support_gfx/mod.rs
View File

@ -1,114 +1,161 @@
use gfx;
use gfx::Device;
use gfx_window_glutin;
use glutin; use glutin;
use glutin::{ElementState, Event, MouseButton, MouseScrollDelta, VirtualKeyCode, TouchPhase}; use glutin::{ElementState, MouseButton, MouseScrollDelta, VirtualKeyCode, TouchPhase, WindowEvent};
use imgui::{ImGui, ImGuiKey}; use imgui::{ImGui, Ui, ImGuiKey};
use imgui_gfx_renderer::Renderer;
use std::time::Instant;
pub struct Support { type ColorFormat = gfx::format::Rgba8;
pub imgui: ImGui, type DepthFormat = gfx::format::DepthStencil;
mouse_pos: (i32, i32),
mouse_pressed: (bool, bool, bool), #[derive(Copy, Clone, PartialEq, Debug, Default)]
mouse_wheel: f32, struct MouseState {
pos: (i32, i32),
pressed: (bool, bool, bool),
wheel: f32
} }
impl Support { pub fn run<F: FnMut(&Ui)>(title: String, clear_color: [f32; 4], mut run_ui: F) {
pub fn init() -> Support { let mut imgui = ImGui::init();
let mut imgui = ImGui::init();
imgui.set_imgui_key(ImGuiKey::Tab, 0); let events_loop = glutin::EventsLoop::new();
imgui.set_imgui_key(ImGuiKey::LeftArrow, 1); let builder = glutin::WindowBuilder::new()
imgui.set_imgui_key(ImGuiKey::RightArrow, 2); .with_title(title)
imgui.set_imgui_key(ImGuiKey::UpArrow, 3); .with_dimensions(1024, 768)
imgui.set_imgui_key(ImGuiKey::DownArrow, 4); .with_vsync();
imgui.set_imgui_key(ImGuiKey::PageUp, 5); let (window, mut device, mut factory, mut main_color, mut main_depth) =
imgui.set_imgui_key(ImGuiKey::PageDown, 6); gfx_window_glutin::init::<ColorFormat, DepthFormat>(builder, &events_loop);
imgui.set_imgui_key(ImGuiKey::Home, 7); let mut encoder: gfx::Encoder<_, _> = factory.create_command_buffer().into();
imgui.set_imgui_key(ImGuiKey::End, 8); let mut renderer = Renderer::init(&mut imgui, &mut factory, main_color.clone())
imgui.set_imgui_key(ImGuiKey::Delete, 9); .expect("Failed to initialize renderer");
imgui.set_imgui_key(ImGuiKey::Backspace, 10);
imgui.set_imgui_key(ImGuiKey::Enter, 11);
imgui.set_imgui_key(ImGuiKey::Escape, 12);
imgui.set_imgui_key(ImGuiKey::A, 13);
imgui.set_imgui_key(ImGuiKey::C, 14);
imgui.set_imgui_key(ImGuiKey::V, 15);
imgui.set_imgui_key(ImGuiKey::X, 16);
imgui.set_imgui_key(ImGuiKey::Y, 17);
imgui.set_imgui_key(ImGuiKey::Z, 18);
Support { configure_keys(&mut imgui);
imgui: imgui,
mouse_pos: (0, 0),
mouse_pressed: (false, false, false),
mouse_wheel: 0.0,
}
}
pub fn update_mouse(&mut self) { let mut last_frame = Instant::now();
let scale = self.imgui.display_framebuffer_scale(); let mut mouse_state = MouseState::default();
self.imgui.set_mouse_pos(self.mouse_pos.0 as f32 / scale.0, let mut quit = false;
self.mouse_pos.1 as f32 / scale.1);
self.imgui.set_mouse_down(&[self.mouse_pressed.0,
self.mouse_pressed.1,
self.mouse_pressed.2,
false,
false]);
self.imgui.set_mouse_wheel(self.mouse_wheel / scale.1);
self.mouse_wheel = 0.0;
}
pub fn update_event(&mut self, event: &glutin::Event) -> bool { loop {
match *event { events_loop.poll_events(|glutin::Event::WindowEvent{event, ..}| {
Event::Closed => return false, match event {
Event::KeyboardInput(state, _, code) => { WindowEvent::Resized(_, _) => {
let pressed = state == ElementState::Pressed; gfx_window_glutin::update_views(&window, &mut main_color, &mut main_depth);
match code { renderer.update_render_target(main_color.clone());
Some(VirtualKeyCode::Tab) => self.imgui.set_key(0, pressed),
Some(VirtualKeyCode::Left) => self.imgui.set_key(1, pressed),
Some(VirtualKeyCode::Right) => self.imgui.set_key(2, pressed),
Some(VirtualKeyCode::Up) => self.imgui.set_key(3, pressed),
Some(VirtualKeyCode::Down) => self.imgui.set_key(4, pressed),
Some(VirtualKeyCode::PageUp) => self.imgui.set_key(5, pressed),
Some(VirtualKeyCode::PageDown) => self.imgui.set_key(6, pressed),
Some(VirtualKeyCode::Home) => self.imgui.set_key(7, pressed),
Some(VirtualKeyCode::End) => self.imgui.set_key(8, pressed),
Some(VirtualKeyCode::Delete) => self.imgui.set_key(9, pressed),
Some(VirtualKeyCode::Back) => self.imgui.set_key(10, pressed),
Some(VirtualKeyCode::Return) => self.imgui.set_key(11, pressed),
Some(VirtualKeyCode::Escape) => self.imgui.set_key(12, pressed),
Some(VirtualKeyCode::A) => self.imgui.set_key(13, pressed),
Some(VirtualKeyCode::C) => self.imgui.set_key(14, pressed),
Some(VirtualKeyCode::V) => self.imgui.set_key(15, pressed),
Some(VirtualKeyCode::X) => self.imgui.set_key(16, pressed),
Some(VirtualKeyCode::Y) => self.imgui.set_key(17, pressed),
Some(VirtualKeyCode::Z) => self.imgui.set_key(18, pressed),
Some(VirtualKeyCode::LControl) |
Some(VirtualKeyCode::RControl) => self.imgui.set_key_ctrl(pressed),
Some(VirtualKeyCode::LShift) |
Some(VirtualKeyCode::RShift) => self.imgui.set_key_shift(pressed),
Some(VirtualKeyCode::LAlt) |
Some(VirtualKeyCode::RAlt) => self.imgui.set_key_alt(pressed),
Some(VirtualKeyCode::LWin) |
Some(VirtualKeyCode::RWin) => self.imgui.set_key_super(pressed),
_ => {}
} }
WindowEvent::Closed => quit = true,
WindowEvent::KeyboardInput(state, _, code, _) => {
let pressed = state == ElementState::Pressed;
match code {
Some(VirtualKeyCode::Tab) => imgui.set_key(0, pressed),
Some(VirtualKeyCode::Left) => imgui.set_key(1, pressed),
Some(VirtualKeyCode::Right) => imgui.set_key(2, pressed),
Some(VirtualKeyCode::Up) => imgui.set_key(3, pressed),
Some(VirtualKeyCode::Down) => imgui.set_key(4, pressed),
Some(VirtualKeyCode::PageUp) => imgui.set_key(5, pressed),
Some(VirtualKeyCode::PageDown) => imgui.set_key(6, pressed),
Some(VirtualKeyCode::Home) => imgui.set_key(7, pressed),
Some(VirtualKeyCode::End) => imgui.set_key(8, pressed),
Some(VirtualKeyCode::Delete) => imgui.set_key(9, pressed),
Some(VirtualKeyCode::Back) => imgui.set_key(10, pressed),
Some(VirtualKeyCode::Return) => imgui.set_key(11, pressed),
Some(VirtualKeyCode::Escape) => quit = true,
Some(VirtualKeyCode::A) => imgui.set_key(13, pressed),
Some(VirtualKeyCode::C) => imgui.set_key(14, pressed),
Some(VirtualKeyCode::V) => imgui.set_key(15, pressed),
Some(VirtualKeyCode::X) => imgui.set_key(16, pressed),
Some(VirtualKeyCode::Y) => imgui.set_key(17, pressed),
Some(VirtualKeyCode::Z) => imgui.set_key(18, pressed),
Some(VirtualKeyCode::LControl) |
Some(VirtualKeyCode::RControl) => imgui.set_key_ctrl(pressed),
Some(VirtualKeyCode::LShift) |
Some(VirtualKeyCode::RShift) => imgui.set_key_shift(pressed),
Some(VirtualKeyCode::LAlt) |
Some(VirtualKeyCode::RAlt) => imgui.set_key_alt(pressed),
Some(VirtualKeyCode::LWin) |
Some(VirtualKeyCode::RWin) => imgui.set_key_super(pressed),
_ => {}
}
}
WindowEvent::MouseMoved(x, y) => mouse_state.pos = (x, y),
WindowEvent::MouseInput(state, MouseButton::Left) => {
mouse_state.pressed.0 = state == ElementState::Pressed
}
WindowEvent::MouseInput(state, MouseButton::Right) => {
mouse_state.pressed.1 = state == ElementState::Pressed
}
WindowEvent::MouseInput(state, MouseButton::Middle) => {
mouse_state.pressed.2 = state == ElementState::Pressed
}
WindowEvent::MouseWheel(MouseScrollDelta::LineDelta(_, y), TouchPhase::Moved) => {
mouse_state.wheel = y
}
WindowEvent::MouseWheel(MouseScrollDelta::PixelDelta(_, y), TouchPhase::Moved) => {
mouse_state.wheel = y
}
WindowEvent::ReceivedCharacter(c) => imgui.add_input_character(c),
_ => ()
} }
Event::MouseMoved(x, y) => self.mouse_pos = (x, y), });
Event::MouseInput(state, MouseButton::Left) => {
self.mouse_pressed.0 = state == ElementState::Pressed let now = Instant::now();
} let delta = now - last_frame;
Event::MouseInput(state, MouseButton::Right) => { let delta_s = delta.as_secs() as f32 + delta.subsec_nanos() as f32 / 1_000_000_000.0;
self.mouse_pressed.1 = state == ElementState::Pressed last_frame = now;
}
Event::MouseInput(state, MouseButton::Middle) => { update_mouse(&mut imgui, &mut mouse_state);
self.mouse_pressed.2 = state == ElementState::Pressed
} let size_points = window.get_inner_size_points().unwrap();
Event::MouseWheel(MouseScrollDelta::LineDelta(_, y), TouchPhase::Moved) => { let size_pixels = window.get_inner_size_pixels().unwrap();
self.mouse_wheel = y
} let ui = imgui.frame(size_points, size_pixels, delta_s);
Event::MouseWheel(MouseScrollDelta::PixelDelta(_, y), TouchPhase::Moved) => {
self.mouse_wheel = y run_ui(&ui);
}
Event::ReceivedCharacter(c) => self.imgui.add_input_character(c), encoder.clear(&mut main_color, clear_color);
_ => (),
} renderer.render(ui, &mut factory, &mut encoder)
true .expect("Rendering failed");
} encoder.flush(&mut device);
window.swap_buffers().unwrap();
device.cleanup();
if quit { break }
};
}
fn configure_keys(imgui: &mut ImGui) {
imgui.set_imgui_key(ImGuiKey::Tab, 0);
imgui.set_imgui_key(ImGuiKey::LeftArrow, 1);
imgui.set_imgui_key(ImGuiKey::RightArrow, 2);
imgui.set_imgui_key(ImGuiKey::UpArrow, 3);
imgui.set_imgui_key(ImGuiKey::DownArrow, 4);
imgui.set_imgui_key(ImGuiKey::PageUp, 5);
imgui.set_imgui_key(ImGuiKey::PageDown, 6);
imgui.set_imgui_key(ImGuiKey::Home, 7);
imgui.set_imgui_key(ImGuiKey::End, 8);
imgui.set_imgui_key(ImGuiKey::Delete, 9);
imgui.set_imgui_key(ImGuiKey::Backspace, 10);
imgui.set_imgui_key(ImGuiKey::Enter, 11);
imgui.set_imgui_key(ImGuiKey::Escape, 12);
imgui.set_imgui_key(ImGuiKey::A, 13);
imgui.set_imgui_key(ImGuiKey::C, 14);
imgui.set_imgui_key(ImGuiKey::V, 15);
imgui.set_imgui_key(ImGuiKey::X, 16);
imgui.set_imgui_key(ImGuiKey::Y, 17);
imgui.set_imgui_key(ImGuiKey::Z, 18);
}
fn update_mouse(imgui: &mut ImGui, mouse_state: &mut MouseState) {
let scale = imgui.display_framebuffer_scale();
imgui.set_mouse_pos(mouse_state.pos.0 as f32 / scale.0,
mouse_state.pos.1 as f32 / scale.1);
imgui.set_mouse_down(&[mouse_state.pressed.0,
mouse_state.pressed.1,
mouse_state.pressed.2,
false,
false]);
imgui.set_mouse_wheel(mouse_state.wheel / scale.1);
mouse_state.wheel = 0.0;
} }

2
imgui-gfx-renderer/Cargo.toml
View File

@ -9,6 +9,6 @@ license = "MIT/Apache-2.0"
categories = ["gui", "rendering"] categories = ["gui", "rendering"]
[dependencies] [dependencies]
gfx = "0.15" gfx = "0.16"
imgui = { version = "0.0.14-pre", path = "../" } imgui = { version = "0.0.14-pre", path = "../" }
imgui-sys = { version = "0.0.14-pre", path = "../imgui-sys", features = ["gfx"] } imgui-sys = { version = "0.0.14-pre", path = "../imgui-sys", features = ["gfx"] }

2
imgui-sys/Cargo.toml
View File

@ -12,7 +12,7 @@ build = "build.rs"
[dependencies] [dependencies]
bitflags = "0.8" bitflags = "0.8"
glium = { version = "0.16", default-features = false, optional = true } glium = { version = "0.16", default-features = false, optional = true }
gfx = { version = "0.15", optional = true } gfx = { version = "0.16", optional = true }
[build-dependencies] [build-dependencies]
gcc = "0.3" gcc = "0.3"