1 Commits

Author SHA1 Message Date
14435de6a5 bruh 2025-08-10 05:07:17 -04:00
13 changed files with 229 additions and 169 deletions

View File

@@ -1,7 +1,7 @@
[package]
name = "gui"
version = "0.1.0"
edition = "2024"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@@ -1,8 +1,8 @@
use std::ops::Range;
use crate::{
primitive::{Axis, Painter, RoundedRectData, UIRegion},
UIColor, Widget, WidgetArrLike, WidgetFn, WidgetId, WidgetLike,
primitive::{Axis, Painter, RoundedRectData, UIRegion, Vec2},
};
#[derive(Clone, Copy)]
@@ -49,20 +49,22 @@ impl Widget for Span {
}
impl Span {
pub fn proportioned<const LEN: usize>(
pub fn proportioned(
axis: Axis,
ratios: [impl UINum; LEN],
elements: [WidgetId; LEN],
elements: impl IntoIterator<Item = (WidgetId, impl UINum)>,
) -> Self {
let ratios = ratios.map(|r| r.to_f32());
let total: f32 = ratios.iter().sum();
let mut start = -1.0;
// TODO: update
let elements = elements
.into_iter()
.map(|(w, r)| (w, r.to_f32()))
.collect::<Vec<_>>();
let total: f32 = elements.iter().map(|(_, r)| r).sum();
let mut start = 0.0;
Self {
elements: elements
.into_iter()
.zip(ratios)
.map(|(e, r)| {
let end = start + (r / total) * 2.0;
let end = start + r / total;
let res = (start..end, e);
start = end;
res
@@ -117,34 +119,26 @@ impl<T: UINum> From<T> for Padding {
}
}
pub trait WidgetUtil {
pub trait WidgetUtil<W> {
fn pad(self, padding: impl Into<Padding>) -> impl WidgetLike<Widget = Regioned>;
fn center(self, size: impl Into<Vec2>) -> impl WidgetLike<Widget = Regioned>;
}
impl<W: WidgetLike> WidgetUtil for W {
impl<W: WidgetLike> WidgetUtil<W::Widget> for W {
fn pad(self, padding: impl Into<Padding>) -> impl WidgetLike<Widget = Regioned> {
WidgetFn(|ui| Regioned {
region: padding.into().region(),
inner: self.add(ui).erase_type(),
})
}
fn center(self, size: impl Into<Vec2>) -> impl WidgetLike<Widget = Regioned> {
WidgetFn(|ui| Regioned {
region: UIRegion::center(size.into()),
inner: self.add(ui).erase_type(),
inner: self.id(ui).erase_type(),
})
}
}
pub trait WidgetArrUtil<const LEN: usize> {
fn span(self, axis: Axis, ratios: [impl UINum; LEN]) -> impl WidgetLike<Widget = Span>;
pub trait WidgetArrUtil<Wa: WidgetArrLike> {
fn span(self, axis: Axis, ratios: [impl UINum; Wa::LEN]) -> impl WidgetLike<Widget = Span>;
}
impl<const LEN: usize, Wa: WidgetArrLike<LEN>> WidgetArrUtil<LEN> for Wa {
fn span(self, axis: Axis, ratios: [impl UINum; LEN]) -> impl WidgetLike<Widget = Span> {
WidgetFn(move |ui| Span::proportioned(axis, ratios, self.ui(ui).arr))
impl<Wa: WidgetArrLike> WidgetArrUtil<Wa> for Wa {
fn span(self, axis: Axis, ratios: [impl UINum; Wa::LEN]) -> impl WidgetLike<Widget = Span> {
WidgetFn(move |ui| Span::proportioned(axis, self.ui(ui).ids().into_iter().zip(ratios)))
}
}

View File

@@ -31,23 +31,19 @@ impl From<UI> for UIBuilder {
}
impl UIBuilder {
pub fn add<W: Widget>(&mut self, w: impl WidgetLike<Widget = W>) -> WidgetRef<W> {
WidgetRef::new([w.add(self).erase_type()])
pub fn add<W: Widget>(&mut self, w: W) -> WidgetRef<W> {
WidgetRef::new(self.clone(), (self.push(w), ()))
}
pub fn add_widget<W: Widget>(&mut self, w: W) -> WidgetRef<W> {
WidgetRef::new([self.push(w)])
}
pub fn push<W: Widget>(&mut self, w: W) -> WidgetId {
pub fn push<W: Widget>(&mut self, w: W) -> WidgetId<W> {
let mut ui = self.ui.borrow_mut();
let id = ui.ids.next();
ui.widgets.insert(id.duplicate(), w);
WidgetId::new(id, TypeId::of::<W>())
}
pub fn finish<W: WidgetLike>(mut self, base: W) -> UI {
let base = base.add(&mut self).erase_type();
pub fn finish<WL: WidgetLike>(mut self, base: WL) -> UI {
let base = base.id(&mut self).erase_type();
let mut ui = Rc::into_inner(self.ui).unwrap().into_inner();
ui.base = Some(base);
ui

View File

@@ -3,7 +3,11 @@ use std::{
marker::PhantomData,
};
use crate::{primitive::Painter, util::ID, UIBuilder};
use crate::{
primitive::Painter,
util::{IntoTupleList, TupleList, ID},
UIBuilder,
};
pub trait Widget: 'static + Any {
fn draw(&self, painter: &mut Painter);
@@ -15,10 +19,8 @@ impl<W: Widget> Widget for (W,) {
}
}
pub struct AnyWidget;
#[derive(Eq, Hash, PartialEq, Debug)]
pub struct WidgetId<W = AnyWidget> {
pub struct WidgetId<W = ()> {
pub(super) ty: TypeId,
pub(super) id: ID,
_pd: PhantomData<W>,
@@ -27,7 +29,11 @@ pub struct WidgetId<W = AnyWidget> {
// TODO: temp
impl<W> Clone for WidgetId<W> {
fn clone(&self) -> Self {
Self::new(self.id.duplicate(), self.ty)
Self {
ty: self.ty,
id: self.id.duplicate(),
_pd: self._pd,
}
}
}
@@ -39,7 +45,7 @@ impl<W> WidgetId<W> {
_pd: PhantomData,
}
}
pub fn erase_type(self) -> WidgetId<AnyWidget> {
pub fn erase_type(self) -> WidgetId<()> {
self.cast_type()
}
@@ -54,7 +60,7 @@ impl<W> WidgetId<W> {
pub trait WidgetLike {
type Widget;
fn add(self, ui: &mut UIBuilder) -> WidgetId<Self::Widget>;
fn id(self, ui: &mut UIBuilder) -> WidgetId<Self::Widget>;
}
/// wouldn't be needed if negative trait bounds & disjoint impls existed
@@ -62,98 +68,119 @@ pub struct WidgetFn<F: FnOnce(&mut UIBuilder) -> W, W>(pub F);
impl<W: Widget, F: FnOnce(&mut UIBuilder) -> W> WidgetLike for WidgetFn<F, W> {
type Widget = W;
fn add(self, ui: &mut UIBuilder) -> WidgetId<W> {
fn id(self, ui: &mut UIBuilder) -> WidgetId<W> {
let w = (self.0)(ui);
ui.add_widget(w).to_id()
ui.add(w).to_id()
}
}
impl<W: Widget> WidgetLike for W {
type Widget = W;
fn add(self, ui: &mut UIBuilder) -> WidgetId<W> {
ui.add_widget(self).to_id()
fn id(self, ui: &mut UIBuilder) -> WidgetId<W> {
ui.add(self).to_id()
}
}
impl<W> WidgetLike for WidgetId<W> {
type Widget = W;
fn add(self, _: &mut UIBuilder) -> WidgetId<W> {
fn id(self, _: &mut UIBuilder) -> WidgetId<W> {
self
}
}
impl<W> WidgetLike for WidgetArr<1, (W,)> {
type Widget = W;
fn add(self, _: &mut UIBuilder) -> WidgetId<W> {
let [id] = self.arr;
id.cast_type()
pub struct WidgetArr<Ws: WidgetList> {
pub ui: UIBuilder,
pub arr: Ws::Ids,
}
impl<Ws: WidgetList> WidgetArr<Ws> {
pub fn new(ui: UIBuilder, arr: Ws::Ids) -> Self {
Self { ui, arr }
}
pub fn ids(self) -> Vec<WidgetId> {
self.arr.all()
}
}
pub struct WidgetArr<const LEN: usize, Ws> {
pub arr: [WidgetId; LEN],
_pd: PhantomData<Ws>,
}
impl<const LEN: usize, Ws> WidgetArr<LEN, Ws> {
pub fn new(arr: [WidgetId; LEN]) -> Self {
Self {
arr,
_pd: PhantomData,
}
}
}
pub type WidgetRef<W> = WidgetArr<1, (W,)>;
pub type WidgetRef<W> = WidgetArr<(W, ())>;
impl<W> WidgetRef<W> {
pub fn handle(&self) -> WidgetId<W> {
let [id] = &self.arr;
id.clone().cast_type()
self.arr.head().clone()
}
pub fn to_id(self) -> WidgetId<W> {
let [id] = self.arr;
id.cast_type()
self.arr.into_head()
}
}
pub trait WidgetArrLike<const LEN: usize> {
type Ws;
fn ui(self, ui: &mut UIBuilder) -> WidgetArr<LEN, Self::Ws>;
impl<W> WidgetLike for WidgetRef<W> {
type Widget = W;
fn id(self, _: &mut UIBuilder) -> WidgetId<W> {
self.arr.into_head()
}
}
impl<const LEN: usize, Ws> WidgetArrLike<LEN> for WidgetArr<LEN, Ws> {
pub trait WidgetArrLike {
const LEN: usize;
type Ws: WidgetList;
fn ui(self, ui: &mut UIBuilder) -> WidgetArr<Self::Ws>;
}
impl<Ws: WidgetList> WidgetArrLike for WidgetArr<Ws> {
const LEN: usize = Ws::LEN;
type Ws = Ws;
fn ui(self, _: &mut UIBuilder) -> WidgetArr<LEN, Ws> {
fn ui(self, _: &mut UIBuilder) -> WidgetArr<Ws> {
self
}
}
// I hate this language it's so bad why do I even use it
macro_rules! impl_widget_arr {
($n:expr;$($T:tt)*) => {
impl<$($T: WidgetLike,)*> WidgetArrLike<$n> for ($($T,)*) {
type Ws = ($($T::Widget,)*);
fn ui(self, ui: &mut UIBuilder) -> WidgetArr<$n, ($($T::Widget,)*)> {
#[allow(non_snake_case)]
let ($($T,)*) = self;
WidgetArr::new(
[$($T.add(ui).cast_type(),)*],
)
}
}
};
impl<W: WidgetLike> WidgetArrLike for (W, ())
where
Self: TupleList,
{
const LEN: usize = <Self as TupleList>::LEN;
type Ws = (W::Widget, ());
fn ui(self, ui: &mut UIBuilder) -> WidgetArr<(W::Widget, ())> {
WidgetArr::new(ui.clone(), (self.0.id(ui), ()))
}
}
impl<W: WidgetLike, T: WidgetArrLike> WidgetArrLike for (W, T)
where
Self: TupleList,
{
const LEN: usize = <Self as TupleList>::LEN;
type Ws = (W::Widget, T::Ws);
fn ui(self, ui: &mut UIBuilder) -> WidgetArr<(W::Widget, T::Ws)> {
WidgetArr::new(ui.clone(), (self.0.id(ui), self.1.ui(ui).arr))
}
}
impl_widget_arr!(1;A);
impl_widget_arr!(2;A B);
impl_widget_arr!(3;A B C);
impl_widget_arr!(4;A B C D);
impl_widget_arr!(5;A B C D E);
impl_widget_arr!(6;A B C D E F);
impl_widget_arr!(7;A B C D E F G);
impl_widget_arr!(8;A B C D E F G H);
impl_widget_arr!(9;A B C D E F G H I);
impl_widget_arr!(10;A B C D E F G H I J);
impl_widget_arr!(11;A B C D E F G H I J K);
impl_widget_arr!(12;A B C D E F G H I J K L);
pub trait WidgetList: TupleList {
type Ids: IdList;
}
impl<H> WidgetList for (H, ()) {
type Ids = (WidgetId<H>, ());
}
impl<H, T: WidgetList> WidgetList for (H, T) {
type Ids = (WidgetId<H>, T::Ids);
}
pub trait IdList: TupleList {
fn iter(self) -> impl Iterator<Item = WidgetId>;
fn all(self) -> Vec<WidgetId>
where
Self: Sized,
{
self.iter().collect::<Vec<_>>()
}
}
impl<H> IdList for (WidgetId<H>, ()) {
fn iter(self) -> impl Iterator<Item = WidgetId> {
core::iter::once(self.0.erase_type())
}
}
impl<H, T: IdList> IdList for (WidgetId<H>, T) {
fn iter(self) -> impl Iterator<Item = WidgetId> {
core::iter::once(self.0.erase_type()).chain(self.1.iter())
}
}

View File

@@ -3,10 +3,11 @@
#![feature(const_trait_impl)]
#![feature(const_from)]
#![feature(trait_alias)]
#![feature(generic_const_exprs)]
mod layout;
mod render;
mod util;
pub mod util;
mod base;
pub use layout::*;

View File

@@ -30,10 +30,6 @@ impl<T: ColorNum> Color<T> {
pub const fn rgb(r: T, g: T, b: T) -> Self {
Self { r, g, b, a: T::MAX }
}
pub fn alpha(mut self, a: T) -> Self {
self.a = a;
self
}
}
pub trait ColorNum {

View File

@@ -1,10 +1,10 @@
use crate::primitive::{Vec2, vec2::point};
use crate::primitive::{point::point, Point};
#[repr(C)]
#[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable, Default)]
#[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable, Default)]
pub struct UIPos {
pub anchor: Vec2,
pub offset: Vec2,
pub anchor: Point,
pub offset: Point,
}
impl UIPos {
@@ -15,32 +15,24 @@ impl UIPos {
}
}
pub const fn center() -> Self {
Self::anchor_offset(0.0, 0.0, 0.0, 0.0)
}
pub const fn top_left() -> Self {
Self::anchor_offset(-1.0, -1.0, 0.0, 0.0)
Self::anchor_offset(0.0, 0.0, 0.0, 0.0)
}
pub const fn bottom_right() -> Self {
Self::anchor_offset(1.0, 1.0, 0.0, 0.0)
}
pub const fn offset(mut self, offset: Vec2) -> Self {
self.offset = offset;
self
}
pub const fn within(&self, region: &UIRegion) -> UIPos {
let lerp = self.anchor_01();
let anchor = region.top_left.anchor.lerp(region.bot_right.anchor, lerp);
let offset = self.offset + region.top_left.offset.lerp(region.bot_right.offset, lerp);
UIPos { anchor, offset }
}
pub const fn anchor_01(&self) -> Vec2 {
(self.anchor + 1.0) / 2.0
let range = region.bot_right.anchor - region.top_left.anchor;
let region_offset = region
.top_left
.offset
.lerp(region.bot_right.offset, self.anchor);
UIPos {
anchor: region.top_left.anchor + self.anchor * range,
offset: self.offset + region_offset,
}
}
pub fn axis_mut(&mut self, axis: Axis) -> UIPosAxisView<'_> {
@@ -76,12 +68,6 @@ impl UIRegion {
bot_right: UIPos::bottom_right(),
}
}
pub fn center(size: Vec2) -> Self {
Self {
top_left: UIPos::center().offset(-size / 2.0),
bot_right: UIPos::center().offset(size / 2.0),
}
}
pub fn within(&self, parent: &Self) -> Self {
Self {
top_left: self.top_left.within(parent),

View File

@@ -1,12 +1,12 @@
mod color;
mod def;
mod format;
mod vec2;
mod point;
pub use color::*;
pub use def::*;
pub use format::*;
pub use vec2::*;
pub use point::*;
use crate::{render::data::PrimitiveInstance, WidgetId, Widgets};
use bytemuck::Pod;

View File

@@ -1,17 +1,17 @@
use std::ops::*;
#[repr(C)]
#[derive(Debug, Clone, Copy, PartialEq, Default, bytemuck::Pod, bytemuck::Zeroable)]
pub struct Vec2 {
#[derive(Clone, Copy, PartialEq, Default, bytemuck::Pod, bytemuck::Zeroable)]
pub struct Point {
pub x: f32,
pub y: f32,
}
pub const fn point(x: f32, y: f32) -> Vec2 {
Vec2::new(x, y)
pub const fn point(x: f32, y: f32) -> Point {
Point::new(x, y)
}
impl Vec2 {
impl Point {
pub const fn new(x: f32, y: f32) -> Self {
Self { x, y }
}
@@ -29,7 +29,7 @@ const fn lerp(x: f32, y: f32, amt: f32) -> f32 {
(1.0 - amt) * x + y * amt
}
impl const From<f32> for Vec2 {
impl const From<f32> for Point {
fn from(v: f32) -> Self {
Self { x: v, y: v }
}
@@ -37,7 +37,7 @@ impl const From<f32> for Vec2 {
macro_rules! impl_op_inner {
($op:ident $fn:ident $opa:ident $fna:ident) => {
impl const $op for Vec2 {
impl const $op for Point {
type Output = Self;
fn $fn(self, rhs: Self) -> Self::Output {
@@ -47,13 +47,13 @@ macro_rules! impl_op_inner {
}
}
}
impl $opa for Vec2 {
impl $opa for Point {
fn $fna(&mut self, rhs: Self) {
self.x.$fna(rhs.x);
self.y.$fna(rhs.y);
}
}
impl const $op<f32> for Vec2 {
impl const $op<f32> for Point {
type Output = Self;
fn $fn(self, rhs: f32) -> Self::Output {
@@ -63,7 +63,7 @@ macro_rules! impl_op_inner {
}
}
}
impl $opa<f32> for Vec2 {
impl $opa<f32> for Point {
fn $fna(&mut self, rhs: f32) {
self.x.$fna(rhs);
self.y.$fna(rhs);
@@ -82,19 +82,3 @@ impl_op!(Add add);
impl_op!(Sub sub);
impl_op!(Mul mul);
impl_op!(Div div);
impl Neg for Vec2 {
type Output = Self;
fn neg(mut self) -> Self::Output {
self.x = -self.x;
self.y = -self.y;
self
}
}
impl From<(f32, f32)> for Vec2 {
fn from((x, y): (f32, f32)) -> Self {
Self { x, y }
}
}

View File

@@ -42,8 +42,8 @@ fn vs_main(
) -> VertexOutput {
var out: VertexOutput;
let top_left = (in.top_left_anchor + 1.0) / 2.0 * window.dim + in.top_left_offset;
let bot_right = (in.bottom_right_anchor + 1.0) / 2.0 * window.dim + in.bottom_right_offset;
let top_left = in.top_left_anchor * window.dim + in.top_left_offset;
let bot_right = in.bottom_right_anchor * window.dim + in.bottom_right_offset;
let size = bot_right - top_left;
var pos = top_left + vec2<f32>(

View File

@@ -1,7 +1,8 @@
use gui::util::IntoTupleList;
use std::sync::Arc;
use app::App;
use gui::{RoundedRect, UI, UIColor, WidgetArrUtil, WidgetUtil, primitive::Axis};
use gui::{primitive::Axis, RoundedRect, UIColor, WidgetArrUtil, WidgetUtil, UI};
use render::Renderer;
use winit::{event::WindowEvent, event_loop::ActiveEventLoop, window::Window};
@@ -33,24 +34,27 @@ impl Client {
(
blue,
(
rect.color(UIColor::RED).center((100.0, 100.0)),
rect.color(UIColor::RED),
(
rect.color(UIColor::ORANGE),
rect.color(UIColor::LIME).pad(10.0),
)
.span(Axis::Y, [1, 1]),
.into_list()
.span(Axis::Y, [1, 1].into()),
rect.color(UIColor::YELLOW),
)
.into_list()
.span(Axis::X, [2, 2, 1])
.pad(10),
)
.into_list()
.span(Axis::X, [1, 3]),
rect.color(UIColor::GREEN),
)
.into_list()
.span(Axis::Y, [3, 1])
.pad(10),
);
// let mut ui = ui.finish((blue, rect.color(UIColor::RED)).span(Axis::X, [1, 1]));
ui.widgets.get_mut(&handle).unwrap().color = UIColor::MAGENTA;
renderer.update(&ui);
Self { renderer }

View File

@@ -1,3 +1,5 @@
mod id;
mod tuple;
pub use id::*;
pub use tuple::*;

70
src/util/tuple.rs Normal file
View File

@@ -0,0 +1,70 @@
pub trait TupleList {
const LEN: usize;
type Head;
type Tail;
fn into_head(self) -> Self::Head;
fn head(&self) -> &Self::Head;
fn split(self) -> (Self::Head, Self::Tail);
}
impl TupleList for () {
const LEN: usize = 0;
type Head = ();
type Tail = ();
fn head(&self) -> &Self::Head {
&()
}
fn into_head(self) -> Self::Head {}
fn split(self) -> (Self::Head, Self::Tail) {
((), ())
}
}
impl<T, Rest: TupleList> TupleList for (T, Rest) {
const LEN: usize = Rest::LEN + 1;
type Head = T;
type Tail = Rest;
fn head(&self) -> &Self::Head {
&self.0
}
fn into_head(self) -> Self::Head {
self.0
}
fn split(self) -> (Self::Head, Self::Tail) {
(self.0, self.1)
}
}
pub trait IntoTupleList {
type List;
fn into_list(self) -> Self::List;
}
impl IntoTupleList for () {
type List = ();
fn into_list(self) -> Self::List {}
}
macro_rules! impl_tuple {
($H:tt $($T:tt)*) => {
impl<$H, $($T,)*> IntoTupleList for ($H, $($T,)*) {
type List = ($H, <($($T,)*) as IntoTupleList>::List);
fn into_list(self) -> Self::List {
#[allow(non_snake_case)]
let ($H, $($T,)*) = self;
($H, ($($T,)*).into_list())
}
}
};
}
impl_tuple!(A);
impl_tuple!(A B);
impl_tuple!(A B C);
impl_tuple!(A B C D);
impl_tuple!(A B C D E);
impl_tuple!(A B C D E F);
impl_tuple!(A B C D E F G);
impl_tuple!(A B C D E F G H);
impl_tuple!(A B C D E F G H I);
impl_tuple!(A B C D E F G H I J);
impl_tuple!(A B C D E F G H I J K);
impl_tuple!(A B C D E F G H I J K L);