unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-06 11:46:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

'and then not have to worry about layout, ever'

Browse source
This commit is contained in:
🪞👃🪞 2024-12-31 23:58:51 +01:00
parent 21741ebc52
commit f7e6449324
8 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engine/src/engine.rs
View file

@ -111,32 +111,18 @@ pub trait Area<N: Coordinate> {
#[inline] fn set_h (&self, h: N) -> [N;4] { #[inline] fn set_h (&self, h: N) -> [N;4] {
[self.x(), self.y(), self.w(), h] [self.x(), self.y(), self.w(), h]
} }
fn x2 (&self) -> N { #[inline] fn x2 (&self) -> N {
self.x() + self.w() self.x() + self.w()
} }
fn y2 (&self) -> N { #[inline] fn y2 (&self) -> N {
self.y() + self.h() self.y() + self.h()
} }
#[inline] fn lrtb (&self) -> [N;4] { #[inline] fn lrtb (&self) -> [N;4] {
[self.x(), self.x2(), self.y(), self.y2()] [self.x(), self.x2(), self.y(), self.y2()]
} }
#[inline] fn push_x (&self, x: N) -> [N;4] {
[self.x() + x, self.y(), self.w(), self.h()]
}
#[inline] fn push_y (&self, y: N) -> [N;4] {
[self.x(), self.y() + y, self.w(), self.h()]
}
#[inline] fn shrink_x (&self, x: N) -> [N;4] {
[self.x(), self.y(), self.w().minus(x), self.h()]
}
#[inline] fn shrink_y (&self, y: N) -> [N;4] {
[self.x(), self.y(), self.w(), self.h().minus(y)]
}
#[inline] fn center (&self) -> [N;2] { #[inline] fn center (&self) -> [N;2] {
[self.x() + self.w() / 2.into(), self.y() + self.h() / 2.into()] [self.x() + self.w() / 2.into(), self.y() + self.h() / 2.into()]
} }
fn zero () -> [N;4] { fn zero () -> [N;4] {
[N::zero(), N::zero(), N::zero(), N::zero()] [N::zero(), N::zero(), N::zero(), N::zero()]
} }

25
engine/src/output.rs
View file

