diff --git a/kubi/src/guiv2_integration.rs b/kubi/src/guiv2_integration.rs index 562d892..30dfcdb 100644 --- a/kubi/src/guiv2_integration.rs +++ b/kubi/src/guiv2_integration.rs @@ -4,7 +4,7 @@ use crate::rendering::{Renderer, RenderTarget, WindowSize}; #[derive(Unique)] pub struct UiState { - pub ui: KubiUi, + pub kui: KubiUi, pub renderer: GliumUiRenderer, } @@ -13,7 +13,7 @@ pub fn kubi_ui_init( ) { let renderer = storages.borrow::>>().unwrap(); storages.add_unique_non_send_sync(UiState { - ui: KubiUi::new(), + kui: KubiUi::new(), renderer: GliumUiRenderer::new(&renderer.display) }); } @@ -21,14 +21,14 @@ pub fn kubi_ui_init( pub fn kubi_ui_begin( mut ui: NonSendSync> ) { - ui.ui.begin(); + ui.kui.begin(); } pub fn kubi_ui_end( mut ui: NonSendSync> ) { let ui: &mut UiState = &mut ui; - let UiState { ui, renderer } = ui; + let UiState { kui: ui, renderer } = ui; ui.end(); let (upload_needed, plan) = ui.draw_plan(); if upload_needed { diff --git a/kubi/src/loading_screen.rs b/kubi/src/loading_screen.rs index 4e8d6b8..8f9396a 100644 --- a/kubi/src/loading_screen.rs +++ b/kubi/src/loading_screen.rs @@ -21,7 +21,7 @@ fn render_progressbar( let total = world.chunks.len(); loaded as f32 / total as f32 }; - ui.ui.add( + ui.kui.add( ProgressBar { value, ..Default::default() }, size.0.as_vec2() );