aaaand fixed up the examples

This commit is contained in:
Jack Mac 2021-09-26 21:15:02 -04:00
parent 41ab364384
commit b30cb740ba
6 changed files with 9 additions and 9 deletions

View File

@ -121,7 +121,7 @@ impl System {
let mut target = display.draw();
target.clear_color_srgb(1.0, 1.0, 1.0, 1.0);
platform.prepare_render(&ui, gl_window.window());
let draw_data = ui.render();
let draw_data = imgui.render();
renderer
.render(&mut target, draw_data)
.expect("Rendering failed");

View File

@ -330,7 +330,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) {
window = window.opened(opened)
}
window.build(|| {
ui.push_item_width(-140.0);
let _w = ui.push_item_width(-140.0);
ui.text(format!("dear imgui says hello. ({})", imgui::dear_imgui_version()));
if let Some(menu_bar) = ui.begin_menu_bar() {
if let Some(menu) = ui.begin_menu("Menu") {
@ -827,7 +827,7 @@ CTRL+click on individual component to input value.\n",
});
}
fn show_example_app_main_menu_bar<'a>(ui: &Ui<'a>, state: &mut State) {
fn show_example_app_main_menu_bar(ui: &Ui, state: &mut State) {
if let Some(menu_bar) = ui.begin_main_menu_bar() {
if let Some(menu) = ui.begin_menu("File") {
show_example_menu_file(ui, &mut state.file_menu);
@ -849,7 +849,7 @@ fn show_example_app_main_menu_bar<'a>(ui: &Ui<'a>, state: &mut State) {
}
}
fn show_example_menu_file<'a>(ui: &Ui<'a>, state: &mut FileMenuState) {
fn show_example_menu_file(ui: &Ui, state: &mut FileMenuState) {
MenuItem::new("(dummy menu)").enabled(false).build(ui);
MenuItem::new("New").build(ui);
MenuItem::new("Open").shortcut("Ctrl+O").build(ui);

View File

@ -51,8 +51,8 @@ fn main() {
let ui = imgui_context.frame();
ui.show_demo_window(&mut true);
winit_platform.prepare_render(&ui, window.window());
let draw_data = ui.render();
winit_platform.prepare_render(ui, window.window());
let draw_data = imgui_context.render();
// This is the only extra render step to add
ig_renderer

View File

@ -42,7 +42,7 @@ fn main() {
ui.show_demo_window(&mut true);
winit_platform.prepare_render(&ui, window.window());
let draw_data = ui.render();
let draw_data = imgui_context.render();
// Render imgui on top of it
ig_renderer

View File

@ -56,7 +56,7 @@ fn main() {
ui.show_demo_window(&mut true);
winit_platform.prepare_render(&ui, window.window());
let draw_data = ui.render();
let draw_data = imgui_context.render();
// Render imgui on top
ig_renderer

View File

@ -59,7 +59,7 @@ fn main() {
textures_ui.show(&ui);
winit_platform.prepare_render(&ui, window.window());
let draw_data = ui.render();
let draw_data = imgui_context.render();
ig_renderer
.render(&gl, &textures, draw_data)
.expect("error rendering imgui");