@ -22,27 +22,32 @@ pub trait Content<E: Engine>: Send + Sync {
fn content (&self) -> impl Content<E> { fn content (&self) -> impl Content<E> {
() ()
} }
fn area (&self, area: E::Area) -> E::Area { fn layout (&self, area: E::Area) -> E::Area {
self.content().area(area) self.content().layout(area)
} }
fn render (&self, output: &mut E::Output) { fn render (&self, output: &mut E::Output) {
self.content().render(output) output.place(self.layout(output.area()), &self.content())
} }
} }
/// The platonic ideal item of content: emptiness at dead center.
impl<E: Engine> Content<E> for () { impl<E: Engine> Content<E> for () {
fn area (&self, _: E::Area) -> E::Area { fn layout (&self, area: E::Area) -> E::Area {
[0.into(), 0.into(), 0.into(), 0.into()].into() let [x, y, w, h] = area.xywh();
let x = x + w / 2.into();
let y = y + h / 2.into();
[x, y, 0.into(), 0.into()].into()
}
fn render (&self, _: &mut E::Output) {
} }
fn render (&self, _: &mut E::Output) {}
} }
impl<E: Engine, T: Content<E>> Content<E> for &T { impl<E: Engine, T: Content<E>> Content<E> for &T {
fn content (&self) -> impl Content<E> { fn content (&self) -> impl Content<E> {
(*self).content() (*self).content()
} }
fn area (&self, area: E::Area) -> E::Area { fn layout (&self, area: E::Area) -> E::Area {
(*self).area(area) (*self).layout(area)
} }
fn render (&self, output: &mut E::Output) { fn render (&self, output: &mut E::Output) {
(*self).render(output) (*self).render(output)
@ -54,9 +59,9 @@ impl<E: Engine, T: Content<E>> Content<E> for Option<T> {
self.as_ref() self.as_ref()
.map(|content|content.content()) .map(|content|content.content())
} }
fn area (&self, area: E::Area) -> E::Area { fn layout (&self, area: E::Area) -> E::Area {
self.as_ref() self.as_ref()
.map(|content|content.area(area)) .map(|content|content.layout(area))
.unwrap_or([0.into(), 0.into(), 0.into(), 0.into(),].into()) .unwrap_or([0.into(), 0.into(), 0.into(), 0.into(),].into())
} }
fn render (&self, output: &mut E::Output) { fn render (&self, output: &mut E::Output) {

14
engine/src/tui/tui_output.rs
View file

@ -70,8 +70,11 @@ impl TuiOut {
} }
impl Content<Tui> for &str { impl Content<Tui> for &str {
fn area (&self, to: [u16;4]) -> [u16;4] { fn layout (&self, to: [u16;4]) -> [u16;4] {
[to[0], to[1], self.chars().count() as u16, 1] let w = self.chars().count() as u16;
let y = to.y() + to.h() / 2;
let x = (to.x() + to.w() / 2).minus(w / 2);
[x, y, w, 1]
} }
fn render (&self, to: &mut TuiOut) { fn render (&self, to: &mut TuiOut) {
to.blit(self, to.area.x(), to.area.y(), None) to.blit(self, to.area.x(), to.area.y(), None)
@ -79,8 +82,11 @@ impl Content<Tui> for &str {
} }
impl Content<Tui> for String { impl Content<Tui> for String {
fn area (&self, to: [u16;4]) -> [u16;4] { fn layout (&self, to: [u16;4]) -> [u16;4] {
[to[0], to[1], self.chars().count() as u16, 1] let w = self.chars().count() as u16;
let y = to.y() + to.h() / 2;
let x = (to.x() + to.w() / 2).minus(w / 2);
[x, y, w, 1]
} }
fn render (&self, to: &mut TuiOut) { fn render (&self, to: &mut TuiOut) {
to.blit(self, to.area.x(), to.area.y(), None) to.blit(self, to.area.x(), to.area.y(), None)

3
layout/README.md
View file

@ -1,7 +1,8 @@
# `tek_layout` # `tek_layout`
this crate exposes several layout operators this crate exposes several layout operators
which are generic over `tek_engine::Engine`. which work entirely in unsigned coordinates
and are generic over `tek_engine::Engine`.
* `Fill` makes the content's dimension equal to the container's. * `Fill` makes the content's dimension equal to the container's.
* `Fixed` assigns a fixed dimension to its content. * `Fixed` assigns a fixed dimension to its content.

30
layout/src/align.rs
View file

@ -20,7 +20,7 @@ impl<E: Engine, T: Content<E>> Align<E, T> {
} }
impl<E: Engine, T: Content<E>> Content<E> for Align<E, T> { impl<E: Engine, T: Content<E>> Content<E> for Align<E, T> {
fn area (&self, outer: E::Area) -> E::Area { fn layout (&self, outer: E::Area) -> E::Area {
align_areas(self.0, outer.xywh(), Content::area(&self.content(), outer).xywh()).into() align_areas(self.0, outer.xywh(), Content::area(&self.content(), outer).xywh()).into()
} }
fn render (&self, render: &mut E::Output) { fn render (&self, render: &mut E::Output) {
@ -36,20 +36,22 @@ pub fn align_areas<N: Coordinate>(alignment: Alignment, on: [N;4], it: [N;4]) ->
let center_y = center(cfy, cmy, it.y()); let center_y = center(cfy, cmy, it.y());
let east_x = on.x() + on.w().minus(it.w()); let east_x = on.x() + on.w().minus(it.w());
let south_y = on.y() + on.h().minus(it.h()); let south_y = on.y() + on.h().minus(it.h());
match alignment { let [x, y] = match alignment {
Alignment::Center => [center_x, center_y, it.w(), it.h()], Alignment::Center => [center_x, center_y,],
Alignment::X => [center_x, it.y(), it.w(), it.h()],
Alignment::Y => [it.x(), center_y, it.w(), it.h()],
Alignment::NW => [on.x(), on.y(), it.w(), it.h()], Alignment::X => [center_x, it.y(), ],
Alignment::N => [center_x, on.y(), it.w(), it.h()], Alignment::Y => [it.x(), center_y,],
Alignment::NE => [east_x, on.y(), it.w(), it.h()],
Alignment::E => [east_x, center_y, it.w(), it.h()], Alignment::NW => [on.x(), on.y(), ],
Alignment::SE => [east_x, south_y, it.w(), it.h()], Alignment::N => [center_x, on.y(), ],
Alignment::S => [center_x, south_y, it.w(), it.h()], Alignment::NE => [east_x, on.y(), ],
Alignment::SW => [on.x(), south_y, it.w(), it.h()], Alignment::E => [east_x, center_y,],
Alignment::W => [on.x(), center_y, it.w(), it.h()], Alignment::SE => [east_x, south_y, ],
} Alignment::S => [center_x, south_y, ],
Alignment::SW => [on.x(), south_y, ],
Alignment::W => [on.x(), center_y,],
};
[x, y, it.w(), it.h()]
} }
//fn align<E: Engine, T: Content<E>, N: Coordinate, R: Area<N> + From<[N;4]>> (align: &Align<E, T>, outer: R, content: R) -> Option<R> { //fn align<E: Engine, T: Content<E>, N: Coordinate, R: Area<N> + From<[N;4]>> (align: &Align<E, T>, outer: R, content: R) -> Option<R> {

46
layout/src/bsp.rs
View file

@ -69,32 +69,32 @@ impl<E: Engine, X: Content<E>, Y: Content<E>> Default for Bsp<E, X, Y> {
} }
impl<E: Engine, X: Content<E>, Y: Content<E>> Content<E> for Bsp<E, X, Y> { impl<E: Engine, X: Content<E>, Y: Content<E>> Content<E> for Bsp<E, X, Y> {
fn area (&self, outer: E::Area) -> E::Area { fn layout (&self, outer: E::Area) -> E::Area {
match self { match self {
Self::Null(_) => [0.into(), 0.into(), 0.into(), 0.into()].into(), Self::Null(_) => [0.into(), 0.into(), 0.into(), 0.into()].into(),
Self::North(_, a, b) => { Self::North(_, a, b) => {
let a = a.area(outer); let a = a.layout(outer);
let b = b.area(North.split_fixed(outer, a.y() + a.h()).1.into()); let b = b.layout(North.split_fixed(outer, a.y() + a.h()).1.into());
[a.x().min(b.x()), a.y().min(b.y()), a.w().max(b.w()), a.h() + b.h()].into() [a.x().min(b.x()), a.y().min(b.y()), a.w().max(b.w()), a.h() + b.h()].into()
} }
Self::South(_, a, b) => { Self::South(_, a, b) => {
let a = a.area(outer); let a = a.layout(outer);
let b = b.area(South.split_fixed(outer, a.y() + a.h()).1.into()); let b = b.layout(South.split_fixed(outer, a.y() + a.h()).1.into());
[a.x().min(b.x()), a.y().min(b.y()), a.w().max(b.w()), a.h() + b.h()].into() [a.x().min(b.x()), a.y().min(b.y()), a.w().max(b.w()), a.h() + b.h()].into()
}, },
Self::East(_, a, b) => { Self::East(_, a, b) => {
let a = a.area(outer); let a = a.layout(outer);
let b = b.area(East.split_fixed(outer, a.x() + a.w()).1.into()); let b = b.layout(East.split_fixed(outer, a.x() + a.w()).1.into());
[a.x().min(b.x()), a.y().min(b.y()), a.w() + b.w(), a.h().max(b.h())].into() [a.x().min(b.x()), a.y().min(b.y()), a.w() + b.w(), a.h().max(b.h())].into()
}, },
Self::West(_, a, b) => { Self::West(_, a, b) => {
let a = a.area(outer); let a = a.layout(outer);
let b = b.area(West.split_fixed(outer, a.x() + a.w()).1.into()); let b = b.layout(West.split_fixed(outer, a.x() + a.w()).1.into());
[a.x().min(b.x()), a.y().min(b.y()), a.w() + b.w(), a.h().max(b.h())].into() [a.x().min(b.x()), a.y().min(b.y()), a.w() + b.w(), a.h().max(b.h())].into()
}, },
Self::Above(a, b) | Self::Below(a, b) => { Self::Above(a, b) | Self::Below(a, b) => {
let a = a.area(outer); let a = a.layout(outer);
let b = b.area(outer); let b = b.layout(outer);
[a.x().min(b.x()), a.y().min(b.y()), a.w().max(b.w()), a.h().max(b.h())].into() [a.x().min(b.x()), a.y().min(b.y()), a.w().max(b.w()), a.h().max(b.h())].into()
} }
} }
@ -103,38 +103,38 @@ impl<E: Engine, X: Content<E>, Y: Content<E>> Content<E> for Bsp<E, X, Y> {
let area = to.area().clone(); let area = to.area().clone();
match self { match self {
Self::North(_, a, b) => { Self::North(_, a, b) => {
let area_a = a.area(area); let area_a = a.layout(area);
let area_b = b.area(North.split_fixed(area, area_a.y() + area_a.h()).1.into()); let area_b = b.layout(North.split_fixed(area, area_a.y() + area_a.h()).1.into());
to.place(area_a, a); to.place(area_a, a);
to.place(area_b, b); to.place(area_b, b);
}, },
Self::South(_, a, b) => { Self::South(_, a, b) => {
let area_a = a.area(area).clone(); let area_a = a.layout(area).clone();
let area_b = b.area(South.split_fixed(area, area_a.y() + area_a.h()).1.into()).clone(); let area_b = b.layout(South.split_fixed(area, area_a.y() + area_a.h()).1.into()).clone();
to.place(area_a, a); to.place(area_a, a);
to.place(area_b, b); to.place(area_b, b);
}, },
Self::East(_, a, b) => { Self::East(_, a, b) => {
let area_a = a.area(area); let area_a = a.layout(area);
let area_b = b.area(East.split_fixed(area, area_a.x() + area_a.w()).1.into()); let area_b = b.layout(East.split_fixed(area, area_a.x() + area_a.w()).1.into());
to.place(area_a, a); to.place(area_a, a);
to.place(area_b, b); to.place(area_b, b);
}, },
Self::West(_, a, b) => { Self::West(_, a, b) => {
let area_a = a.area(area); let area_a = a.layout(area);
let area_b = b.area(West.split_fixed(area, area_a.x() + area_a.w()).1.into()); let area_b = b.layout(West.split_fixed(area, area_a.x() + area_a.w()).1.into());
to.place(area_a, a); to.place(area_a, a);
to.place(area_b, b); to.place(area_b, b);
}, },
Self::Above(a, b) => { Self::Above(a, b) => {
let area_a = a.area(area); let area_a = a.layout(area);
let area_b = b.area(area); let area_b = b.layout(area);
to.place(area_b, b); to.place(area_b, b);
to.place(area_a, a); to.place(area_a, a);
}, },
Self::Below(a, b) => { Self::Below(a, b) => {
let area_a = a.area(area); let area_a = a.layout(area);
let area_b = b.area(area); let area_b = b.layout(area);
to.place(area_a, a); to.place(area_a, a);
to.place(area_b, b); to.place(area_b, b);
}, },

8
layout/src/ops.rs
View file

@ -45,11 +45,11 @@ pub struct Opt<E: Engine, A, F: Fn(A)->R, R: Content<E>>(Option<A>, F, PhantomDa
pub struct When<E: Engine, A>(bool, A, PhantomData<E>); pub struct When<E: Engine, A>(bool, A, PhantomData<E>);
impl<E: Engine, A: Content<E>> Content<E> for When<E, A> { impl<E: Engine, A: Content<E>> Content<E> for When<E, A> {
fn area (&self, to: E::Area) -> E::Area { fn layout (&self, to: E::Area) -> E::Area {
let Self(cond, item, ..) = self; let Self(cond, item, ..) = self;
let mut area = E::Area::zero(); let mut area = E::Area::zero();
if *cond { if *cond {
let item_area = item.area(to); let item_area = item.layout(to);
area[0] = item_area.x(); area[0] = item_area.x();
area[1] = item_area.y(); area[1] = item_area.y();
area[2] = item_area.w(); area[2] = item_area.w();
@ -67,9 +67,9 @@ impl<E: Engine, A: Content<E>> Content<E> for When<E, A> {
pub struct Either<E: Engine, A, B>(bool, A, B, PhantomData<E>); pub struct Either<E: Engine, A, B>(bool, A, B, PhantomData<E>);
impl<E: Engine, A: Content<E>, B: Content<E>> Content<E> for Either<E, A, B> { impl<E: Engine, A: Content<E>, B: Content<E>> Content<E> for Either<E, A, B> {
fn area (&self, to: E::Area) -> E::Area { fn layout (&self, to: E::Area) -> E::Area {
let Self(cond, a, b, ..) = self; let Self(cond, a, b, ..) = self;
if *cond { a.area(to) } else { b.area(to) } if *cond { a.layout(to) } else { b.layout(to) }
} }
fn render (&self, to: &mut E::Output) { fn render (&self, to: &mut E::Output) {
let Self(cond, a, b, ..) = self; let Self(cond, a, b, ..) = self;

4
layout/src/transform_xy.rs
View file

@ -22,7 +22,7 @@ macro_rules! transform_xy {
_ => unreachable!() _ => unreachable!()
} }
} }
fn area (&$self, $to: <E as Engine>::Area) -> <E as Engine>::Area { fn layout (&$self, $to: <E as Engine>::Area) -> <E as Engine>::Area {
$area $area
} }
} }
@ -31,7 +31,7 @@ macro_rules! transform_xy {
transform_xy!(self: Fill |to|{ transform_xy!(self: Fill |to|{
let [x0, y0, wmax, hmax] = to.xywh(); let [x0, y0, wmax, hmax] = to.xywh();
let [x, y, w, h] = Content::area(&self.content(), to).xywh(); let [x, y, w, h] = Content::layout(&self.content(), to).xywh();
return match self { return match self {
Self::X(_) => [x0, y, wmax, h], Self::X(_) => [x0, y, wmax, h],
Self::Y(_) => [x, y0, w, hmax], Self::Y(_) => [x, y0, w, hmax],