From f24bff2755a63e7de5743012a61104e8b7945046 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Sun, 18 Feb 2024 17:22:31 +0100 Subject: [PATCH] fix most warnings --- hui-examples/examples/stress.rs | 4 ++-- hui-examples/examples/test.rs | 5 ++--- hui-examples/examples/test2.rs | 9 +++++---- hui/src/draw.rs | 2 +- hui/src/element/builtin/container.rs | 5 ++++- hui/src/element/builtin/progress_bar.rs | 4 +--- hui/src/element/builtin/rect.rs | 5 ++--- hui/src/element/builtin/text.rs | 9 ++++----- hui/src/state.rs | 2 ++ hui/src/text.rs | 4 ++-- hui/src/text/font.rs | 11 +++++++---- 11 files changed, 32 insertions(+), 28 deletions(-) diff --git a/hui-examples/examples/stress.rs b/hui-examples/examples/stress.rs index 26ae48a..1498a96 100644 --- a/hui-examples/examples/stress.rs +++ b/hui-examples/examples/stress.rs @@ -1,5 +1,5 @@ use std::time::Instant; -use glam::{Vec2, IVec2, UVec2}; +use glam::UVec2; use glium::{backend::glutin::SimpleWindowBuilder, Surface}; use winit::{ event::{Event, WindowEvent}, @@ -20,7 +20,7 @@ fn main() { kubi_logging::init(); let event_loop = EventLoopBuilder::new().build().unwrap(); - let (window, display) = SimpleWindowBuilder::new().build(&event_loop); + let (_window, display) = SimpleWindowBuilder::new().build(&event_loop); let mut hui = UiInstance::new(); let mut backend = GliumUiRenderer::new(&display); diff --git a/hui-examples/examples/test.rs b/hui-examples/examples/test.rs index 7c9fa6a..609a506 100644 --- a/hui-examples/examples/test.rs +++ b/hui-examples/examples/test.rs @@ -14,8 +14,7 @@ use hui::{ rect::Rect }, interaction::IntoInteractable, - UiSize, - UiDirection, IfModified, + UiSize, UiDirection, }; use hui_glium::GliumUiRenderer; @@ -23,7 +22,7 @@ fn main() { kubi_logging::init(); let event_loop = EventLoopBuilder::new().build().unwrap(); - let (window, display) = SimpleWindowBuilder::new().build(&event_loop); + let (_window, display) = SimpleWindowBuilder::new().build(&event_loop); let mut hui = UiInstance::new(); let mut backend = GliumUiRenderer::new(&display); diff --git a/hui-examples/examples/test2.rs b/hui-examples/examples/test2.rs index a7e4e71..14d7216 100644 --- a/hui-examples/examples/test2.rs +++ b/hui-examples/examples/test2.rs @@ -1,14 +1,15 @@ -use std::time::Instant; -use glam::{UVec2, vec4}; +use glam::UVec2; use glium::{backend::glutin::SimpleWindowBuilder, Surface}; use winit::{ event::{Event, WindowEvent}, event_loop::{EventLoopBuilder, ControlFlow} }; use hui::{ + UiInstance, UiSize, element::{ - container::{Alignment, Container, Sides}, progress_bar::ProgressBar, rect::Rect, text::Text, UiElement - }, interaction::IntoInteractable, IfModified, UiDirection, UiInstance, UiSize + container::{Alignment, Container, Sides}, + text::Text, + } }; use hui_glium::GliumUiRenderer; diff --git a/hui/src/draw.rs b/hui/src/draw.rs index a952c60..c80243c 100644 --- a/hui/src/draw.rs +++ b/hui/src/draw.rs @@ -94,7 +94,7 @@ impl CallSwapper { } pub fn swap(&mut self) { - self.calls.push(std::mem::replace(&mut self.call, UiDrawCall::default())); + self.calls.push(std::mem::take(&mut self.call)); } pub fn finish(mut self) -> Vec { diff --git a/hui/src/element/builtin/container.rs b/hui/src/element/builtin/container.rs index 19a007c..a3ccb89 100644 --- a/hui/src/element/builtin/container.rs +++ b/hui/src/element/builtin/container.rs @@ -1,6 +1,9 @@ use glam::{Vec2, vec2, Vec4}; use crate::{ - draw::{UiDrawCommand, UiDrawCommands}, element::{MeasureContext, ProcessContext, UiElement}, measure::{Hints, Response}, state::StateRepo, LayoutInfo, UiDirection, UiSize + draw::UiDrawCommand, + element::{MeasureContext, ProcessContext, UiElement}, + measure::{Hints, Response}, + LayoutInfo, UiDirection, UiSize }; #[derive(Clone, Copy, PartialEq, Eq, Debug)] diff --git a/hui/src/element/builtin/progress_bar.rs b/hui/src/element/builtin/progress_bar.rs index d949a4c..074e3c1 100644 --- a/hui/src/element/builtin/progress_bar.rs +++ b/hui/src/element/builtin/progress_bar.rs @@ -1,10 +1,8 @@ use glam::{vec2, Vec4, vec4}; use crate::{ - draw::{UiDrawCommand, UiDrawCommands}, + draw::UiDrawCommand, element::{MeasureContext, ProcessContext, UiElement}, measure::Response, - state::StateRepo, - LayoutInfo, UiSize }; diff --git a/hui/src/element/builtin/rect.rs b/hui/src/element/builtin/rect.rs index 0118e65..efa118a 100644 --- a/hui/src/element/builtin/rect.rs +++ b/hui/src/element/builtin/rect.rs @@ -1,10 +1,9 @@ use glam::{vec2, Vec4}; use crate::{ - draw::{UiDrawCommand, UiDrawCommands}, + draw::UiDrawCommand, element::{MeasureContext, ProcessContext, UiElement}, measure::Response, - state::StateRepo, - LayoutInfo, UiSize + UiSize }; pub struct Rect { diff --git a/hui/src/element/builtin/text.rs b/hui/src/element/builtin/text.rs index 29044c8..8a251fb 100644 --- a/hui/src/element/builtin/text.rs +++ b/hui/src/element/builtin/text.rs @@ -1,12 +1,11 @@ use std::borrow::Cow; use glam::{vec2, Vec4}; use crate::{ - draw::{UiDrawCommand, UiDrawCommands}, + draw::UiDrawCommand, element::{MeasureContext, ProcessContext, UiElement}, measure::Response, - state::StateRepo, - text::FontHandle, - LayoutInfo, UiSize + text::{FontHandle, BUILTIN_FONT}, + UiSize }; pub struct Text { @@ -23,7 +22,7 @@ impl Default for Text { text: "".into(), size: (UiSize::Auto, UiSize::Auto), color: Vec4::new(1., 1., 1., 1.), - font: FontHandle(0), + font: BUILTIN_FONT, text_size: 16, } } diff --git a/hui/src/state.rs b/hui/src/state.rs index adc0daf..1f7b9c5 100644 --- a/hui/src/state.rs +++ b/hui/src/state.rs @@ -2,6 +2,8 @@ use hashbrown::{HashMap, HashSet}; use nohash_hasher::BuildNoHashHasher; use std::any::Any; +//TODO impl StateRepo functions and automatic cleanup of inactive ids + #[derive(Default)] pub struct StateRepo { state: HashMap, BuildNoHashHasher>, diff --git a/hui/src/text.rs b/hui/src/text.rs index 6cc8c03..c2e987d 100644 --- a/hui/src/text.rs +++ b/hui/src/text.rs @@ -4,7 +4,7 @@ mod font; mod ftm; use font::FontManager; -pub use font::FontHandle; +pub use font::{FontHandle, BUILTIN_FONT}; use fontdue::{Font, FontSettings}; use ftm::FontTextureManager; pub use ftm::{FontTextureInfo, GlyphCacheEntry}; @@ -72,7 +72,7 @@ impl<'a> TextMeasure<'a> { acc.max(glyph.x + glyph.width as f32) }) }).unwrap_or(0.), - height: layout.height() as f32, + height: layout.height(), } } } diff --git a/hui/src/text/font.rs b/hui/src/text/font.rs index 2d57d52..e560c5c 100644 --- a/hui/src/text/font.rs +++ b/hui/src/text/font.rs @@ -1,14 +1,14 @@ use fontdue::Font; -#[cfg(feature = "builtin_font")] -const BIN_FONT: &[u8] = include_bytes!("../../assets/font/ProggyTiny.ttf"); - #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)] pub struct FontHandle(pub(crate) usize); #[cfg(feature = "builtin_font")] pub const BUILTIN_FONT: FontHandle = FontHandle(0); +#[cfg(feature = "builtin_font")] +const BUILTIN_FONT_DATA: &[u8] = include_bytes!("../../assets/font/ProggyTiny.ttf"); + pub struct FontManager { fonts: Vec, } @@ -20,7 +20,10 @@ impl FontManager { }; #[cfg(feature = "builtin_font")] { - let font = Font::from_bytes(BIN_FONT, fontdue::FontSettings::default()).unwrap(); + let font = Font::from_bytes( + BUILTIN_FONT_DATA, + fontdue::FontSettings::default() + ).unwrap(); this.add_font(font); }; this