voxel/hUI
voxel/hUI
1
1
Fork 0
mirror of https://github.com/griffi-gh/hUI.git synced 2024-11-25 08:28:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: voxel:2db8d2f056802e04e726b754efc236b50d5ee093
Branches Tags
voxel:master
voxel:hui-painter-sw
voxel:0.1.0-alpha.4
..
compare: voxel:2a4af1aa352f444edff4ae3e694d32055086faec
Branches Tags
voxel:master
voxel:hui-painter-sw
voxel:0.1.0-alpha.4

No commits in common. "2db8d2f056802e04e726b754efc236b50d5ee093" and "2a4af1aa352f444edff4ae3e694d32055086faec" have entirely different histories.
2db8d2f056 ... 2a4af1aa35

21 changed files with 147 additions and 397 deletions
Show stats Expand all files Collapse all files

2
hui-examples/Cargo.toml
View file

@ -12,7 +12,7 @@ hui-winit = { path = "../hui-winit" }
kubi-logging = { git = "https://github.com/griffi-gh/kubi", rev = "c162893fd" }
glium = "0.34"
winit = "0.29"
glam = "0.27"
glam = "0.25"
log = "0.4"
#created as a workaround for rust-analyzer dependency cycle (which should be allowed)

23
hui-examples/examples/align_test.rs
View file

