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

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

@ -250,12 +250,10 @@ pub fn (ctx &Context) draw_rounded_rect_empty(x f32, y f32, w f32, h f32, radius
mut dx := f32(0) mut dx := f32(0)
mut dy := f32(0) mut dy := f32(0)
if r != 0 {
// left top quarter // left top quarter
sgl.begin_line_strip() sgl.begin_line_strip()
for i in 0 .. 31 { for i in 0 .. 31 {
if r == 0 {
break
}
rad = f32(math.radians(i * 3)) rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad) dx = r * math.cosf(rad)
dy = r * math.sinf(rad) dy = r * math.sinf(rad)
@ -266,9 +264,6 @@ pub fn (ctx &Context) draw_rounded_rect_empty(x f32, y f32, w f32, h f32, radius
// right top quarter // right top quarter
sgl.begin_line_strip() sgl.begin_line_strip()
for i in 0 .. 31 { for i in 0 .. 31 {
if r == 0 {
break
}
rad = f32(math.radians(i * 3)) rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad) dx = r * math.cosf(rad)
dy = r * math.sinf(rad) dy = r * math.sinf(rad)
@ -279,9 +274,6 @@ pub fn (ctx &Context) draw_rounded_rect_empty(x f32, y f32, w f32, h f32, radius
// right bottom quarter // right bottom quarter
sgl.begin_line_strip() sgl.begin_line_strip()
for i in 0 .. 31 { for i in 0 .. 31 {
if r == 0 {
break
}
rad = f32(math.radians(i * 3)) rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad) dx = r * math.cosf(rad)
dy = r * math.sinf(rad) dy = r * math.sinf(rad)
@ -292,15 +284,13 @@ pub fn (ctx &Context) draw_rounded_rect_empty(x f32, y f32, w f32, h f32, radius
// left bottom quarter // left bottom quarter
sgl.begin_line_strip() sgl.begin_line_strip()
for i in 0 .. 31 { for i in 0 .. 31 {
if r == 0 {
break
}
rad = f32(math.radians(i * 3)) rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad) dx = r * math.cosf(rad)
dy = r * math.sinf(rad) dy = r * math.sinf(rad)
sgl.v2f(lbx - dx, lby + dy) sgl.v2f(lbx - dx, lby + dy)
} }
sgl.end() sgl.end()
}
// Currently don't use 'gg.draw_line()' directly, it will repeatedly execute '*ctx.scale'. // Currently don't use 'gg.draw_line()' directly, it will repeatedly execute '*ctx.scale'.
sgl.begin_lines() sgl.begin_lines()
@ -358,12 +348,10 @@ pub fn (ctx &Context) draw_rounded_rect_filled(x f32, y f32, w f32, h f32, radiu
mut dx := f32(0) mut dx := f32(0)
mut dy := f32(0) mut dy := f32(0)
if r != 0 {
// left top quarter // left top quarter
sgl.begin_triangle_strip() sgl.begin_triangle_strip()
for i in 0 .. 31 { for i in 0 .. 31 {
if r == 0 {
break
}
rad = f32(math.radians(i * 3)) rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad) dx = r * math.cosf(rad)
dy = r * math.sinf(rad) dy = r * math.sinf(rad)
@ -375,9 +363,6 @@ pub fn (ctx &Context) draw_rounded_rect_filled(x f32, y f32, w f32, h f32, radiu
// right top quarter // right top quarter
sgl.begin_triangle_strip() sgl.begin_triangle_strip()
for i in 0 .. 31 { for i in 0 .. 31 {
if r == 0 {
break
}
rad = f32(math.radians(i * 3)) rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad) dx = r * math.cosf(rad)
dy = r * math.sinf(rad) dy = r * math.sinf(rad)
@ -389,9 +374,6 @@ pub fn (ctx &Context) draw_rounded_rect_filled(x f32, y f32, w f32, h f32, radiu
// right bottom quarter // right bottom quarter
sgl.begin_triangle_strip() sgl.begin_triangle_strip()
for i in 0 .. 31 { for i in 0 .. 31 {
if r == 0 {
break
}
rad = f32(math.radians(i * 3)) rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad) dx = r * math.cosf(rad)
dy = r * math.sinf(rad) dy = r * math.sinf(rad)
@ -403,9 +385,6 @@ pub fn (ctx &Context) draw_rounded_rect_filled(x f32, y f32, w f32, h f32, radiu
// left bottom quarter // left bottom quarter
sgl.begin_triangle_strip() sgl.begin_triangle_strip()
for i in 0 .. 31 { for i in 0 .. 31 {
if r == 0 {
break
}
rad = f32(math.radians(i * 3)) rad = f32(math.radians(i * 3))
dx = r * math.cosf(rad) dx = r * math.cosf(rad)
dy = r * math.sinf(rad) dy = r * math.sinf(rad)
@ -413,6 +392,7 @@ pub fn (ctx &Context) draw_rounded_rect_filled(x f32, y f32, w f32, h f32, radiu
sgl.v2f(lbx, lby) sgl.v2f(lbx, lby)
} }
sgl.end() sgl.end()
}
// Separate drawing is to prevent transparent color overlap // Separate drawing is to prevent transparent color overlap
// top rectangle // top rectangle