patrick
/
zooy
mirror of https://github.com/pcleavelin/zooy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade zig to f571438fc, add grid components

master
Patrick Cleavelin 2023-07-02 17:45:47 -05:00
parent 1d1b4abc8e
commit 0d27a14687
2 changed files with 79 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/components.zig Normal file
View File

@ -0,0 +1,52 @@
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();
try ui.PushStyle(.{ //
.color = raylib.WHITE, //
.text_color = .{ .r = 0x18, .g = 0x90, .b = 0xff, .a = 0xff }, //
.text_size = 10, //
.text_padding = 12, //
});
defer ui.PopStyle();
for (columns) |column| {
try MakeLabel(column, @as(i32, @intCast(columns.len)));
}
}
pub fn MakeButton(label: [:0]const u8, items: i32) !bool {
return try ui.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 MakeGrid(comptime T: type, columns: [][:0]const u8, data: []T, MakeBody: *const fn (data: *const T, size: i32) anyerror!void) !void {
try MakeColumnHeader(columns);
try ui.PushStyle(.{ //
.color = raylib.WHITE, //
.hover_color = raylib.LIGHTGRAY, //
.text_color = raylib.BLACK, //
.text_size = 10, //
.text_padding = 12, //
});
for (data) |item| {
_ = try ui.PushBox("GridItem", .{ .drawBackground = true, .drawBorder = false, .hoverable = true }, .leftToRight, .fitToChildren);
defer ui.PopBox();
try MakeBody(&item, @as(i32, @intCast(columns.len)));
}
defer ui.PopStyle();
}
};

53
src/lib.zig
View File

