vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

gg: improve some loops in draw_rounded_rect* methods (#14195)

tzSharing 2022-04-28 03:57:48 +08:00 committed by Jef Roosens
parent 624f022ddc
commit f9bd107a84
Signed by: Jef Roosens
GPG Key ID: B75D4F293C7052DB
1 changed files with 70 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
vlib/gg/draw.c.v
View File

@ -250,57 +250,47 @@ pub fn (ctx &Context) draw_rounded_rect_empty(x f32, y f32, w f32, h f32, radius
mut dx := f32(0)
mut dy := f32(0)
// left top quarter
sgl.begin_line_strip()
for i in 0 .. 31 {
if r == 0 {
break
if r != 0 {
// left top quarter
sgl.begin_line_strip()
for i in 0 .. 31 {
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(ltx - dx, lty - dy)
}
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(ltx - dx, lty - dy)
}
sgl.end()
sgl.end()
// right top quarter
sgl.begin_line_strip()
for i in 0 .. 31 {
if r == 0 {
break
// right top quarter
sgl.begin_line_strip()
for i in 0 .. 31 {
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(rtx + dx, rty - dy)
}
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(rtx + dx, rty - dy)
}
sgl.end()
sgl.end()
// right bottom quarter
sgl.begin_line_strip()
for i in 0 .. 31 {
if r == 0 {
break
// right bottom quarter
sgl.begin_line_strip()
for i in 0 .. 31 {
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(rbx + dx, rby + dy)
}
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(rbx + dx, rby + dy)
}
sgl.end()
sgl.end()
// left bottom quarter
sgl.begin_line_strip()
for i in 0 .. 31 {
if r == 0 {
break
// left bottom quarter
sgl.begin_line_strip()
for i in 0 .. 31 {
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(lbx - dx, lby + dy)
}
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(lbx - dx, lby + dy)
sgl.end()
}
sgl.end()
// Currently don't use 'gg.draw_line()' directly, it will repeatedly execute '*ctx.scale'.
sgl.begin_lines()
@ -358,61 +348,51 @@ pub fn (ctx &Context) draw_rounded_rect_filled(x f32, y f32, w f32, h f32, radiu
mut dx := f32(0)
mut dy := f32(0)
// left top quarter
sgl.begin_triangle_strip()
for i in 0 .. 31 {
if r == 0 {
break
if r != 0 {
// left top quarter
sgl.begin_triangle_strip()
for i in 0 .. 31 {
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(ltx - dx, lty - dy)
sgl.v2f(ltx, lty)
}
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(ltx - dx, lty - dy)
sgl.v2f(ltx, lty)
}
sgl.end()
sgl.end()
// right top quarter
sgl.begin_triangle_strip()
for i in 0 .. 31 {
if r == 0 {
break
// right top quarter
sgl.begin_triangle_strip()
for i in 0 .. 31 {
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(rtx + dx, rty - dy)
sgl.v2f(rtx, rty)
}
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(rtx + dx, rty - dy)
sgl.v2f(rtx, rty)
}
sgl.end()
sgl.end()
// right bottom quarter
sgl.begin_triangle_strip()
for i in 0 .. 31 {
if r == 0 {
break
// right bottom quarter
sgl.begin_triangle_strip()
for i in 0 .. 31 {
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(rbx + dx, rby + dy)
sgl.v2f(rbx, rby)
}
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(rbx + dx, rby + dy)
sgl.v2f(rbx, rby)
}
sgl.end()
sgl.end()
// left bottom quarter
sgl.begin_triangle_strip()
for i in 0 .. 31 {
if r == 0 {
break
// left bottom quarter
sgl.begin_triangle_strip()
for i in 0 .. 31 {
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(lbx - dx, lby + dy)
sgl.v2f(lbx, lby)
}
rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad)
dy = r * math.sinf(rad)
sgl.v2f(lbx - dx, lby + dy)
sgl.v2f(lbx, lby)
sgl.end()
}
sgl.end()
// Separate drawing is to prevent transparent color overlap
// top rectangle