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

Merge pull request #145 from malikolivier/refactor-hello-gfx

Browse Source 
Refactor hello gfx:
- Remove unused label on main loop
- Do not depend on imgui_sys
This commit is contained in:
Malik Olivier Boussejra 2018-08-12 18:03:20 +09:00 committed by GitHub
commit 1663e66887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
imgui-examples/Cargo.toml
View File

@ -16,4 +16,3 @@ glutin = "0.17"
imgui = { version = "0.0.19-pre", path = "../" } imgui = { version = "0.0.19-pre", path = "../" }
imgui-gfx-renderer = { version = "0.0.19-pre", path = "../imgui-gfx-renderer" } imgui-gfx-renderer = { version = "0.0.19-pre", path = "../imgui-gfx-renderer" }
imgui-glium-renderer = { version = "0.0.19-pre", path = "../imgui-glium-renderer" } imgui-glium-renderer = { version = "0.0.19-pre", path = "../imgui-glium-renderer" }
imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["gfx", "glium"] }

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

@ -4,7 +4,6 @@ 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 imgui::*; use imgui::*;

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

@ -1,4 +1,4 @@
use imgui::{FontGlyphRange, ImFontConfig, ImGui, ImGuiMouseCursor, Ui}; use imgui::{FontGlyphRange, ImFontConfig, ImGui, ImGuiMouseCursor, ImVec4, Ui};
use imgui_gfx_renderer::{Renderer, Shaders}; use imgui_gfx_renderer::{Renderer, Shaders};
use std::time::Instant; use std::time::Instant;
@ -45,8 +45,6 @@ pub fn run<F: FnMut(&Ui) -> bool>(title: String, clear_color: [f32; 4], mut run_
let mut imgui = ImGui::init(); let mut imgui = ImGui::init();
{ {
// Fix incorrect colors with sRGB framebuffer // Fix incorrect colors with sRGB framebuffer
use imgui_sys::ImVec4;
fn imgui_gamma_to_linear(col: ImVec4) -> ImVec4 { fn imgui_gamma_to_linear(col: ImVec4) -> ImVec4 {
let x = col.x.powf(2.2); let x = col.x.powf(2.2);
let y = col.y.powf(2.2); let y = col.y.powf(2.2);
@ -74,7 +72,7 @@ pub fn run<F: FnMut(&Ui) -> bool>(title: String, clear_color: [f32; 4], mut run_
let mut mouse_state = MouseState::default(); let mut mouse_state = MouseState::default();
let mut quit = false; let mut quit = false;
'running: loop { loop {
events_loop.poll_events(|event| { events_loop.poll_events(|event| {
use glutin::WindowEvent::*; use glutin::WindowEvent::*;
use glutin::ElementState::Pressed; use glutin::ElementState::Pressed;
@ -145,7 +143,7 @@ pub fn run<F: FnMut(&Ui) -> bool>(title: String, clear_color: [f32; 4], mut run_
} }
}); });
if quit { if quit {
break 'running; break;
} }
let now = Instant::now(); let now = Instant::now();