@ -73,21 +73,24 @@ fn main() {
children: ElementList(vec![
Box::new(FillRect {
size: (Size::Relative(0.5), Size::Absolute(30.)).into(),
frame: Box::new(vec4(0.75, 0., 0., 1.)),
background: vec4(0.75, 0., 0., 1.).into(),
..Default::default()
}),
Box::new(FillRect {
size: (Size::Relative(z / 2. + 0.5), Size::Absolute(30.)).into(),
frame: Box::new(Corners::left_right(
background: Corners::left_right(
vec4(1., 0., 0., 1.),
vec4(0., 1., 0., 1.)
)),
).into(),
..Default::default()
}),
]),
..Default::default()
}),
Box::new(FillRect {
size: (Size::Relative(z / 2. + 0.5), Size::Absolute(30.)).into(),
frame: Box::new(vec4(0., 0.75, 0., 1.)),
background: vec4(0., 0.75, 0., 1.).into(),
..Default::default()
}),
Box::new(Container {
gap: 5.,
@ -99,11 +102,12 @@ fn main() {
for i in 0..10 {
x.push(Box::new(FillRect {
size: (Size::Absolute(50.), Size::Absolute(50.)).into(),
frame: Box::new(if i == 1 {
vec4(0.75, 0.75, 0.75, 0.75)
background: if i == 1 {
vec4(0.75, 0.75, 0.75, 0.75).into()
} else {
vec4(0.5, 0.5, 0.5, 0.75)
}),
vec4(0.5, 0.5, 0.5, 0.75).into()
},
..Default::default()
}));
}
ElementList(x)
@ -126,7 +130,8 @@ fn main() {
children: ElementList(vec![
Box::new(FillRect {
size: (Size::Absolute(50.), Size::Absolute(50.)).into(),
frame: Box::new(vec4(1., 1., 1., 0.75)),
background: vec4(1., 1., 1., 0.75).into(),
..Default::default()
}),
]),
..Default::default()

12
hui-examples/examples/text_weird.rs
View file

@ -73,11 +73,13 @@ fn main() {
}
elem.push(Box::new(FillRect {
size: (Size::Relative(1.), Size::Absolute(10.)).into(),
frame: Box::new(vec4(0., 0., 1., 1.)),
background: vec4(0., 0., 1., 1.).into(),
..Default::default()
}));
elem.push(Box::new(FillRect {
size: (Size::Relative(1.), Size::Absolute(10.)).into(),
frame: Box::new(vec4(1., 1., 0., 1.)),
background: vec4(1., 1., 0., 1.).into(),
..Default::default()
}));
elem.push(Box::new(Text {
text: "Hello, world!\nżółty liść. życie nie ma sensu i wszyscy zginemy;\nтест кирилиці їїїїїїїїїїї\njapanese text: テスト".into(),
@ -88,11 +90,13 @@ fn main() {
if instant.elapsed().as_secs() & 1 != 0 {
elem.push(Box::new(FillRect {
size: (Size::Relative(1.), Size::Absolute(10.)).into(),
frame: Box::new(vec4(1., 0., 0., 1.)),
background: vec4(1., 0., 0., 1.).into(),
..Default::default()
}));
elem.push(Box::new(FillRect {
size: (Size::Relative(1.), Size::Absolute(10.)).into(),
frame: Box::new(vec4(0., 0., 0., 1.)),
background: vec4(0., 0., 0., 1.).into(),
..Default::default()
}));
elem.push(Box::new(Spacer(100.)));
elem.push(Box::new(Text {

21
hui-examples/examples/ui_test.rs
View file

@ -1,8 +1,5 @@
use hui::{
color, size, frame_rect,
element::{container::Container, text::Text, UiElementExt},
frame::FrameRect,
layout::Alignment,
color, element::{container::Container, text::Text, UiElementExt}, frame::FrameRect, layout::Alignment, size
};
#[path = "../boilerplate.rs"]
@ -15,10 +12,10 @@ ui_main!(|ui, size, _| {
.with_align(Alignment::Center)
.with_padding(5.)
.with_gap(10.)
.with_background(frame_rect! {
color: (0.5, 0.5, 0.5, 1.),
corner_radius: 10.,
})
.with_background(
FrameRect::color(color::WHITE)
.with_corner_radius(10.)
)
.with_children(|ui| {
Text::default()
.with_text("Hello, world")
@ -27,10 +24,10 @@ ui_main!(|ui, size, _| {
.add_child(ui);
Container::default()
.with_padding((10., 20.))
.with_background(frame_rect! {
color: color::DARK_RED,
corner_radius: (2.5, 30., 2.5, 2.5),
})
.with_background(
FrameRect::color(color::DARK_RED)
.with_corner_radius((2.5, 30., 2.5, 2.5))
)
.with_children(|ui| {
Text::default()
.with_text("Lorem ipsum dolor sit amet, consectetur adipiscing elit.")

16
hui-examples/examples/ui_test_2_loading.rs
View file

@ -45,10 +45,10 @@ ui_main!(
.with_children(|ui| {
Container::default()
.with_padding((10., 15.))
.with_background(frame_rect! {
color: (0., 0., 0., 0.5),
corner_radius: 8.,
})
.with_background(
FrameRect::color((0., 0., 0., 0.5))
.with_corner_radius(8.)
)
.with_children(|ui| {
let flash = 1. - 0.5 * (4. * instant.elapsed().as_secs_f32()).sin().powi(2);
Text::default()
@ -111,10 +111,10 @@ ui_main!(
.with_children(|ui| {
Container::default()
.with_padding(10.)
.with_background(frame_rect!{
color: (0., 0., 0., 0.5),
corner_radius: 8.,
})
.with_background(
FrameRect::color((0., 0., 0., 0.5))
.with_corner_radius(8.)
)
.with_children(|ui| {
Text::default()
.with_text("Level 5")

12
hui-examples/examples/ui_test_4_wrapping.rs
View file

@ -1,10 +1,12 @@
use std::time::Instant;
use hui::{
color, element::{
color, size,
layout::{Alignment, Direction},
element::{
container::Container,
fill_rect::FillRect,
UiElementExt
}, frame_rect, layout::{Alignment, Direction}, size
},
};
#[path = "../boilerplate.rs"]
@ -30,10 +32,8 @@ ui_main!(
for i in 0..10 {
FillRect::default()
.with_size(size!((40 + i * 10)))
.with_frame(frame_rect! {
color: color::DARK_RED,
corner_radius: 8.
})
.with_corner_radius(8.)
.with_background(color::DARK_RED)
.add_child(ui);
}
})

1
hui-examples/examples/ui_test_6_slider.rs
View file

@ -8,6 +8,7 @@ use hui::{
text::Text,
UiElementExt,
},
frame::FrameRect,
layout::{Alignment, Direction},
signal::Signal,
size,

34
hui-examples/examples/ui_test_7_9patch.rs
View file

@ -1,34 +0,0 @@
use std::time::Instant;
use hui::{
color, element::{
container::Container,
fill_rect::FillRect,
UiElementExt
}, frame_rect, layout::{Alignment, Direction}, size
};
#[path = "../boilerplate.rs"]
#[macro_use]
mod boilerplate;
ui_main!(
"hUI: 9-Patch demo",
init: |_| {
},
run: |ui, size, _| {
Container::default()
.with_size(size!(100%))
.with_align(Alignment::Center)
.with_background(color::WHITE)
.with_children(|ui| {
FillRect::default()
.with_size(size!(300, 100))
.with_frame(frame_rect! {
color: color::RED
})
.add_child(ui);
})
.add_root(ui, size);
}
);

4
hui-examples/examples/vscode_layout.rs
View file

@ -55,7 +55,7 @@ ui_main!(
.add_child(ui);
FillRect::default()
.with_size(size!(100%, 1))
.with_frame(color::rgb_hex(0x2d2d30))
.with_background(color::rgb_hex(0x2d2d30))
.add_child(ui);
Container::default()
.with_size(size!(100%, 100%))
@ -67,7 +67,7 @@ ui_main!(
.add_child(ui);
FillRect::default()
.with_size(size!(1, 100%))
.with_frame(color::rgb_hex(0x2d2d30))
.with_background(color::rgb_hex(0x2d2d30))
.add_child(ui);
Container::default()
.with_size(size!(200, 100%))

2
hui-glium/Cargo.toml
View file

@ -17,5 +17,5 @@ include = [
[dependencies]
hui = { version = "=0.1.0-alpha.4", path = "../hui", default-features = false }
glium = { version = "0.34", default-features = false }
glam = "0.27"
glam = "0.25"
log = "0.4"

2
hui-winit/Cargo.toml
View file

@ -16,5 +16,5 @@ include = [
[dependencies]
hui = { version = "=0.1.0-alpha.4", path = "../hui", default-features = false }
winit = { version = "0.29", default-features = false }
glam = "0.27"
glam = "0.25"
log = "0.4"

76
hui/Cargo.toml
View file

@ -18,7 +18,7 @@ include = [
[dependencies]
hashbrown = "0.14"
nohash-hasher = "0.2"
glam = "0.27"
glam = "0.25"
fontdue = "0.8"
rect_packer = "0.2"
log = "0.4"
@ -26,77 +26,21 @@ document-features = "0.2"
derive_setters = "0.1"
derive_more = "0.99"
tinyset = "0.4"
image = { version = "0.25", default-features = false, optional = true }
#enum_dispatch = "0.3"
[features]
default = ["el_all", "image", "builtin_font", "pixel_perfect_text"]
#! Image loading support:
## Enable image loading support using the `image` crate
image = ["dep:image"]
#! #### Built-in font:
## Enable the built-in font (ProggyTiny, adds *35kb* to the executable)
default = ["builtin_elements", "builtin_font", "pixel_perfect_text"]
## Enable the built-in font (ProggyTiny, adds 35kb to the executable)
builtin_font = []
#! #### Pixel-perfect rendering:
## Enable the built-in elements (`Container`, `ProgressBar`, etc.)\
builtin_elements = ["builtin_container"]
## Enable only the `Container` component (which is essential for laying out other components)
builtin_container = []
## Round all vertex positions to nearest integer coordinates (not recommended)
pixel_perfect = ["pixel_perfect_text"]
## Apply pixel-perfect rendering hack to text (fixes blurry text rendering)
pixel_perfect_text = []
#! Make sure to disable both features if you are not rendering UI "as-is" at 1:1 scale\
#! For exmaple, you should disable them if using DPI (or any other form of) scaling while passing the virtual resolution to the ui or rendering it in 3d space
#! #### Built-in elements:
## Enable all built-in elements
el_all = [
"el_container",
"el_fill_rect",
"el_spacer",
"el_br",
"el_text",
"el_image",
"el_progress_bar",
"el_slider",
"el_transformer",
"el_interactable",
]
## Enable the built-in `Container` element
el_container = []
## Enable the built-in `FillRect` element
el_fill_rect = []
## Enable the built-in `Spacer` element
el_spacer = []
## Enable the built-in `Break` element
el_br = []
## Enable the built-in `Text` element
el_text = []
## Enable the built-in `Image` element
el_image = []
## Enable the built-in `ProgressBar` element
el_progress_bar = []
## Enable the built-in `Slider` element
el_slider = []
## Enable the built-in `Transformer` element
el_transformer = []
## Enable the built-in `Interactable` element
el_interactable = []
#! Make sure to disable the `pixel_perfect` feature if you are rendering UI in 3D space\
#! or using DPI (or any other form of) scaling while passing the virtual resolution to the ui
# ## Enable multi-threading support (currently only affects some 3rd-party libraries)
# parallel = ["fontdue/parallel"]

20
hui/src/element/builtin.rs
View file

@ -1,40 +1,40 @@
// Layout stuff:
#[cfg(feature = "el_container")]
#[cfg(feature = "builtin_container")]
pub mod container;
#[cfg(feature = "el_fill_rect")]
#[cfg(feature = "builtin_elements")]
pub mod fill_rect;
#[cfg(feature = "el_spacer")]
#[cfg(feature = "builtin_elements")]
pub mod spacer;
#[cfg(feature = "el_br")]
#[cfg(feature = "builtin_elements")]
pub mod br;
// Basic elements:
#[cfg(feature = "el_text")]
#[cfg(feature = "builtin_elements")]
pub mod text;
#[cfg(feature = "el_image")]
#[cfg(feature = "builtin_elements")]
pub mod image;
// "Extras":
// (meant to be replaced if needed)
#[cfg(feature = "el_progress_bar")]
#[cfg(feature = "builtin_elements")]
pub mod progress_bar;
#[cfg(feature = "el_slider")]
#[cfg(feature = "builtin_elements")]
pub mod slider;
// Wrappers:
#[cfg(feature = "el_transformer")]
#[cfg(feature = "builtin_elements")]
pub mod transformer;
#[cfg(feature = "el_interactable")]
#[cfg(feature = "builtin_elements")]
pub mod interactable;
//TODO add: Image

49
hui/src/element/builtin/fill_rect.rs
View file

@ -1,41 +1,39 @@
//! Simple filled rectangle with the specified size, background and corner radius
use derive_setters::Setters;
use glam::vec2;
use glam::{vec2, Vec4};
use crate::{
draw::{RoundedCorners, UiDrawCommand},
element::{MeasureContext, ProcessContext, UiElement},
frame::{Frame, FrameRect},
layout::{Size, Size2d},
measure::Response,
size
rect::{Corners, FillColor},
size,
};
/// Simple filled rectangle with the specified size, background, and corner radius
#[derive(Setters)]
#[derive(Debug, Clone, Copy, Setters)]
#[setters(prefix = "with_")]
pub struct FillRect {
/// Size of the rectangle
#[setters(into)]
pub size: Size2d,
/// Frame
#[setters(skip)]
pub frame: Box<dyn Frame>,
}
/// Background color of the rectangle
#[setters(into)]
pub background: FillColor,
impl FillRect {
pub fn with_frame(mut self, frame: impl Frame + 'static) -> Self {
self.frame = Box::new(frame);
self
}
/// Corner radius of the rectangle
#[setters(into)]
pub corner_radius: Corners<f32>,
}
impl Default for FillRect {
fn default() -> Self {
Self {
size: size!(10, 10),
frame: Box::new(FrameRect::color((0., 0., 0., 0.5))),
background: Vec4::new(0., 0., 0., 0.5).into(),
corner_radius: Corners::all(0.),
}
}
}
@ -64,17 +62,16 @@ impl UiElement for FillRect {
}
fn process(&self, ctx: ProcessContext) {
// if !self.background.is_transparent() {
// ctx.draw.add(UiDrawCommand::Rectangle {
// position: ctx.layout.position,
// size: ctx.measure.size,
// color: self.background.corners(),
// texture: None,
// rounded_corners: (self.corner_radius.max_f32() > 0.).then_some({
// RoundedCorners::from_radius(self.corner_radius)
// }),
// });
// }
self.frame.draw(ctx.draw, ctx.layout.position, ctx.measure.size);
if !self.background.is_transparent() {
ctx.draw.add(UiDrawCommand::Rectangle {
position: ctx.layout.position,
size: ctx.measure.size,
color: self.background.corners(),
texture: None,
rounded_corners: (self.corner_radius.max_f32() > 0.).then_some({
RoundedCorners::from_radius(self.corner_radius)
}),
});
}
}
}

134
hui/src/element/builtin/slider.rs
View file

@ -4,7 +4,12 @@ use derive_setters::Setters;
use glam::{Vec2, vec2};
use crate::{
draw::UiDrawCommand, element::{MeasureContext, ProcessContext, UiElement}, frame::{Frame, FrameRect}, layout::{compute_size, Size2d}, measure::Response, rect::FillColor, signal::{trigger::SignalTriggerArg, Signal}
draw::UiDrawCommand,
element::{MeasureContext, ProcessContext, UiElement},
layout::{Size2d, compute_size},
measure::Response,
rect::FillColor,
signal::{trigger::SignalTriggerArg, Signal},
};
@ -41,31 +46,22 @@ pub struct Slider {
#[setters(into)]
pub size: Size2d,
/// Track frame
#[setters(skip)]
pub track: Box<dyn Frame>,
/// Color of the slider handle
#[setters(into)]
pub handle_color: FillColor,
/// Track active frame
#[setters(skip)]
pub track_active: Box<dyn Frame>,
/// Color of the slider track
#[setters(into)]
pub track_color: FillColor,
/// Handle frame
#[setters(skip)]
pub handle: Box<dyn Frame>,
/// Color of the "active" part of the slider
#[setters(into)]
pub track_active_color: FillColor,
/// Track height *relative to the slider height*\
/// Track height relative to the slider height\
///
/// Range: 0.0..=1.0
pub track_height: f32,
/// Handle size
///
/// Please be aware that:
///
/// - Width is *static* and specified in *pixels* (e.g. `15.0`)
/// - Height is *relative* to the slider height,\
/// ...and is specified as a *ratio* in range `0.0..=1.0`
pub handle_size: (f32, f32),
pub track_height_ratio: f32,
/// Follow mode
pub follow_mode: SliderFollowMode,
@ -79,11 +75,10 @@ impl Default for Slider {
Self {
value: 0.0,
size: Size2d::default(),
handle: Box::new(FrameRect::color((0.0, 0.0, 1.))),
track: Box::new(FrameRect::color((0.5, 0.5, 0.5))),
track_active: Box::new(FrameRect::color((0.0, 0.0, 0.75))),
track_height: 0.25,
handle_size: (15.0, 1.),
handle_color: (0.0, 0.0, 1.).into(),
track_color: (0.5, 0.5, 0.5).into(),
track_active_color: (0.0, 0.0, 0.75).into(),
track_height_ratio: 0.25,
follow_mode: SliderFollowMode::default(),
on_change: None
}
@ -106,21 +101,6 @@ impl Slider {
..self
}
}
pub fn with_track(mut self, track: impl Frame + 'static) -> Self {
self.track = Box::new(track);
self
}
pub fn with_track_active(mut self, track_active: impl Frame + 'static) -> Self {
self.track_active = Box::new(track_active);
self
}
pub fn with_handle(mut self, handle: impl Frame + 'static) -> Self {
self.handle = Box::new(handle);
self
}
}
impl UiElement for Slider {
@ -141,65 +121,55 @@ impl UiElement for Slider {
//Compute handle size:
// This is kinda counter-intuitive, but if the handle is transparent, we treat it as completely disabled
// To prevent confusing offset from the edge of the slider, we set the handle size to 0
// let handle_size = if self.handle_color.is_transparent() {
// Vec2::ZERO
// } else {
// vec2(15., ctx.measure.size.y)
// };
let handle_size = vec2(self.handle_size.0, self.handle_size.1 * ctx.measure.size.y);
let handle_size = if self.handle_color.is_transparent() {
Vec2::ZERO
} else {
vec2(15., ctx.measure.size.y)
};
//Draw the track
//If the active part is opaque and value >= 1., we don't need to draw the background as the active part will cover it
//However, if the handle is not opaque, we need to draw the background as the active part won't quite reach the end
//Of corse, if it's fully transparent, we don't need to draw it either
// if !(self.track_color.is_transparent() || (self.track_active_color.is_opaque() && self.handle_color.is_opaque() && self.value >= 1.)) {
if !(self.track_active.covers_opaque() && self.handle.covers_opaque() && (self.handle_size.1 >= self.track_height) && self.value >= 1.) {
self.track.draw(
ctx.draw,
ctx.layout.position + ctx.measure.size * vec2(0., 0.5 - self.track_height / 2.),
ctx.measure.size * vec2(1., self.track_height),
);
if !(self.track_color.is_transparent() || (self.track_active_color.is_opaque() && self.handle_color.is_opaque() && self.value >= 1.)) {
ctx.draw.add(UiDrawCommand::Rectangle {
position: ctx.layout.position + ctx.measure.size * vec2(0., 0.5 - self.track_height_ratio / 2.),
size: ctx.measure.size * vec2(1., self.track_height_ratio),
color: self.track_color.into(),
texture: None,
rounded_corners: None,
});
}
//"Active" part of the track
//We can skip drawing it if it's fully transparent or value <= 0.
//But if the handle is not opaque, it should be visible even if value is zero
// if !(self.track_active_color.is_transparent() || (self.value <= 0. && self.handle_color.is_opaque())) {
if !(self.handle.covers_opaque() && (self.handle_size.1 >= self.track_height) && self.value <= 0.) {
self.track_active.draw(
ctx.draw,
ctx.layout.position + ctx.measure.size * vec2(0., 0.5 - self.track_height / 2.),
(ctx.measure.size - handle_size * Vec2::X) * vec2(self.value, self.track_height) + handle_size * Vec2::X / 2.,
);
if !(self.track_active_color.is_transparent() || (self.value <= 0. && self.handle_color.is_opaque())) {
ctx.draw.add(UiDrawCommand::Rectangle {
position: ctx.layout.position + ctx.measure.size * vec2(0., 0.5 - self.track_height_ratio / 2.),
size: (ctx.measure.size - handle_size * Vec2::X) * vec2(self.value, self.track_height_ratio) + handle_size * Vec2::X / 2.,
color: self.track_active_color.into(),
texture: None,
rounded_corners: None,
});
}
// The handle
// if handle_size.x != 0. && !self.handle_color.is_transparent() {
// let value = self.value.clamp(0., 1.);
// ctx.draw.add(UiDrawCommand::Rectangle {
// position: ctx.layout.position + ((ctx.measure.size.x - handle_size.x) * value) * Vec2::X,
// size: handle_size,
// color: self.handle_color.into(),
// texture: None,
// rounded_corners: None,
// });
// }
if (self.handle_size.0 > 0. && self.handle_size.1 > 0.) {
self.handle.draw(
ctx.draw,
ctx.layout.position +
((ctx.measure.size.x - handle_size.x) * self.value) * Vec2::X +
ctx.measure.size.y * ((1. - self.handle_size.1) * 0.5) * Vec2::Y,
handle_size,
);
if handle_size.x != 0. && !self.handle_color.is_transparent() {
let value = self.value.clamp(0., 1.);
ctx.draw.add(UiDrawCommand::Rectangle {
position: ctx.layout.position + ((ctx.measure.size.x - handle_size.x) * value) * Vec2::X,
size: handle_size,
color: self.handle_color.into(),
texture: None,
rounded_corners: None,
});
}
//handle events
if let Some(res) = ctx.input.check_active(ctx.measure.rect(ctx.layout.position)) {
let new_value = match self.follow_mode {
SliderFollowMode::Absolute => {
((res.position_in_rect.x - handle_size.x / 2.) / (ctx.measure.size.x - handle_size.x)).clamp(0., 1.)
},
SliderFollowMode::Absolute => ((res.position_in_rect.x - handle_size.x / 2.) / (ctx.measure.size.x - handle_size.x)).clamp(0., 1.),
SliderFollowMode::Relative => {
let delta = res.position_in_rect.x - res.last_position_in_rect.x;
let delta_ratio = delta / (ctx.measure.size.x - handle_size.x);

11
hui/src/frame.rs
View file

@ -9,16 +9,5 @@ mod impls;
pub use rect::FrameRect;
pub trait Frame {
/// Draw the frame at the given position and size
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2);
/// Check if the frame is guaranteed to be fully opaque and fully cover the parent frame regardless of it's size
///
/// Returns true if the frame:
/// - Is fully opaque (i.e. `alpha >= 1.0`)
/// - Completely covers (or exceeds the size of) the frame
///
/// False negatives are acceptable, but false positives ***are not***.\
/// May be used for optimization purposes
fn covers_opaque(&self) -> bool { false }
}

50
hui/src/frame/impls.rs
View file

@ -16,10 +16,6 @@ impl Frame for ImageHandle {
rounded_corners: None,
})
}
fn covers_opaque(&self) -> bool {
false
}
}
impl Frame for FillColor {
@ -32,10 +28,6 @@ impl Frame for FillColor {
rounded_corners: None,
})
}
fn covers_opaque(&self) -> bool {
self.is_opaque()
}
}
// impl for various types resembling colors
@ -46,36 +38,24 @@ impl Frame for Corners<Vec4> {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for (Vec4, Vec4, Vec4, Vec4) {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for ((f32, f32, f32, f32), (f32, f32, f32, f32), (f32, f32, f32, f32), (f32, f32, f32, f32)) {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for [[f32; 4]; 4] {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
// Corners (RGB):
@ -84,36 +64,24 @@ impl Frame for Corners<Vec3> {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for (Vec3, Vec3, Vec3, Vec3) {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for ((f32, f32, f32), (f32, f32, f32), (f32, f32, f32), (f32, f32, f32)) {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for [[f32; 3]; 4] {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
// RGBA:
@ -122,27 +90,18 @@ impl Frame for Vec4 {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for (f32, f32, f32, f32) {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for [f32; 4] {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
// RGB:
@ -151,25 +110,16 @@ impl Frame for Vec3 {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for (f32, f32, f32) {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}
impl Frame for [f32; 3] {
fn draw(&self, draw: &mut UiDrawCommandList, position: Vec2, parent_size: Vec2) {
FillColor::from(*self).draw(draw, position, parent_size)
}
fn covers_opaque(&self) -> bool {
FillColor::from(*self).is_opaque()
}
}

20
hui/src/frame/rect.rs
View file

@ -6,9 +6,6 @@ use crate::{
};
use super::{Frame, point::FramePoint2d};
/// A rectangular frame
///
/// Can optionally be tinted, textured, and have rounded corners
#[derive(Clone, Copy)]
pub struct FrameRect {
/// Background color of the frame\
@ -62,9 +59,7 @@ impl FrameRect {
}
}
/// Create a new [`FrameRect`] with the given image\
///
/// Color will be set to [`WHITE`](crate::color::WHITE) to ensure the image is visible
/// Create a new [`FrameRect`] with the given image
pub fn image(image: ImageHandle) -> Self {
Self {
color: color::WHITE.into(),
@ -129,17 +124,4 @@ impl Frame for FrameRect {
),
});
}
fn covers_opaque(&self) -> bool {
self.top_left.x.absolute <= 0. &&
self.top_left.x.relative <= 0. &&
self.top_left.y.absolute <= 0. &&
self.top_left.y.relative <= 0. &&
self.bottom_right.x.absolute >= 0. &&
self.bottom_right.x.relative >= 1. &&
self.bottom_right.y.absolute >= 0. &&
self.bottom_right.y.relative >= 1. &&
self.color.is_opaque() &&
self.image.is_none()
}
}

5
hui/src/frame/stack.rs
View file

@ -9,11 +9,6 @@ impl Frame for FrameStack {
self.0.draw(draw, position, parent_size);
self.1.draw(draw, position, parent_size);
}
fn covers_opaque(&self) -> bool {
self.0.covers_opaque() ||
self.1.covers_opaque()
}
}
pub trait FrameStackExt: Frame {

38
hui/src/instance.rs
View file

@ -83,44 +83,6 @@ impl UiInstance {
self.atlas.add(width, data, format)
}
//TODO better error handling
/// Add an image from a file to the texture atlas\
/// (experimental, may be removed in the future)
///
/// Requires the `image` feature
///
/// # Panics:
/// - If the file exists but contains invalid image data\
/// (this will change to a soft error in the future)
#[cfg(feature = "image")]
pub fn add_image_file_path(&mut self, path: impl AsRef<std::path::Path>) -> Result<ImageHandle, std::io::Error> {
use std::io::Read;
// Open the file (and wrap it in a bufreader)
let mut file = std::io::BufReader::new(std::fs::File::open(path)?);
//Guess the image format from the magic bytes
//Read like 64 bytes, which should be enough for magic byte detection
//well this would fail if the image is somehow smaller than 64 bytes, but who the fvck cares...
let mut magic = [0; 64];
file.read_exact(&mut magic)?;
let format = image::guess_format(&magic).expect("Invalid image data (FORMAT)");
//Parse the image and read the raw uncompressed rgba data
let image = image::load(file, format).expect("Invalid image data");
let image_rgba = image.as_rgba8().unwrap();
//Add the image to the atlas
let handle = self.add_image(
TextureFormat::Rgba,
image_rgba,
image.width() as usize
);
Ok(handle)
}
/// Push a font to the font stack\
/// The font will be used for all text rendering until it is popped
///

12
hui/src/macros.rs
View file

@ -62,18 +62,6 @@ macro_rules! size {
}
/// Helper macro for constructing a `FrameRect`
///
/// # Example:
/// ```
/// frame_rect! {
/// color: (0.2, 0.2, 0.3, 1.),
/// corner_radius: 5.,
/// };
/// ```
///
/// # Note:
/// - If the `image` field is set, but not `color`, the `color` field will default to [`WHITE`](crate::color::WHITE) (to ensure visibility)
/// - If both `color` and `image` are not set, the `color` field will default to [`TRANSPARENT`](crate::color::TRANSPARENT)
#[macro_export]
macro_rules! frame_rect {
{} => {