voxel/hUI
voxel/hUI
1
1
Fork 0
mirror of https://github.com/griffi-gh/hUI.git synced 2024-11-26 00:48:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

aaa

Browse source
This commit is contained in:
griffi-gh 2024-03-05 23:47:40 +01:00
parent d1588932e5
commit e7edd98d41
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hui/src/draw.rs
View file

@ -142,6 +142,8 @@ impl UiDrawCall {
let vidx = draw_call.vertices.len() as u32; let vidx = draw_call.vertices.len() as u32;
if let Some(corner) = rounded_corners.filter(|x| x.radius.max_f32() > 0.0) { if let Some(corner) = rounded_corners.filter(|x| x.radius.max_f32() > 0.0) {
//this code is stupid as fuck //this code is stupid as fuck
//but it works... i think?
//maybe some verts end up missing, but it's close enough...
//Random vert in the center for no reason //Random vert in the center for no reason
//lol //lol
@ -158,8 +160,8 @@ impl UiDrawCall {
let angle = cratio * std::f32::consts::PI * 0.5; let angle = cratio * std::f32::consts::PI * 0.5;
let x = angle.sin(); let x = angle.sin();
let y = angle.cos(); let y = angle.cos();
//Top-right corner
let mut corner_impl = |rp: Vec2, color: &Corners<Vec4>, uv: Vec2| { let mut corner_impl = |rp: Vec2, color: &Corners<Vec4>| {
//TODO: also calculate proper uv //TODO: also calculate proper uv
let rrp = rp / *size; let rrp = rp / *size;
let color_at_point = let color_at_point =
@ -167,35 +169,39 @@ impl UiDrawCall {
color.top_right * rrp.x * (1. - rrp.y) + color.top_right * rrp.x * (1. - rrp.y) +
color.bottom_left * (1. - rrp.x) * rrp.y + color.bottom_left * (1. - rrp.x) * rrp.y +
color.top_left * (1. - rrp.x) * (1. - rrp.y); color.top_left * (1. - rrp.x) * (1. - rrp.y);
let uv_at_point =
uvs.bottom_right * rrp.x * rrp.y +
uvs.top_right * rrp.x * (1. - rrp.y) +
uvs.bottom_left * (1. - rrp.x) * rrp.y +
uvs.top_left * (1. - rrp.x) * (1. - rrp.y);
draw_call.vertices.push(UiVertex { draw_call.vertices.push(UiVertex {
position: *position + rp, position: *position + rp,
color: color_at_point, color: color_at_point,
uv, uv: uv_at_point,
}); });
}; };
//Top-right corner
corner_impl( corner_impl(
vec2(x, 1. - y) * corner.radius.top_right + vec2(size.x - corner.radius.top_right, 0.), vec2(x, 1. - y) * corner.radius.top_right + vec2(size.x - corner.radius.top_right, 0.),
color, color,
uvs.top_right,
); );
//Bottom-right corner //Bottom-right corner
corner_impl( corner_impl(
vec2(x - 1., y) * corner.radius.bottom_right + vec2(size.x, size.y - corner.radius.bottom_right), vec2(x - 1., y) * corner.radius.bottom_right + vec2(size.x, size.y - corner.radius.bottom_right),
color, color,
uvs.bottom_right,
); );
//Bottom-left corner //Bottom-left corner
corner_impl( corner_impl(
vec2(1. - x, y) * corner.radius.bottom_left + vec2(0., size.y - corner.radius.bottom_left), vec2(1. - x, y) * corner.radius.bottom_left + vec2(0., size.y - corner.radius.bottom_left),
color, color,
uvs.bottom_left,
); );
//Top-left corner //Top-left corner
corner_impl( corner_impl(
vec2(1. - x, 1. - y) * corner.radius.top_left, vec2(1. - x, 1. - y) * corner.radius.top_left,
color, color,
uvs.top_left,
); );
// mental illness: // mental illness:
if i > 0 { if i > 0 {
draw_call.indices.extend([ draw_call.indices.extend([
@ -239,6 +245,7 @@ impl UiDrawCall {
vidx + 2, vidx + 2,
]); ]);
} else { } else {
//...Normal rectangle
draw_call.indices.extend([vidx, vidx + 1, vidx + 2, vidx, vidx + 2, vidx + 3]); draw_call.indices.extend([vidx, vidx + 1, vidx + 2, vidx, vidx + 2, vidx + 3]);
draw_call.vertices.extend([ draw_call.vertices.extend([
UiVertex { UiVertex {