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

Compare commits

base: voxel:2e91b3a9eefefc228453ebaa3ec20a0c781a8fd7
Branches Tags
voxel:master
voxel:modding-ex
voxel:nightly
voxel:legacy-gles
voxel:pre-multiplayer
voxel:legacy-v1
..
compare: voxel:0af548320b5006009b55b666662cef63e21f1aab
Branches Tags
voxel:master
voxel:modding-ex
voxel:nightly
voxel:legacy-gles
voxel:pre-multiplayer
voxel:legacy-v1

No commits in common. "2e91b3a9eefefc228453ebaa3ec20a0c781a8fd7" and "0af548320b5006009b55b666662cef63e21f1aab" have entirely different histories.
2e91b3a9ee ... 0af548320b

6 changed files with 52 additions and 180 deletions
Show stats Expand all files Collapse all files

73
kubi-ui/examples/test.rs
View file

@ -1,5 +1,5 @@
use std::time::Instant;
use glam::{Vec2, IVec2, UVec2, vec4};
use glam::{Vec2, IVec2, UVec2};
use glium::{backend::glutin::SimpleWindowBuilder, Surface};
use winit::{
event::{Event, WindowEvent},
@ -7,7 +7,7 @@ use winit::{
};
use kubi_ui::{
KubiUi,
backend::glium::GliumUiRenderer, element::{progress_bar::ProgressBar, container::{Container, Sides, Alignment}, UiElement, rect::Rect}, UiSize, UiDirection
backend::glium::GliumUiRenderer, element::{progress_bar::ProgressBar, container::{Container, Sides}, UiElement}, UiSize
};
fn main() {
@ -34,85 +34,18 @@ fn main() {
kui.begin();
let z = instant.elapsed().as_secs_f32().sin().powi(2);
kui.add(Container {
gap: 5.,
padding: Sides::all(5.),
align: (Alignment::Begin, Alignment::Center),
size: (UiSize::Percentage(1.), UiSize::Percentage(1.)),
elements: vec![
Box::new(ProgressBar {
value: 0.5,
..Default::default()
}),
],
..Default::default()
}, resolution);
kui.add(Container {
gap: 5.,
padding: Sides::all(5.),
align: (Alignment::End, Alignment::Center),
size: (UiSize::Percentage(1.), UiSize::Percentage(1.)),
elements: vec![
Box::new(ProgressBar {
value: z,
value: instant.elapsed().as_secs_f32().sin().powi(2),
..Default::default()
}),
Box::new(Container {
size: (UiSize::Percentage(1.), UiSize::Auto),
align: (Alignment::Center, Alignment::End),
padding: Sides::all(5.),
gap: 10.,
elements: vec![
Box::new(Rect {
size: (UiSize::Percentage(0.5), UiSize::Pixels(30.)),
color: Some(vec4(0.75, 0., 0., 1.))
}),
Box::new(Rect {
size: (UiSize::Percentage(z / 2. + 0.5), UiSize::Pixels(30.)),
color: Some(vec4(0., 0.75, 0., 1.))
}),
],
..Default::default()
}),
Box::new(Rect {
size: (UiSize::Percentage(z / 2. + 0.5), UiSize::Pixels(30.)),
color: Some(vec4(0., 0.75, 0., 1.))
}),
Box::new(Container {
gap: 5.,
padding: Sides::all(5.),
background: Some(vec4(0., 0., 0., 0.5)),
direction: UiDirection::Horizontal,
elements: {
let mut x: Vec<Box<dyn UiElement>> = vec![];
for i in 0..10 {
x.push(Box::new(Rect {
size: (UiSize::Pixels(50.), UiSize::Pixels(50.)),
color: if i == 1 {
Some(vec4(0.75, 0.75, 0.75, 0.75))
} else {
Some(vec4(0.5, 0.5, 0.5, 0.75))
}
}));
}
x
},
..Default::default()
}),
Box::new(Container {
background: Some(vec4(1., 0., 0., 1.)),
padding: Sides::horizontal_vertical(30., 5.),
elements: vec![
Box::new(Rect {
size: (UiSize::Pixels(50.), UiSize::Pixels(50.)),
color: Some(vec4(1., 1., 1., 0.75))
})
],
..Default::default()
})
],
..Default::default()
}, resolution);

123
kubi-ui/src/element/builtin/container.rs
View file

@ -4,12 +4,11 @@ use crate::{
UiSize,
LayoutInfo,
draw::UiDrawCommand,
measure::{Response, Hints},
measure::Response,
state::StateRepo,
element::UiElement
};
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
pub enum Alignment {
Begin,
Center,
@ -52,9 +51,8 @@ impl<T: Clone> Sides<T> {
}
pub struct Container {
// pub min_size: (UiSize, UiSize),
// pub max_size: (UiSize, UiSize),
pub size: (UiSize, UiSize),
pub min_size: (UiSize, UiSize),
pub max_size: (UiSize, UiSize),
pub direction: UiDirection,
//pub reverse: bool,
pub gap: f32,
@ -69,15 +67,13 @@ pub struct Container {
impl Default for Container {
fn default() -> Self {
Self {
// min_size: (UiSize::Auto, UiSize::Auto),
// max_size: (UiSize::Auto, UiSize::Auto),
size: (UiSize::Auto, UiSize::Auto),
min_size: (UiSize::Auto, UiSize::Auto),
max_size: (UiSize::Auto, UiSize::Auto),
direction: UiDirection::Vertical,
//reverse: false,
gap: 0.,
padding: Sides::all(0.),
///Primary/secondary axis
align: (Alignment::Begin, Alignment::Begin),
align: (Alignment::Center, Alignment::Begin),
background: Default::default(),
borders: Default::default(),
clip: Default::default(),
@ -87,8 +83,7 @@ impl Default for Container {
}
impl Container {
pub fn measure_max_inner_size(&self, layout: &LayoutInfo) -> Vec2 {
//TODO take explicit size into account
pub fn measure_max_size(&self, layout: &LayoutInfo) -> Vec2 {
layout.max_size - vec2(
self.padding.left + self.padding.right,
self.padding.top + self.padding.bottom,
@ -99,55 +94,28 @@ impl Container {
impl UiElement for Container {
fn measure(&self, state: &StateRepo, layout: &LayoutInfo) -> Response {
let mut size = Vec2::ZERO;
//if matches!(self.size.0, UiSize::Auto) || matches!(self.size.1, UiSize::Auto) {
let mut leftover_gap = Vec2::ZERO;
for element in &self.elements {
let measure = element.measure(state, &LayoutInfo {
position: layout.position + size,
max_size: self.measure_max_inner_size(layout), // - size TODO
max_size: self.measure_max_size(layout), // - size TODO
direction: self.direction,
});
match self.direction {
UiDirection::Horizontal => {
size.x += measure.size.x + self.gap;
size.y = size.y.max(measure.size.y);
size.x += measure.desired_size.x + self.gap;
size.y = size.y.max(measure.desired_size.y);
leftover_gap.x = self.gap;
},
UiDirection::Vertical => {
size.x = size.x.max(measure.size.x);
size.y += measure.size.y + self.gap;
size.x = size.x.max(measure.desired_size.x);
size.y += measure.desired_size.y + self.gap;
leftover_gap.y = self.gap;
}
}
}
size -= leftover_gap;
let inner_content_size = Some(size);
size += vec2(
self.padding.left + self.padding.right,
self.padding.top + self.padding.bottom,
);
match self.size.0 {
UiSize::Auto => (),
UiSize::Percentage(percentage) => size.x = layout.max_size.x * percentage,
UiSize::Pixels(pixels) => size.x = pixels,
}
match self.size.1 {
UiSize::Auto => (),
UiSize::Percentage(percentage) => size.y = layout.max_size.y * percentage,
UiSize::Pixels(pixels) => size.y = pixels,
}
Response {
size,
hints: Hints {
inner_content_size,
..Default::default()
},
user_data: None
}
Response { desired_size: size }
}
fn process(&self, measure: &Response, state: &mut StateRepo, layout: &LayoutInfo, draw: &mut Vec<UiDrawCommand>) {
@ -157,7 +125,7 @@ impl UiElement for Container {
if let Some(color) = self.background {
draw.push(UiDrawCommand::Rectangle {
position,
size: measure.size,
size: measure.desired_size,
color
});
}
@ -166,61 +134,48 @@ impl UiElement for Container {
position += vec2(self.padding.left, self.padding.top);
//alignment
match (self.align.0, self.direction) {
(Alignment::Begin, _) => (),
(Alignment::Center, UiDirection::Horizontal) => {
position.x += (measure.size.x - measure.hints.inner_content_size.unwrap().x) / 2.;
},
(Alignment::Center, UiDirection::Vertical) => {
position.y += (measure.size.y - measure.hints.inner_content_size.unwrap().y) / 2.;
},
(Alignment::End, UiDirection::Horizontal) => {
position.x += measure.size.x - measure.hints.inner_content_size.unwrap().x - self.padding.right - self.padding.left;
},
(Alignment::End, UiDirection::Vertical) => {
position.y += measure.size.y - measure.hints.inner_content_size.unwrap().y - self.padding.bottom - self.padding.top;
}
}
//TODO: REQUIRES MAX MEASURE SIZES!
// match self.align.0 {
// Alignment::Begin => (),
// Alignment::Center => {
// position.x += (layout.max_size.x - measure.desired_size.x) / 2.;
// },
// Alignment::End => {
// position.x += layout.max_size.x - measure.desired_size.x;
// }
// }
// match self.align.1 {
// Alignment::Begin => (),
// Alignment::Center => {
// position.y += (layout.max_size.y - measure.desired_size.y) / 2.;
// },
// Alignment::End => {
// position.y += layout.max_size.y - measure.desired_size.y;
// }
// }
for element in &self.elements {
//(passing max size from layout rather than actual bounds for the sake of consistency with measure() above)
let mut el_layout = LayoutInfo {
let layout = LayoutInfo {
position,
max_size: self.measure_max_inner_size(layout),
max_size: self.measure_max_size(layout),
direction: self.direction,
};
//measure
let el_measure = element.measure(state, &el_layout);
//align (on sec. axis)
match (self.align.1, self.direction) {
(Alignment::Begin, _) => (),
(Alignment::Center, UiDirection::Horizontal) => {
el_layout.position.y += (measure.size.y - self.padding.bottom - self.padding.top - el_measure.size.y) / 2.;
},
(Alignment::Center, UiDirection::Vertical) => {
el_layout.position.x += (measure.size.x - self.padding.left - self.padding.right - el_measure.size.x) / 2.;
},
(Alignment::End, UiDirection::Horizontal) => {
el_layout.position.y += measure.size.y - el_measure.size.y - self.padding.bottom;
},
(Alignment::End, UiDirection::Vertical) => {
el_layout.position.x += measure.size.x - el_measure.size.x - self.padding.right;
}
}
let el_measure = element.measure(state, &layout);
//process
element.process(&el_measure, state, &el_layout, draw);
element.process(&el_measure, state, &layout, draw);
//layout
match self.direction {
UiDirection::Horizontal => {
position.x += el_measure.size.x + self.gap;
position.x += el_measure.desired_size.x + self.gap;
},
UiDirection::Vertical => {
position.y += el_measure.size.y + self.gap;
position.y += el_measure.desired_size.y + self.gap;
}
}
}

10
kubi-ui/src/element/builtin/progress_bar.rs
View file

@ -33,7 +33,7 @@ impl UiElement for ProgressBar {
fn measure(&self, _: &StateRepo, layout: &LayoutInfo) -> Response {
Response {
size: vec2(
desired_size: vec2(
match self.size.0 {
UiSize::Auto => layout.max_size.x.max(300.),
UiSize::Percentage(p) => layout.max_size.x * p,
@ -44,9 +44,7 @@ impl UiElement for ProgressBar {
UiSize::Percentage(p) => layout.max_size.y * p,
UiSize::Pixels(p) => p,
}
),
hints: Default::default(),
user_data: None,
)
}
}
@ -55,14 +53,14 @@ impl UiElement for ProgressBar {
if value < 1. {
draw.push(UiDrawCommand::Rectangle {
position: layout.position,
size: measure.size,
size: measure.desired_size,
color: self.color_background
});
}
if value > 0. {
draw.push(UiDrawCommand::Rectangle {
position: layout.position,
size: measure.size * vec2(value, 1.0),
size: measure.desired_size * vec2(value, 1.0),
color: self.color_foreground
});
}

8
kubi-ui/src/element/builtin/rect.rs
View file

@ -25,7 +25,7 @@ impl Default for Rect {
impl UiElement for Rect {
fn measure(&self, _state: &StateRepo, layout: &LayoutInfo) -> Response {
Response {
size: vec2(
desired_size: vec2(
match self.size.0 {
UiSize::Auto => layout.max_size.x,
UiSize::Percentage(percentage) => layout.max_size.x * percentage,
@ -36,9 +36,7 @@ impl UiElement for Rect {
UiSize::Percentage(percentage) => layout.max_size.y * percentage,
UiSize::Pixels(pixels) => pixels,
},
),
hints: Default::default(),
user_data: None
)
}
}
@ -46,7 +44,7 @@ impl UiElement for Rect {
if let Some(color) = self.color {
draw.push(UiDrawCommand::Rectangle {
position: layout.position,
size: measure.size,
size: measure.desired_size,
color,
});
}

6
kubi-ui/src/element/builtin/spacer.rs
View file

@ -19,12 +19,10 @@ impl Default for Spacer {
impl UiElement for Spacer {
fn measure(&self, state: &StateRepo, layout: &LayoutInfo) -> Response {
Response {
size: match layout.direction {
desired_size: match layout.direction {
UiDirection::Horizontal => vec2(self.0, 0.),
UiDirection::Vertical => vec2(0., self.0),
},
hints: Default::default(),
user_data: None
}
}
}

12
kubi-ui/src/measure.rs
View file

@ -1,15 +1,5 @@
use glam::Vec2;
#[derive(Default)]
#[non_exhaustive]
pub struct Hints {
pub inner_content_size: Option<Vec2>,
pub inner_content_size_cache: Option<Vec<Vec2>>,
}
#[derive(Default)]
pub struct Response {
pub size: Vec2,
pub hints: Hints,
pub user_data: Option<Box<dyn std::any::Any>>,
pub desired_size: Vec2
}