update imgui-wgpu

This commit is contained in:
Benedikt Mandelkow 2020-10-13 11:24:20 +02:00 committed by 4bb4
parent 7d5df2f2d6
commit 99123d7b8d
2 changed files with 7 additions and 7 deletions

View file

@ -8,9 +8,8 @@ edition = "2018"
implot = { path = "../" } implot = { path = "../" }
wgpu = "^0.6.0" wgpu = "^0.6.0"
wgpu-subscriber = "^0.1.0" # tracing, also chrome profiling format support
winit = "^0.22.2" # opening windows and handling input winit = "^0.22.2" # 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.5.0"
imgui-winit-support = "^0.5.0" # connection of input (keys) to imgui imgui-winit-support = "^0.5.0" # connection of input (keys) to imgui
imgui-wgpu = "^0.10.0" # imgui backend for drawing using wgpu imgui-wgpu = "^0.11.0" # imgui backend for drawing using wgpu

View file

@ -1,5 +1,5 @@
use imgui::{im_str, CollapsingHeader, Condition, FontSource}; use imgui::{im_str, CollapsingHeader, Condition, FontSource};
use imgui_wgpu::Renderer; use imgui_wgpu::RendererConfig;
use std::time::Instant; use std::time::Instant;
use winit::{ use winit::{
event::{Event, WindowEvent}, event::{Event, WindowEvent},
@ -81,7 +81,9 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::
let style = imgui.style_mut(); let style = imgui.style_mut();
style.use_classic_colors(); style.use_classic_colors();
let mut renderer = Renderer::new(&mut imgui, &device, &queue, sc_desc.format); let mut renderer = RendererConfig::new()
.set_texture_format(sc_desc.format)
.build(&mut imgui, &device, &queue);
let mut last_frame = Instant::now(); let mut last_frame = Instant::now();
let mut last_cursor = None; let mut last_cursor = None;
@ -137,8 +139,8 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::
let border = 10.0; let border = 10.0;
window.position([0.0, 0.0], Condition::Always).size( window.position([0.0, 0.0], Condition::Always).size(
[ [
sc_desc.width as f32 / hidpi_factor - border, sc_desc.width as f32 / hidpi_factor as f32 - border,
sc_desc.height as f32 / hidpi_factor - border, sc_desc.height as f32 / hidpi_factor as f32 - border,
], ],
Condition::Always, Condition::Always,
) )
@ -228,7 +230,6 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::
fn main() { fn main() {
let event_loop = EventLoop::new(); let event_loop = EventLoop::new();
let window = winit::window::Window::new(&event_loop).unwrap(); let window = winit::window::Window::new(&event_loop).unwrap();
wgpu_subscriber::initialize_default_subscriber(None);
// Temporarily avoid srgb formats for the swapchain on the web // Temporarily avoid srgb formats for the swapchain on the web
futures::executor::block_on(run(event_loop, window, wgpu::TextureFormat::Bgra8UnormSrgb)); futures::executor::block_on(run(event_loop, window, wgpu::TextureFormat::Bgra8UnormSrgb));
} }