mirror of https://github.com/pcleavelin/zooy
LOTS OF STUFF
* Move all global variables to UI_Context struct * Add string formatting to API * Allocate formatted (and const too, gross) strings via a frame allocator * Add higher level Grid component still lots of jank and built-in assumptionsmaster
parent
8e7a5bb3a8
commit
ad8ddae790
|
|
@ -3,45 +3,58 @@ const ui = @import("lib.zig");
|
|||
const raylib = ui.raylib;
|
||||
|
||||
pub const Grid = struct {
|
||||
fn MakeColumnHeader(columns: [][:0]const u8) !void {
|
||||
_ = try ui.PushBox("GridColumnHeader", .{ .drawBackground = true, .drawBorder = false }, .leftToRight, .fitToChildren);
|
||||
defer ui.PopBox();
|
||||
fn MakeColumnHeader(ctx: *ui.UIContext, columns: [][]const u8) !void {
|
||||
_ = try ctx.PushBox("GridColumnHeader", .{ .drawBackground = true, .drawBorder = false }, .leftToRight, .fitToChildren);
|
||||
defer ctx.PopBox();
|
||||
|
||||
try ui.PushStyle(.{ //
|
||||
try ctx.PushStyle(.{ //
|
||||
.color = raylib.WHITE, //
|
||||
.text_color = .{ .r = 0x18, .g = 0x90, .b = 0xff, .a = 0xff }, //
|
||||
.text_size = 12, //
|
||||
.text_padding = 12, //
|
||||
});
|
||||
defer ui.PopStyle();
|
||||
defer ctx.PopStyle();
|
||||
|
||||
for (columns) |column| {
|
||||
try MakeLabel(column, @as(i32, @intCast(columns.len)));
|
||||
try MakeLabel(ctx, column, @as(i32, @intCast(columns.len)));
|
||||
}
|
||||
}
|
||||
|
||||
pub fn MakeButton(label: [:0]const u8, items: i32) !bool {
|
||||
return try ui.MakeBox(label, .{
|
||||
pub fn MakeButton(ctx: *ui.UIContext, label: []const u8, items: i32) !bool {
|
||||
return try ctx.MakeBox(label, .{
|
||||
.clickable = true,
|
||||
.drawText = true,
|
||||
}, .leftToRight, .{ .percentOfParent = ui.Vec2{ .x = 1.0 / @as(f32, @floatFromInt(items)), .y = 1.0 } });
|
||||
}
|
||||
|
||||
pub fn MakeLabel(label: [:0]const u8, items: i32) !void {
|
||||
_ = try ui.MakeLabelWithLayout(label, .{ .percentOfParent = ui.Vec2{ .x = 1.0 / @as(f32, @floatFromInt(items)), .y = 1.0 } });
|
||||
pub fn MakeFormattedLabel(ctx: *ui.UIContext, comptime str: []const u8, args: anytype, items: i32) !void {
|
||||
_ = try ctx.MakeFormattedLabelWithLayout(str, args, .{ .percentOfParent = ui.Vec2{ .x = 1.0 / @as(f32, @floatFromInt(items)), .y = 1.0 } });
|
||||
}
|
||||
|
||||
pub fn MakeGrid(comptime T: type, columns: [][:0]const u8, data: []T, MakeBody: *const fn (data: *const T, size: i32) anyerror!void) !void {
|
||||
_ = try ui.PushBox("GridContainer", .{ .drawBackground = true }, .topToBottom, .fill);
|
||||
defer ui.PopBox();
|
||||
pub fn MakeLabel(ctx: *ui.UIContext, label: []const u8, items: i32) !void {
|
||||
_ = try ctx.MakeLabelWithLayout(label, .{ .percentOfParent = ui.Vec2{ .x = 1.0 / @as(f32, @floatFromInt(items)), .y = 1.0 } });
|
||||
}
|
||||
|
||||
try MakeColumnHeader(columns);
|
||||
pub fn MakeGrid(ctx: *ui.UIContext, comptime T: type, columns: [][]const u8, data: []T, MakeBody: *const fn (ctx: *ui.UIContext, data: *const T, size: i32) anyerror!void) !void {
|
||||
_ = try ctx.PushBox("GridContainer", .{ .drawBackground = true }, .topToBottom, .fill);
|
||||
defer ctx.PopBox();
|
||||
|
||||
try MakeColumnHeader(ctx, columns);
|
||||
|
||||
{
|
||||
_ = try ui.PushBox("Grid", .{ .drawBackground = true, .scrollable = true }, .topToBottom, .fill);
|
||||
defer ui.PopBox();
|
||||
try ctx.PushStyle(.{ //
|
||||
.color = raylib.WHITE, //
|
||||
.hover_color = .{ .r = 0x1a, .g = 0x7c, .b = 0xd3, .a = 0xff }, //
|
||||
.text_color = raylib.BLACK, //
|
||||
.text_size = 12, //
|
||||
.text_padding = 12, //
|
||||
});
|
||||
defer ctx.PopStyle();
|
||||
|
||||
try ui.PushStyle(.{ //
|
||||
_ = try ctx.PushBox("Grid", .{ .drawBackground = true, .scrollable = true }, .topToBottom, .fill);
|
||||
defer ctx.PopBox();
|
||||
|
||||
try ctx.PushStyle(.{ //
|
||||
.color = raylib.WHITE, //
|
||||
.hover_color = raylib.LIGHTGRAY, //
|
||||
.text_color = raylib.BLACK, //
|
||||
|
|
@ -49,12 +62,12 @@ pub const Grid = struct {
|
|||
.text_padding = 12, //
|
||||
});
|
||||
for (data) |item| {
|
||||
_ = try ui.PushBox("GridItem", .{ .drawBackground = true, .drawBorder = false, .hoverable = true }, .leftToRight, .fitToChildren);
|
||||
defer ui.PopBox();
|
||||
_ = try ctx.PushBox("GridItem", .{ .drawBackground = true, .drawBorder = false, .hoverable = true }, .leftToRight, .fitToChildren);
|
||||
defer ctx.PopBox();
|
||||
|
||||
try MakeBody(&item, @as(i32, @intCast(columns.len)));
|
||||
try MakeBody(ctx, &item, @as(i32, @intCast(columns.len)));
|
||||
}
|
||||
defer ui.PopStyle();
|
||||
ctx.PopStyle();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
515
src/lib.zig
515
src/lib.zig
|
|
@ -5,102 +5,81 @@ const std = @import("std");
|
|||
pub const raylib = @import("raylib");
|
||||
pub const components = @import("components.zig");
|
||||
|
||||
// TODO: don't just make these public
|
||||
pub var box_allocator: std.mem.Allocator = undefined;
|
||||
|
||||
pub var root_box: ?*UI_Box = null;
|
||||
pub var current_box: ?*UI_Box = null;
|
||||
pub var current_style: std.ArrayList(UI_Style) = undefined;
|
||||
|
||||
pub var pushing_box: bool = false;
|
||||
pub var popping_box: bool = false;
|
||||
|
||||
// PLEASE DON'T DO THIS
|
||||
pub var font20: raylib.Font = undefined;
|
||||
pub var font10: raylib.Font = undefined;
|
||||
|
||||
pub var mouse_x: i32 = 0;
|
||||
pub var mouse_y: i32 = 0;
|
||||
// TODO: do this better
|
||||
pub var mouse_scroll: f32 = 0;
|
||||
pub var mouse_released: bool = false;
|
||||
pub var mouse_hovering_clickable: bool = false;
|
||||
|
||||
pub const UIContext = struct {
|
||||
const Self = @This();
|
||||
const scroll_speed: f32 = 1.125;
|
||||
|
||||
pub const UI_Flags = packed struct(u6) {
|
||||
clickable: bool = false,
|
||||
hoverable: bool = false,
|
||||
scrollable: bool = false,
|
||||
drawText: bool = false,
|
||||
drawBorder: bool = false,
|
||||
drawBackground: bool = false,
|
||||
box_allocator: std.mem.Allocator,
|
||||
|
||||
// Double-buffered allocator to hold per-frame heap-data
|
||||
current_frame_allocator: usize = 0,
|
||||
frame_allocators: [2]std.heap.ArenaAllocator,
|
||||
|
||||
root_box: ?*UI_Box = null,
|
||||
current_box: ?*UI_Box = null,
|
||||
current_style: std.ArrayList(UI_Style) = undefined,
|
||||
|
||||
hot: ?*UI_Box = null,
|
||||
active: ?*UI_Box = null,
|
||||
|
||||
pushing_box: bool = false,
|
||||
popping_box: bool = false,
|
||||
|
||||
// PLEASE DON'T DO THIS
|
||||
font20: raylib.Font = undefined,
|
||||
font10: raylib.Font = undefined,
|
||||
|
||||
// TODO: do this better
|
||||
mouse_x: i32 = 0,
|
||||
mouse_y: i32 = 0,
|
||||
mouse_scroll: f32 = 0,
|
||||
mouse_released: bool = false,
|
||||
mouse_hovering_clickable: bool = false,
|
||||
|
||||
pub fn init(allocator: std.mem.Allocator, font20: raylib.Font, font10: raylib.Font) Self {
|
||||
return .{
|
||||
.box_allocator = allocator,
|
||||
.frame_allocators = .{
|
||||
std.heap.ArenaAllocator.init(allocator),
|
||||
std.heap.ArenaAllocator.init(allocator),
|
||||
},
|
||||
.current_style = std.ArrayList(UI_Style).init(allocator),
|
||||
.font20 = font20,
|
||||
.font10 = font10,
|
||||
};
|
||||
}
|
||||
|
||||
pub const UI_Layout = union(enum) {
|
||||
fitToText,
|
||||
fitToChildren,
|
||||
fill,
|
||||
percentOfParent: Vec2,
|
||||
exactSize: Vec2,
|
||||
};
|
||||
fn frame_allocator(self: *Self) std.mem.Allocator {
|
||||
return self.frame_allocators[self.current_frame_allocator].allocator();
|
||||
}
|
||||
|
||||
pub const UI_Direction = enum {
|
||||
leftToRight,
|
||||
rightToLeft,
|
||||
topToBottom,
|
||||
bottomToTop,
|
||||
};
|
||||
fn swap_frame_allocators(self: *Self) void {
|
||||
self.current_frame_allocator = (self.current_frame_allocator + 1) % self.frame_allocators.len;
|
||||
}
|
||||
|
||||
// TODO: don't couple to raylib
|
||||
pub const UI_Style = struct {
|
||||
color: raylib.Color = raylib.LIGHTGRAY,
|
||||
hover_color: raylib.Color = raylib.WHITE,
|
||||
border_color: raylib.Color = raylib.DARKGRAY,
|
||||
pub fn NewFrame(self: *Self, width: i32, height: i32, mouse_x: i32, mouse_y: i32, mouse_scroll: f32, mouse_released: bool) !void {
|
||||
self.current_box = self.root_box;
|
||||
self.pushing_box = false;
|
||||
self.popping_box = false;
|
||||
self.mouse_hovering_clickable = false;
|
||||
self.current_style.clearRetainingCapacity();
|
||||
// TODO: really shouldn't be necessary?
|
||||
try self.current_style.append(.{});
|
||||
|
||||
text_color: raylib.Color = raylib.BLACK,
|
||||
text_size: i32 = 20,
|
||||
text_padding: i32 = 8,
|
||||
};
|
||||
if (self.root_box) |box| {
|
||||
box.computed_size.x = @floatFromInt(width);
|
||||
box.computed_size.y = @floatFromInt(height);
|
||||
}
|
||||
|
||||
pub const Vec2 = struct {
|
||||
x: f32,
|
||||
y: f32,
|
||||
};
|
||||
self.mouse_x = mouse_x;
|
||||
self.mouse_y = mouse_y;
|
||||
self.mouse_scroll = mouse_scroll;
|
||||
self.mouse_released = mouse_released;
|
||||
|
||||
pub const UI_Box = struct {
|
||||
/// the first child
|
||||
first: ?*UI_Box,
|
||||
last: ?*UI_Box,
|
||||
|
||||
/// the next sibling
|
||||
next: ?*UI_Box,
|
||||
prev: ?*UI_Box,
|
||||
|
||||
parent: ?*UI_Box,
|
||||
|
||||
/// the assigned features
|
||||
flags: UI_Flags,
|
||||
direction: UI_Direction,
|
||||
style: UI_Style,
|
||||
layout: UI_Layout,
|
||||
|
||||
/// the label
|
||||
label: [:0]u8,
|
||||
|
||||
/// the final computed position and size of this primitive (in pixels)
|
||||
computed_pos: Vec2,
|
||||
computed_size: Vec2,
|
||||
|
||||
// whether or not this primitive is currently being interacted with
|
||||
active: bool = false,
|
||||
// whether or not this primitive is *about* to be interacted with
|
||||
hot: bool = false,
|
||||
|
||||
// specific scrollable settings
|
||||
scroll_fract: f32 = 0,
|
||||
scroll_top: ?*UI_Box = null,
|
||||
};
|
||||
//std.debug.print("frame allocator[0] capacity: {d} - ", .{self.frame_allocators[0].queryCapacity()});
|
||||
//std.debug.print("frame allocator[1] capacity: {d}\n", .{self.frame_allocators[1].queryCapacity()});
|
||||
_ = self.frame_allocators[self.current_frame_allocator].reset(.{ .retain_with_limit = 500_000 });
|
||||
}
|
||||
|
||||
fn CountChildren(box: *UI_Box) u32 {
|
||||
var count: u32 = 0;
|
||||
|
|
@ -139,23 +118,23 @@ fn CountSiblings(box: *UI_Box) u32 {
|
|||
return count;
|
||||
}
|
||||
|
||||
fn TestBoxHover(box: *UI_Box) bool {
|
||||
return @as(f32, @floatFromInt(mouse_x)) >= box.computed_pos.x and @as(f32, @floatFromInt(mouse_x)) <= box.computed_pos.x + box.computed_size.x and @as(f32, @floatFromInt(mouse_y)) >= box.computed_pos.y and @as(f32, @floatFromInt(mouse_y)) <= box.computed_pos.y + box.computed_size.y;
|
||||
fn TestBoxHover(self: *Self, box: *UI_Box) bool {
|
||||
return @as(f32, @floatFromInt(self.mouse_x)) >= box.computed_pos.x and @as(f32, @floatFromInt(self.mouse_x)) <= box.computed_pos.x + box.computed_size.x and @as(f32, @floatFromInt(self.mouse_y)) >= box.computed_pos.y and @as(f32, @floatFromInt(self.mouse_y)) <= box.computed_pos.y + box.computed_size.y;
|
||||
}
|
||||
|
||||
fn TestBoxClick(box: *UI_Box) bool {
|
||||
return mouse_released and TestBoxHover(box);
|
||||
fn TestBoxClick(self: *Self, box: *UI_Box) bool {
|
||||
return self.mouse_released and self.TestBoxHover(box);
|
||||
}
|
||||
|
||||
fn ScrollBox(box: *UI_Box) void {
|
||||
if (TestBoxHover(box)) {
|
||||
fn ScrollBox(self: *Self, box: *UI_Box) void {
|
||||
if (self.TestBoxHover(box)) {
|
||||
if (box.scroll_top == null) {
|
||||
box.scroll_top = box.first;
|
||||
}
|
||||
|
||||
if (box.scroll_top) |top| {
|
||||
if ((mouse_scroll > 0 and top.prev != null) or (mouse_scroll < 0 and top.next != null) or box.scroll_fract != 0) {
|
||||
box.scroll_fract -= mouse_scroll * scroll_speed;
|
||||
if ((self.mouse_scroll > 0 and top.prev != null) or (self.mouse_scroll < 0 and top.next != null) or box.scroll_fract != 0) {
|
||||
box.scroll_fract -= self.mouse_scroll * scroll_speed;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -196,50 +175,76 @@ fn ScrollBox(box: *UI_Box) void {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn DeleteBoxChildren(box: *UI_Box, should_destroy: bool) void {
|
||||
if (box.first) |child| {
|
||||
DeleteBoxChildren(child, true);
|
||||
} else if (should_destroy) {
|
||||
box_allocator.destroy(box);
|
||||
fn TestBoxInteraction(self: *Self, box: *UI_Box) bool {
|
||||
if (box.flags.clickable) {
|
||||
return self.TestBoxClick(box);
|
||||
}
|
||||
if (box.flags.scrollable) {
|
||||
self.ScrollBox(box);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
pub fn DeleteBoxChildren(self: *Self, box: *UI_Box, should_destroy: bool) void {
|
||||
var child = box.first;
|
||||
while (child) |c| {
|
||||
child = c.next;
|
||||
self.DeleteBoxChildren(c, true);
|
||||
}
|
||||
|
||||
if (should_destroy) {
|
||||
self.box_allocator.destroy(box);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn MakeBox(self: *Self, str: []const u8, flags: UI_Flags, direction: UI_Direction, layout: UI_Layout) anyerror!bool {
|
||||
const label = try std.fmt.allocPrintZ(self.frame_allocator(), "{s}", .{str});
|
||||
return try self._MakeBox(label, flags, direction, layout);
|
||||
}
|
||||
|
||||
pub fn PushBox(self: *Self, str: []const u8, flags: UI_Flags, direction: UI_Direction, layout: UI_Layout) anyerror!bool {
|
||||
const label = try std.fmt.allocPrintZ(self.frame_allocator(), "{s}", .{str});
|
||||
return try self._PushBox(label, flags, direction, layout);
|
||||
}
|
||||
|
||||
// TODO: remove all footguns by compressing code
|
||||
pub fn MakeBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, layout: UI_Layout) anyerror!bool {
|
||||
fn _MakeBox(self: *Self, label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, layout: UI_Layout) anyerror!bool {
|
||||
//std.debug.print("making box '{s}'...", .{label});
|
||||
|
||||
// TODO: Please remove this state machine, there should be a way to do it without it
|
||||
popping_box = false;
|
||||
self.popping_box = false;
|
||||
|
||||
if (pushing_box) {
|
||||
const box = try PushBox(label, flags, direction, layout);
|
||||
pushing_box = false;
|
||||
if (self.pushing_box) {
|
||||
const box = try self._PushBox(label, flags, direction, layout);
|
||||
self.pushing_box = false;
|
||||
|
||||
return box;
|
||||
}
|
||||
|
||||
if (current_box) |box| {
|
||||
if (self.current_box) |box| {
|
||||
if (box.next) |next| {
|
||||
// Attempt to re-use cache
|
||||
if (std.mem.eql(u8, next.label, label)) {
|
||||
//std.debug.print("using cache for '{s}'\n", .{next.label});
|
||||
next.flags = flags;
|
||||
next.direction = direction;
|
||||
next.label = @constCast(label);
|
||||
if (next.parent) |parent| {
|
||||
parent.last = next;
|
||||
}
|
||||
current_box = next;
|
||||
self.current_box = next;
|
||||
} else {
|
||||
// Invalid cache, delete next sibling while retaining the following one
|
||||
//std.debug.print("make_box: invalidating cache for '{s}' when making new box '{s}'\n", .{ next.label, label });
|
||||
const following_sibling = next.next;
|
||||
DeleteBoxChildren(next, false);
|
||||
self.DeleteBoxChildren(next, false);
|
||||
|
||||
next.* = UI_Box{
|
||||
.label = @constCast(label),
|
||||
.flags = flags,
|
||||
.direction = direction,
|
||||
.style = current_style.getLast(),
|
||||
.style = self.current_style.getLast(),
|
||||
.layout = layout,
|
||||
|
||||
.first = null,
|
||||
|
|
@ -251,7 +256,7 @@ pub fn MakeBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
|
|||
.computed_size = Vec2{ .x = 0, .y = 0 },
|
||||
};
|
||||
|
||||
current_box = next;
|
||||
self.current_box = next;
|
||||
if (next.parent) |parent| {
|
||||
parent.last = next;
|
||||
}
|
||||
|
|
@ -259,12 +264,12 @@ pub fn MakeBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
|
|||
} else {
|
||||
// No existing cache, create new box
|
||||
//std.debug.print("make_box: allocating new box: {s}\n", .{label});
|
||||
var new_box = try box_allocator.create(UI_Box);
|
||||
var new_box = try self.box_allocator.create(UI_Box);
|
||||
new_box.* = UI_Box{
|
||||
.label = @constCast(label),
|
||||
.flags = flags,
|
||||
.direction = direction,
|
||||
.style = current_style.getLast(),
|
||||
.style = self.current_style.getLast(),
|
||||
.layout = layout,
|
||||
|
||||
.first = null,
|
||||
|
|
@ -277,19 +282,19 @@ pub fn MakeBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
|
|||
};
|
||||
|
||||
box.next = new_box;
|
||||
current_box = new_box;
|
||||
self.current_box = new_box;
|
||||
if (new_box.parent) |parent| {
|
||||
parent.last = new_box;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
//std.debug.print("make_box: allocating new box: {s}\n", .{label});
|
||||
var new_box = try box_allocator.create(UI_Box);
|
||||
var new_box = try self.box_allocator.create(UI_Box);
|
||||
new_box.* = UI_Box{
|
||||
.label = @constCast(label),
|
||||
.flags = flags,
|
||||
.direction = direction,
|
||||
.style = current_style.getLast(),
|
||||
.style = self.current_style.getLast(),
|
||||
.layout = layout,
|
||||
|
||||
.first = null,
|
||||
|
|
@ -301,36 +306,31 @@ pub fn MakeBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
|
|||
.computed_size = Vec2{ .x = 0, .y = 0 },
|
||||
};
|
||||
|
||||
current_box = new_box;
|
||||
self.current_box = new_box;
|
||||
}
|
||||
|
||||
if (current_box) |box| {
|
||||
if (box.flags.clickable) {
|
||||
return TestBoxClick(box);
|
||||
}
|
||||
if (box.flags.scrollable) {
|
||||
ScrollBox(box);
|
||||
}
|
||||
if (self.current_box) |box| {
|
||||
return self.TestBoxInteraction(box);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
pub fn PushBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, layout: UI_Layout) anyerror!bool {
|
||||
pub fn _PushBox(self: *Self, label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, layout: UI_Layout) anyerror!bool {
|
||||
//std.debug.print("pushing box '{s}'...", .{label});
|
||||
|
||||
// TODO: Please remove this state machine, there should be a way to do it without it
|
||||
if (popping_box) {
|
||||
const box = try MakeBox(label, flags, direction, layout);
|
||||
pushing_box = true;
|
||||
if (self.popping_box) {
|
||||
const box = try self._MakeBox(label, flags, direction, layout);
|
||||
self.pushing_box = true;
|
||||
|
||||
return box;
|
||||
}
|
||||
if (!pushing_box) {
|
||||
pushing_box = true;
|
||||
if (!self.pushing_box) {
|
||||
self.pushing_box = true;
|
||||
}
|
||||
|
||||
if (current_box) |box| {
|
||||
if (self.current_box) |box| {
|
||||
// Attempt to re-use cache
|
||||
if (box.first) |first| {
|
||||
// check if the same
|
||||
|
|
@ -338,7 +338,8 @@ pub fn PushBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
|
|||
//std.debug.print("using cache for '{s}'\n", .{first.label});
|
||||
first.flags = flags;
|
||||
first.direction = direction;
|
||||
current_box = first;
|
||||
first.label = @constCast(label);
|
||||
self.current_box = first;
|
||||
|
||||
if (first.parent) |parent| {
|
||||
parent.last = first;
|
||||
|
|
@ -347,96 +348,96 @@ pub fn PushBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
|
|||
// Invalid cache
|
||||
//std.debug.print("push_box: invalidating cache for '{s}' when making new box '{s}'\n", .{ first.label, label });
|
||||
const following_sibling = first.next;
|
||||
DeleteBoxChildren(first, false);
|
||||
self.DeleteBoxChildren(first, false);
|
||||
|
||||
first.* = UI_Box{
|
||||
.label = @constCast(label),
|
||||
.flags = flags,
|
||||
.direction = direction,
|
||||
.style = current_style.getLast(),
|
||||
.style = self.current_style.getLast(),
|
||||
.layout = layout,
|
||||
|
||||
.first = null,
|
||||
.last = null,
|
||||
.next = following_sibling,
|
||||
.prev = null,
|
||||
.parent = current_box,
|
||||
.parent = self.current_box,
|
||||
.computed_pos = Vec2{ .x = 0, .y = 0 },
|
||||
.computed_size = Vec2{ .x = 0, .y = 0 },
|
||||
};
|
||||
|
||||
current_box = first;
|
||||
self.current_box = first;
|
||||
if (first.parent) |parent| {
|
||||
parent.last = first;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
//std.debug.print("push_box: allocating new box: {s}\n", .{label});
|
||||
var new_box = try box_allocator.create(UI_Box);
|
||||
var new_box = try self.box_allocator.create(UI_Box);
|
||||
new_box.* = UI_Box{
|
||||
.label = @constCast(label),
|
||||
.flags = flags,
|
||||
.direction = direction,
|
||||
.style = current_style.getLast(),
|
||||
.style = self.current_style.getLast(),
|
||||
.layout = layout,
|
||||
|
||||
.first = null,
|
||||
.last = null,
|
||||
.next = null,
|
||||
.prev = null,
|
||||
.parent = current_box,
|
||||
.parent = self.current_box,
|
||||
.computed_pos = Vec2{ .x = 0, .y = 0 },
|
||||
.computed_size = Vec2{ .x = 0, .y = 0 },
|
||||
};
|
||||
|
||||
box.first = new_box;
|
||||
current_box = new_box;
|
||||
self.current_box = new_box;
|
||||
if (new_box.parent) |parent| {
|
||||
parent.last = new_box;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
pushing_box = false;
|
||||
return try MakeBox(label, flags, direction, layout);
|
||||
self.pushing_box = false;
|
||||
return try self._MakeBox(label, flags, direction, layout);
|
||||
}
|
||||
|
||||
if (current_box) |box| {
|
||||
if (box.flags.clickable) {
|
||||
return TestBoxClick(box);
|
||||
}
|
||||
if (self.current_box) |box| {
|
||||
return self.TestBoxInteraction(box);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
pub fn PopBox() void {
|
||||
pub fn PopBox(self: *Self) void {
|
||||
//std.debug.print("popping box...", .{});
|
||||
if (current_box) |box| {
|
||||
if (self.current_box) |box| {
|
||||
//if (box.parent) |parent| {
|
||||
//current_box = parent.last;
|
||||
//return;
|
||||
//}
|
||||
if (box.parent) |p| {
|
||||
p.last = current_box;
|
||||
p.last = self.current_box;
|
||||
}
|
||||
current_box = box.parent;
|
||||
popping_box = true;
|
||||
self.current_box = box.parent;
|
||||
self.popping_box = true;
|
||||
return;
|
||||
}
|
||||
|
||||
//std.debug.print("couldn't pop box\n", .{});
|
||||
}
|
||||
|
||||
pub fn PushStyle(style: UI_Style) !void {
|
||||
try current_style.append(style);
|
||||
pub fn PushStyle(self: *Self, style: UI_Style) !void {
|
||||
try self.current_style.append(style);
|
||||
}
|
||||
|
||||
pub fn PopStyle() void {
|
||||
_ = current_style.popOrNull();
|
||||
pub fn PopStyle(self: *Self) void {
|
||||
_ = self.current_style.popOrNull();
|
||||
}
|
||||
|
||||
pub fn MakeButtonWithLayout(label: [:0]const u8, layout: UI_Layout) !bool {
|
||||
return try MakeBox(label, .{
|
||||
pub fn MakeButtonWithLayout(self: *Self, str: []const u8, layout: UI_Layout) !bool {
|
||||
// TODO: replace with frame allocator
|
||||
const label = try std.fmt.allocPrintZ(self.frame_allocator(), "{s}", .{str});
|
||||
return try self._MakeBox(label, .{
|
||||
.clickable = true,
|
||||
.hoverable = true,
|
||||
.drawText = true,
|
||||
|
|
@ -444,18 +445,36 @@ pub fn MakeButtonWithLayout(label: [:0]const u8, layout: UI_Layout) !bool {
|
|||
}, .leftToRight, layout);
|
||||
}
|
||||
|
||||
pub fn MakeButton(label: [:0]const u8) !bool {
|
||||
return try MakeButtonWithLayout(label, .fitToText);
|
||||
pub fn MakeButton(self: *Self, label: []const u8) !bool {
|
||||
return try self.MakeButtonWithLayout(label, .fitToText);
|
||||
}
|
||||
|
||||
pub fn MakeLabelWithLayout(label: [:0]const u8, layout: UI_Layout) !void {
|
||||
_ = try MakeBox(label, .{
|
||||
pub fn MakeFormattedLabelWithLayout(self: *Self, comptime str: []const u8, args: anytype, layout: UI_Layout) !void {
|
||||
// TODO: replace with frame allocator
|
||||
const label = try std.fmt.allocPrintZ(self.frame_allocator(), str, args);
|
||||
_ = try self._MakeBox(label, .{
|
||||
.drawText = true,
|
||||
}, .leftToRight, layout);
|
||||
}
|
||||
|
||||
pub fn MakeLabel(label: [:0]const u8) !void {
|
||||
_ = try MakeLabelWithLayout(label, .fitToText);
|
||||
pub fn MakeLabelWithLayout(self: *Self, str: []const u8, layout: UI_Layout) !void {
|
||||
// TODO: replace with frame allocator
|
||||
const label = try std.fmt.allocPrintZ(self.frame_allocator(), "{s}", .{str});
|
||||
_ = try self._MakeBox(label, .{
|
||||
.drawText = true,
|
||||
}, .leftToRight, layout);
|
||||
}
|
||||
|
||||
pub fn MakeLabelInt(self: *Self, value: anytype) !void {
|
||||
// TODO: replace with frame allocator
|
||||
const label = try std.fmt.allocPrintZ(self.frame_allocator(), "{d}", .{value});
|
||||
_ = try self.MakeLabelWithLayout(label, .fitToText);
|
||||
}
|
||||
|
||||
pub fn MakeLabel(self: *Self, str: []const u8) !void {
|
||||
// TODO: replace with frame allocator
|
||||
const label = try std.fmt.allocPrintZ(self.frame_allocator(), "{s}", .{str});
|
||||
_ = try self.MakeLabelWithLayout(label, .fitToText);
|
||||
}
|
||||
|
||||
fn ComputeChildrenSize(box: *UI_Box) Vec2 {
|
||||
|
|
@ -503,10 +522,12 @@ fn ComputeSiblingSize(box: *UI_Box) Vec2 {
|
|||
// get siblings size so we know to big to get
|
||||
var total_sibling_size = Vec2{ .x = 0, .y = 0 };
|
||||
var n = box.next;
|
||||
|
||||
const direction = if (box.parent) |p| p.direction else box.direction;
|
||||
while (n) |next| {
|
||||
const sibling_size = ComputeLayout(next);
|
||||
|
||||
switch (box.direction) {
|
||||
switch (direction) {
|
||||
.leftToRight => {
|
||||
total_sibling_size.x += sibling_size.x;
|
||||
if (sibling_size.y > total_sibling_size.y) {
|
||||
|
|
@ -571,23 +592,30 @@ pub fn ComputeLayout(box: *UI_Box) Vec2 {
|
|||
},
|
||||
.fill => {
|
||||
const total_sibling_size = ComputeSiblingSize(box);
|
||||
|
||||
if (box.parent) |p| {
|
||||
if (p.layout == .fitToChildren) {
|
||||
//box.layout = .fitToText;
|
||||
}
|
||||
|
||||
if (std.mem.eql(u8, "GridContainer", box.label)) {
|
||||
const calculated_size = p.computed_size.y - total_sibling_size.y - (box.computed_pos.y - p.computed_pos.y);
|
||||
std.debug.print("Grid sibling size: {d}, {d}, '{s}'_height: {d}, calculated height: {d}\n", .{ total_sibling_size.x, total_sibling_size.y, p.label, p.computed_size.y, calculated_size });
|
||||
}
|
||||
|
||||
box.computed_size = Vec2{
|
||||
.x = switch (p.direction) {
|
||||
.leftToRight => p.computed_size.x - total_sibling_size.x - box.computed_pos.x,
|
||||
.leftToRight => p.computed_size.x - total_sibling_size.x - (box.computed_pos.x - p.computed_pos.x),
|
||||
.topToBottom => if (total_sibling_size.x == 0) p.computed_size.x else total_sibling_size.x,
|
||||
//.topToBottom => 0, //p.computed_size.x,
|
||||
.rightToLeft, .bottomToTop => unreachable,
|
||||
},
|
||||
.y = switch (p.direction) {
|
||||
.leftToRight => if (total_sibling_size.y == 0) p.computed_size.y else total_sibling_size.y,
|
||||
.topToBottom => p.computed_size.y - total_sibling_size.y - box.computed_pos.y,
|
||||
//.leftToRight => 0, //p.computed_size.y,
|
||||
.topToBottom => p.computed_size.y - total_sibling_size.y - (box.computed_pos.y - p.computed_pos.y),
|
||||
.rightToLeft, .bottomToTop => unreachable,
|
||||
},
|
||||
};
|
||||
} else {
|
||||
// TODO: somehow need to get these values
|
||||
//box.computed_size = Vec2{ .x = 1280, .y = 720 };
|
||||
}
|
||||
|
||||
//_ = ComputeChildrenSize(box);
|
||||
|
|
@ -615,7 +643,30 @@ pub fn ComputeLayout(box: *UI_Box) Vec2 {
|
|||
//_ = ComputeChildrenSize(box);
|
||||
break :blk true;
|
||||
},
|
||||
.exactSize => |_| unreachable,
|
||||
.exactSize => |size| {
|
||||
box.computed_size = size;
|
||||
break :blk true;
|
||||
},
|
||||
.floating => |layout| {
|
||||
box.computed_pos = .{ .x = 0, .y = 0 };
|
||||
switch (layout) {
|
||||
.fitToText => {
|
||||
box.computed_size = Vec2{
|
||||
.x = @floatFromInt(raylib.MeasureText(box.label, box.style.text_size) + box.style.text_padding * 2),
|
||||
.y = @floatFromInt(box.style.text_size + box.style.text_padding * 2),
|
||||
};
|
||||
},
|
||||
.fitToChildren => {
|
||||
box.computed_size = ComputeChildrenSize(box);
|
||||
},
|
||||
.exactSize => |size| {
|
||||
box.computed_size = size;
|
||||
},
|
||||
}
|
||||
_ = ComputeChildrenSize(box);
|
||||
|
||||
return .{ .x = 0, .y = 0 };
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -640,17 +691,25 @@ pub fn ComputeLayout(box: *UI_Box) Vec2 {
|
|||
return box.computed_size;
|
||||
}
|
||||
|
||||
pub fn DrawUI(box: *UI_Box) void {
|
||||
const is_hovering = TestBoxHover(box);
|
||||
pub fn DrawUI(self: *Self, box: *UI_Box) void {
|
||||
const is_hovering = self.TestBoxHover(box);
|
||||
if (box.flags.clickable and is_hovering) {
|
||||
mouse_hovering_clickable = true;
|
||||
self.mouse_hovering_clickable = true;
|
||||
}
|
||||
|
||||
const pos_x: i32 = @intFromFloat(box.computed_pos.x);
|
||||
const pos_y: i32 = @intFromFloat(box.computed_pos.y);
|
||||
const size_x: i32 = @intFromFloat(box.computed_size.x);
|
||||
const size_y: i32 = @intFromFloat(box.computed_size.y);
|
||||
|
||||
if (box.layout != .floating) {
|
||||
if (box.parent) |p| {
|
||||
const parent_pos_x: i32 = @intFromFloat(p.computed_pos.x);
|
||||
const parent_pos_y: i32 = @intFromFloat(p.computed_pos.y);
|
||||
const parent_size_x: i32 = @intFromFloat(p.computed_size.x);
|
||||
const parent_size_y: i32 = @intFromFloat(p.computed_size.y);
|
||||
|
||||
raylib.BeginScissorMode(parent_pos_x, parent_pos_y, parent_size_x, parent_size_y);
|
||||
}
|
||||
}
|
||||
if (box.flags.drawBackground) {
|
||||
const color = if (box.flags.hoverable and is_hovering) box.style.hover_color else box.style.color;
|
||||
|
||||
|
|
@ -682,7 +741,7 @@ pub fn DrawUI(box: *UI_Box) void {
|
|||
}
|
||||
}
|
||||
raylib.DrawTextEx( //
|
||||
if (box.style.text_size == 20) font20 else if (box.style.text_size == 12) font10 else font10, //
|
||||
if (box.style.text_size == 20) self.font20 else if (box.style.text_size == 12) self.font10 else self.font10, //
|
||||
box.label, //
|
||||
.{
|
||||
.x = box.computed_pos.x + @as(f32, @floatFromInt(box.style.text_padding)), //
|
||||
|
|
@ -692,6 +751,11 @@ pub fn DrawUI(box: *UI_Box) void {
|
|||
1.0, color //
|
||||
);
|
||||
}
|
||||
if (box.layout != .floating) {
|
||||
if (box.parent) |_| {
|
||||
raylib.EndScissorMode();
|
||||
}
|
||||
}
|
||||
|
||||
// draw children
|
||||
const children = CountChildren(box);
|
||||
|
|
@ -708,9 +772,8 @@ pub fn DrawUI(box: *UI_Box) void {
|
|||
|
||||
var child_size: f32 = 0;
|
||||
// TODO: replace with non-raylib function, also figure out why this doesn't clip text drawn with `DrawText`
|
||||
raylib.BeginScissorMode(pos_x, pos_y, size_x, size_y);
|
||||
while (child) |c| {
|
||||
DrawUI(c);
|
||||
self.DrawUI(c);
|
||||
|
||||
if (child == box.last) break;
|
||||
|
||||
|
|
@ -719,19 +782,109 @@ pub fn DrawUI(box: *UI_Box) void {
|
|||
.leftToRight => {
|
||||
child_size += c.computed_size.x;
|
||||
// TODO: don't multiply this by two, use the last child size or something
|
||||
if (child_size > box.computed_size.x * 2) break;
|
||||
if (child_size > box.computed_size.x + c.computed_size.x) break;
|
||||
},
|
||||
.rightToLeft, .bottomToTop => unreachable,
|
||||
.topToBottom => {
|
||||
child_size += c.computed_size.y;
|
||||
// TODO: don't multiply this by two, use the last child size or something
|
||||
if (child_size > box.computed_size.y * 2) break;
|
||||
if (child_size > box.computed_size.y + c.computed_size.y) break;
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
child = c.next;
|
||||
}
|
||||
raylib.EndScissorMode();
|
||||
}
|
||||
}
|
||||
|
||||
pub fn Draw(self: *Self) void {
|
||||
if (self.root_box) |box| {
|
||||
_ = ComputeLayout(box);
|
||||
self.DrawUI(box);
|
||||
}
|
||||
|
||||
self.swap_frame_allocators();
|
||||
}
|
||||
};
|
||||
|
||||
pub const UI_Flags = packed struct {
|
||||
clickable: bool = false,
|
||||
hoverable: bool = false,
|
||||
scrollable: bool = false,
|
||||
drawText: bool = false,
|
||||
drawBorder: bool = false,
|
||||
drawBackground: bool = false,
|
||||
};
|
||||
|
||||
pub const FloatingLayout = union(enum) {
|
||||
fitToText,
|
||||
fitToChildren,
|
||||
exactSize: Vec2,
|
||||
};
|
||||
|
||||
pub const UI_Layout = union(enum) {
|
||||
fitToText,
|
||||
fitToChildren,
|
||||
fill,
|
||||
percentOfParent: Vec2,
|
||||
exactSize: Vec2,
|
||||
floating: FloatingLayout,
|
||||
};
|
||||
|
||||
pub const UI_Direction = enum {
|
||||
leftToRight,
|
||||
rightToLeft,
|
||||
topToBottom,
|
||||
bottomToTop,
|
||||
};
|
||||
|
||||
// TODO: don't couple to raylib
|
||||
pub const UI_Style = struct {
|
||||
color: raylib.Color = raylib.LIGHTGRAY,
|
||||
hover_color: raylib.Color = raylib.WHITE,
|
||||
border_color: raylib.Color = raylib.DARKGRAY,
|
||||
|
||||
text_color: raylib.Color = raylib.BLACK,
|
||||
text_size: i32 = 20,
|
||||
text_padding: i32 = 8,
|
||||
};
|
||||
|
||||
pub const Vec2 = struct {
|
||||
x: f32,
|
||||
y: f32,
|
||||
};
|
||||
|
||||
pub const UI_Box = struct {
|
||||
/// the first child
|
||||
first: ?*UI_Box,
|
||||
last: ?*UI_Box,
|
||||
|
||||
/// the next sibling
|
||||
next: ?*UI_Box,
|
||||
prev: ?*UI_Box,
|
||||
|
||||
parent: ?*UI_Box,
|
||||
|
||||
/// the assigned features
|
||||
flags: UI_Flags,
|
||||
direction: UI_Direction,
|
||||
style: UI_Style,
|
||||
layout: UI_Layout,
|
||||
|
||||
/// the label
|
||||
label: [:0]u8,
|
||||
|
||||
/// the final computed position and size of this primitive (in pixels)
|
||||
computed_pos: Vec2,
|
||||
computed_size: Vec2,
|
||||
|
||||
// whether or not this primitive is currently being interacted with
|
||||
//active: bool = false,
|
||||
// whether or not this primitive is *about* to be interacted with
|
||||
//hot: bool = false,
|
||||
|
||||
// specific scrollable settings
|
||||
scroll_fract: f32 = 0,
|
||||
scroll_top: ?*UI_Box = null,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue