silvana/implot-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update imgui 0.6

Browse source
This commit is contained in:
Benedikt Mandelkow 2020-11-23 00:30:06 +01:00 committed by 4bb4
parent 07ff32ea2a
commit c5ec153488
7 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -12,7 +12,7 @@ readme = "README.md"
[dependencies] [dependencies]
implot-sys = { version = "0.2.0", path = "implot-sys" } implot-sys = { version = "0.2.0", path = "implot-sys" }
imgui = { version = "0.5.0" } imgui = { version = "0.6.0" }
bitflags = "1.0" bitflags = "1.0"
parking_lot = "0.11" parking_lot = "0.11"
lazy_static = "1.1" lazy_static = "1.1"

2
implot-examples/examples-shared/Cargo.toml
View file

@ -8,4 +8,4 @@ edition = "2018"
[dependencies] [dependencies]
implot = { path = "../../" } implot = { path = "../../" }
imgui = "0.5.0" imgui = "0.6.0"

10
implot-examples/implot-glium-demo/Cargo.toml
View file

@ -11,12 +11,12 @@ publish = false
[dependencies] [dependencies]
clipboard = "0.5" clipboard = "0.5"
glium = { version = "0.27", default-features = true } glium = { version = "0.28", default-features = true }
image = "0.23" image = "0.23"
imgui-sys = "0.5.0" imgui-sys = "0.6.0"
imgui = "0.5.0" imgui = "0.6.0"
imgui-glium-renderer = "0.5.0" imgui-glium-renderer = "0.6.0"
imgui-winit-support = "0.5.0" imgui-winit-support = "0.6.0"
implot-sys = { path = "../../implot-sys" } implot-sys = { path = "../../implot-sys" }
implot = { path = "../../" } implot = { path = "../../" }

8
implot-examples/implot-wgpu-demo/Cargo.toml
View file

@ -8,9 +8,9 @@ edition = "2018"
implot = { path = "../../" } implot = { path = "../../" }
wgpu = "^0.6.0" wgpu = "^0.6.0"
winit = "^0.22.2" # opening windows and handling input winit = "^0.23" # opening windows and handling input
futures = "^0.3.5" # executing async functions using blocking executor futures = "^0.3.5" # executing async functions using blocking executor
imgui = "^0.5.0" imgui = "^0.6.0"
imgui-winit-support = "^0.5.0" # connection of input (keys) to imgui imgui-winit-support = "^0.6.0" # connection of input (keys) to imgui
imgui-wgpu = "^0.11.0" # imgui backend for drawing using wgpu imgui-wgpu = "^0.12.0" # imgui backend for drawing using wgpu
examples-shared = { path = "../examples-shared" } examples-shared = { path = "../examples-shared" }

11
implot-examples/implot-wgpu-demo/src/support/mod.rs
View file

@ -63,7 +63,7 @@ pub fn init(title: &str) -> System {
// Set up swap chain // Set up swap chain
let sc_desc = wgpu::SwapChainDescriptor { let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT, usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8Unorm, format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width, width: size.width,
height: size.height, height: size.height,
present_mode: wgpu::PresentMode::Mailbox, present_mode: wgpu::PresentMode::Mailbox,
@ -99,9 +99,12 @@ pub fn init(title: &str) -> System {
// //
// Set up dear imgui wgpu renderer // Set up dear imgui wgpu renderer
// //
let renderer = RendererConfig::new() let renderer_config = RendererConfig {
.set_texture_format(sc_desc.format) texture_format: sc_desc.format,
.build(&mut imgui, &device, &queue); ..Default::default()
};
let renderer = Renderer::new(&mut imgui, &device, &queue, renderer_config);
System { System {
event_loop, event_loop,

2
implot-sys-bindgen/Cargo.toml
View file

@ -6,4 +6,4 @@ edition = "2018"
[dependencies] [dependencies]
bindgen = "0.55.1" bindgen = "0.55.1"
imgui-sys = { version = "0.5.0" } imgui-sys = { version = "0.6.0" }

2
implot-sys/Cargo.toml
View file

@ -12,7 +12,7 @@ build = "build.rs"
links = "implot" links = "implot"
[dependencies] [dependencies]
imgui-sys = "0.5.0" imgui-sys = "0.6.0"
[build-dependencies] [build-dependencies]
cc = "1.0" cc = "1.0"