diff --git a/imgui-examples/Cargo.toml b/imgui-examples/Cargo.toml index a4e755a..99d7b4a 100644 --- a/imgui-examples/Cargo.toml +++ b/imgui-examples/Cargo.toml @@ -14,3 +14,4 @@ gfx_window_glutin = "0.26" glutin = "0.18" imgui = { version = "0.0.22-pre", path = "../" } imgui-gfx-renderer = { version = "0.0.22-pre", path = "../imgui-gfx-renderer" } +imgui-glutin-support = { version = "0.0.22-pre", path = "../imgui-glutin-support" } diff --git a/imgui-examples/examples/hello_gfx.rs b/imgui-examples/examples/hello_gfx.rs index 40423c3..91e41a2 100644 --- a/imgui-examples/examples/hello_gfx.rs +++ b/imgui-examples/examples/hello_gfx.rs @@ -4,6 +4,7 @@ extern crate glutin; #[macro_use] extern crate imgui; extern crate imgui_gfx_renderer; +extern crate imgui_glutin_support; use imgui::*; diff --git a/imgui-examples/examples/support_gfx/mod.rs b/imgui-examples/examples/support_gfx/mod.rs index 788d4a2..98af283 100644 --- a/imgui-examples/examples/support_gfx/mod.rs +++ b/imgui-examples/examples/support_gfx/mod.rs @@ -1,14 +1,8 @@ -use imgui::{FontGlyphRange, FrameSize, ImFontConfig, ImGui, ImGuiMouseCursor, ImVec4, Ui}; +use imgui::{FontGlyphRange, ImFontConfig, ImGui, ImVec4, Ui}; use imgui_gfx_renderer::{Renderer, Shaders}; +use imgui_glutin_support; use std::time::Instant; -#[derive(Copy, Clone, PartialEq, Debug, Default)] -struct MouseState { - pos: (i32, i32), - pressed: (bool, bool, bool), - wheel: f32, -} - pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ui: F) { use gfx::{self, Device}; use gfx_window_glutin; @@ -93,17 +87,24 @@ pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ let mut renderer = Renderer::init(&mut imgui, &mut factory, shaders, main_color.clone()) .expect("Failed to initialize renderer"); - configure_keys(&mut imgui); + imgui_glutin_support::configure_keys(&mut imgui); let mut last_frame = Instant::now(); - let mut mouse_state = MouseState::default(); let mut quit = false; loop { events_loop.poll_events(|event| { - use glutin::ElementState::Pressed; - use glutin::WindowEvent::*; - use glutin::{Event, MouseButton, MouseScrollDelta, TouchPhase}; + use glutin::{ + Event, + WindowEvent::{CloseRequested, Resized}, + }; + + imgui_glutin_support::handle_event( + &mut imgui, + &event, + window.get_hidpi_factor(), + hidpi_factor, + ); if let Event::WindowEvent { event, .. } = event { match event { @@ -112,71 +113,6 @@ pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ renderer.update_render_target(main_color.clone()); } CloseRequested => quit = true, - KeyboardInput { input, .. } => { - use glutin::VirtualKeyCode as Key; - - let pressed = input.state == Pressed; - match input.virtual_keycode { - Some(Key::Tab) => imgui.set_key(0, pressed), - Some(Key::Left) => imgui.set_key(1, pressed), - Some(Key::Right) => imgui.set_key(2, pressed), - Some(Key::Up) => imgui.set_key(3, pressed), - Some(Key::Down) => imgui.set_key(4, pressed), - Some(Key::PageUp) => imgui.set_key(5, pressed), - Some(Key::PageDown) => imgui.set_key(6, pressed), - Some(Key::Home) => imgui.set_key(7, pressed), - Some(Key::End) => imgui.set_key(8, pressed), - Some(Key::Delete) => imgui.set_key(9, pressed), - Some(Key::Back) => imgui.set_key(10, pressed), - Some(Key::Return) => imgui.set_key(11, pressed), - Some(Key::Escape) => imgui.set_key(12, pressed), - Some(Key::A) => imgui.set_key(13, pressed), - Some(Key::C) => imgui.set_key(14, pressed), - Some(Key::V) => imgui.set_key(15, pressed), - Some(Key::X) => imgui.set_key(16, pressed), - Some(Key::Y) => imgui.set_key(17, pressed), - Some(Key::Z) => imgui.set_key(18, pressed), - Some(Key::LControl) | Some(Key::RControl) => { - imgui.set_key_ctrl(pressed) - } - Some(Key::LShift) | Some(Key::RShift) => imgui.set_key_shift(pressed), - Some(Key::LAlt) | Some(Key::RAlt) => imgui.set_key_alt(pressed), - Some(Key::LWin) | Some(Key::RWin) => imgui.set_key_super(pressed), - _ => {} - } - } - CursorMoved { position: pos, .. } => { - // Rescale position from glutin logical coordinates to our logical - // coordinates - mouse_state.pos = pos - .to_physical(window.get_hidpi_factor()) - .to_logical(hidpi_factor) - .into(); - } - MouseInput { state, button, .. } => match button { - MouseButton::Left => mouse_state.pressed.0 = state == Pressed, - MouseButton::Right => mouse_state.pressed.1 = state == Pressed, - MouseButton::Middle => mouse_state.pressed.2 = state == Pressed, - _ => {} - }, - MouseWheel { - delta: MouseScrollDelta::LineDelta(_, y), - phase: TouchPhase::Moved, - .. - } => mouse_state.wheel = y, - MouseWheel { - delta: MouseScrollDelta::PixelDelta(pos), - phase: TouchPhase::Moved, - .. - } => { - // Rescale pixel delta from glutin logical coordinates to our logical - // coordinates - mouse_state.wheel = pos - .to_physical(window.get_hidpi_factor()) - .to_logical(hidpi_factor) - .y as f32; - } - ReceivedCharacter(c) => imgui.add_input_character(c), _ => (), } } @@ -190,39 +126,9 @@ pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ let delta_s = delta.as_secs() as f32 + delta.subsec_nanos() as f32 / 1_000_000_000.0; last_frame = now; - update_mouse(&mut imgui, &mut mouse_state); + imgui_glutin_support::update_mouse_cursor(&imgui, &window); - let mouse_cursor = imgui.mouse_cursor(); - if imgui.mouse_draw_cursor() || mouse_cursor == ImGuiMouseCursor::None { - // Hide OS cursor - window.hide_cursor(true); - } else { - // Set OS cursor - window.hide_cursor(false); - window.set_cursor(match mouse_cursor { - ImGuiMouseCursor::None => unreachable!("mouse_cursor was None!"), - ImGuiMouseCursor::Arrow => glutin::MouseCursor::Arrow, - ImGuiMouseCursor::TextInput => glutin::MouseCursor::Text, - ImGuiMouseCursor::ResizeAll => glutin::MouseCursor::Move, - ImGuiMouseCursor::ResizeNS => glutin::MouseCursor::NsResize, - ImGuiMouseCursor::ResizeEW => glutin::MouseCursor::EwResize, - ImGuiMouseCursor::ResizeNESW => glutin::MouseCursor::NeswResize, - ImGuiMouseCursor::ResizeNWSE => glutin::MouseCursor::NwseResize, - ImGuiMouseCursor::Hand => glutin::MouseCursor::Hand, - }); - } - - // Rescale window size from glutin logical size to our logical size - let physical_size = window - .get_inner_size() - .unwrap() - .to_physical(window.get_hidpi_factor()); - let logical_size = physical_size.to_logical(hidpi_factor); - - let frame_size = FrameSize { - logical_size: logical_size.into(), - hidpi_factor, - }; + let frame_size = imgui_glutin_support::get_frame_size(&window, hidpi_factor).unwrap(); let ui = imgui.frame(frame_size, delta_s); if !run_ui(&ui) { @@ -238,40 +144,3 @@ pub fn run bool>(title: String, clear_color: [f32; 4], mut run_ device.cleanup(); } } - -fn configure_keys(imgui: &mut ImGui) { - use imgui::ImGuiKey; - - 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) { - imgui.set_mouse_pos(mouse_state.pos.0 as f32, mouse_state.pos.1 as f32); - 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); - mouse_state.wheel = 0.0; -}