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

[examples] hello_gfx: Remove dependency on sys crate

Browse Source 
Before this commit, hello_gfx was dependent on sys, while it only uses
sys::ImVec4, which is a type that is anyway re-exported by imgui.
This commit is contained in:
Malik Olivier Boussejra 2018-08-12 10:48:37 +09:00
parent 2272fbe5e4
commit 10438c6000
3 changed files with 1 additions and 5 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::*;

4
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);