@ -3,6 +3,7 @@ const std = @import("std");
// TODO: abstract raylib away to allow for consumers to use whatever they want. // TODO: abstract raylib away to allow for consumers to use whatever they want.
// I'm also rexporting here because the zig build system hurts // I'm also rexporting here because the zig build system hurts
pub const raylib = @import("raylib"); pub const raylib = @import("raylib");
pub const components = @import("components.zig");
// TODO: don't just make these public // TODO: don't just make these public
pub var box_allocator: std.mem.Allocator = undefined; pub var box_allocator: std.mem.Allocator = undefined;
@ -76,7 +77,7 @@ pub const UI_Box = struct {
layout: UI_Layout, layout: UI_Layout,
/// the label? /// the label?
label: [:0]const u8, label: [:0]u8,
/// the final computed position and size of this primitive (in pixels) /// the final computed position and size of this primitive (in pixels)
computed_pos: Vec2, computed_pos: Vec2,
@ -121,7 +122,7 @@ fn CountSiblings(box: *UI_Box) u32 {
} }
fn TestBoxHover(box: *UI_Box) bool { fn TestBoxHover(box: *UI_Box) bool {
return @intToFloat(f32, mouse_x) >= box.computed_pos.x and @intToFloat(f32, mouse_x) <= box.computed_pos.x + box.computed_size.x and @intToFloat(f32, mouse_y) >= box.computed_pos.y and @intToFloat(f32, mouse_y) <= box.computed_pos.y + box.computed_size.y; 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 TestBoxClick(box: *UI_Box) bool { fn TestBoxClick(box: *UI_Box) bool {
@ -163,12 +164,12 @@ pub fn MakeBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
current_box = next; current_box = next;
} else { } else {
// Invalid cache, delete next sibling while retaining the following one // 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 }); //std.debug.print("make_box: invalidating cache for '{s}' when making new box '{s}'\n", .{ next.label, label });
const following_sibling = next.next; const following_sibling = next.next;
DeleteBoxChildren(next, false); DeleteBoxChildren(next, false);
next.* = UI_Box{ next.* = UI_Box{
.label = label, .label = @constCast(label),
.flags = flags, .flags = flags,
.direction = direction, .direction = direction,
.style = current_style.getLast(), .style = current_style.getLast(),
@ -190,10 +191,10 @@ pub fn MakeBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
} }
} else { } else {
// No existing cache, create new box // No existing cache, create new box
std.debug.print("make_box: allocating new box: {s}\n", .{label}); //std.debug.print("make_box: allocating new box: {s}\n", .{label});
var new_box = try box_allocator.create(UI_Box); var new_box = try box_allocator.create(UI_Box);
new_box.* = UI_Box{ new_box.* = UI_Box{
.label = label, .label = @constCast(label),
.flags = flags, .flags = flags,
.direction = direction, .direction = direction,
.style = current_style.getLast(), .style = current_style.getLast(),
@ -215,10 +216,10 @@ pub fn MakeBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
} }
} }
} else { } else {
std.debug.print("make_box: allocating new box: {s}\n", .{label}); //std.debug.print("make_box: allocating new box: {s}\n", .{label});
var new_box = try box_allocator.create(UI_Box); var new_box = try box_allocator.create(UI_Box);
new_box.* = UI_Box{ new_box.* = UI_Box{
.label = label, .label = @constCast(label),
.flags = flags, .flags = flags,
.direction = direction, .direction = direction,
.style = current_style.getLast(), .style = current_style.getLast(),
@ -274,12 +275,12 @@ pub fn PushBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
} }
} else { } else {
// Invalid cache // Invalid cache
std.debug.print("push_box: invalidating cache for '{s}' when making new box '{s}'\n", .{ first.label, label }); //std.debug.print("push_box: invalidating cache for '{s}' when making new box '{s}'\n", .{ first.label, label });
const following_sibling = first.next; const following_sibling = first.next;
DeleteBoxChildren(first, false); DeleteBoxChildren(first, false);
first.* = UI_Box{ first.* = UI_Box{
.label = label, .label = @constCast(label),
.flags = flags, .flags = flags,
.direction = direction, .direction = direction,
.style = current_style.getLast(), .style = current_style.getLast(),
@ -300,10 +301,10 @@ pub fn PushBox(label: [:0]const u8, flags: UI_Flags, direction: UI_Direction, la
} }
} }
} else { } else {
std.debug.print("push_box: allocating new box: {s}\n", .{label}); //std.debug.print("push_box: allocating new box: {s}\n", .{label});
var new_box = try box_allocator.create(UI_Box); var new_box = try box_allocator.create(UI_Box);
new_box.* = UI_Box{ new_box.* = UI_Box{
.label = label, .label = @constCast(label),
.flags = flags, .flags = flags,
.direction = direction, .direction = direction,
.style = current_style.getLast(), .style = current_style.getLast(),
@ -483,8 +484,8 @@ pub fn ComputeLayout(box: *UI_Box) Vec2 {
switch (box.layout) { switch (box.layout) {
.fitToText => { .fitToText => {
box.computed_size = Vec2{ box.computed_size = Vec2{
.x = @intToFloat(f32, raylib.MeasureText(box.label, box.style.text_size) + box.style.text_padding * 2), .x = @floatFromInt(raylib.MeasureText(box.label, box.style.text_size) + box.style.text_padding * 2),
.y = @intToFloat(f32, box.style.text_size + box.style.text_padding * 2), .y = @floatFromInt(box.style.text_size + box.style.text_padding * 2),
}; };
_ = ComputeChildrenSize(box); _ = ComputeChildrenSize(box);
@ -525,11 +526,11 @@ pub fn ComputeLayout(box: *UI_Box) Vec2 {
box.computed_size = Vec2{ box.computed_size = Vec2{
.x = switch (p.direction) { // .x = switch (p.direction) { //
.leftToRight => p.computed_size.x * size.x, .leftToRight => p.computed_size.x * size.x,
.topToBottom => p.computed_size.x, //if (total_sibling_size.x == 0) @intToFloat(f32, raylib.MeasureText(box.label, box.style.text_size) + box.style.text_padding * 2) else total_sibling_size.x, .topToBottom => p.computed_size.x, //if (total_sibling_size.x == 0) @floatFromInt(raylib.MeasureText(box.label, box.style.text_size) + box.style.text_padding * 2) else total_sibling_size.x,
.rightToLeft, .bottomToTop => unreachable, .rightToLeft, .bottomToTop => unreachable,
}, },
.y = switch (p.direction) { .y = switch (p.direction) {
.leftToRight => @intToFloat(f32, box.style.text_size + box.style.text_padding * 2), .leftToRight => @floatFromInt(box.style.text_size + box.style.text_padding * 2),
.topToBottom => p.computed_size.y * size.y, .topToBottom => p.computed_size.y * size.y,
.rightToLeft, .bottomToTop => unreachable, .rightToLeft, .bottomToTop => unreachable,
}, },
@ -554,27 +555,27 @@ pub fn DrawUI(box: *UI_Box) void {
const color = if (box.flags.hoverable and is_hovering) box.style.hover_color else box.style.color; const color = if (box.flags.hoverable and is_hovering) box.style.hover_color else box.style.color;
raylib.DrawRectangle( // raylib.DrawRectangle( //
@floatToInt(i32, box.computed_pos.x), // @intFromFloat(box.computed_pos.x), //
@floatToInt(i32, box.computed_pos.y), // @intFromFloat(box.computed_pos.y), //
@floatToInt(i32, box.computed_size.x), // @intFromFloat(box.computed_size.x), //
@floatToInt(i32, box.computed_size.y), // @intFromFloat(box.computed_size.y), //
color // color //
); );
} }
if (box.flags.drawBorder) { if (box.flags.drawBorder) {
raylib.DrawRectangleLines( // raylib.DrawRectangleLines( //
@floatToInt(i32, box.computed_pos.x), // @intFromFloat(box.computed_pos.x), //
@floatToInt(i32, box.computed_pos.y), // @intFromFloat(box.computed_pos.y), //
@floatToInt(i32, box.computed_size.x), // @intFromFloat(box.computed_size.x), //
@floatToInt(i32, box.computed_size.y), // @intFromFloat(box.computed_size.y), //
box.style.border_color // box.style.border_color //
); );
} }
if (box.flags.drawText) { if (box.flags.drawText) {
raylib.DrawText( // raylib.DrawText( //
box.label, // box.label, //
@floatToInt(i32, box.computed_pos.x) + box.style.text_padding, // @as(i32, @intFromFloat(box.computed_pos.x)) + box.style.text_padding, //
@floatToInt(i32, box.computed_pos.y) + box.style.text_padding, // @as(i32, @intFromFloat(box.computed_pos.y)) + box.style.text_padding, //
box.style.text_size, // box.style.text_size, //
box.style.text_color // box.style.text_color //
); );