From 8745ab1ffffc18340ce4ea5c1a37c8fcea130937 Mon Sep 17 00:00:00 2001 From: Linklancien <123779978+Linklancien@users.noreply.github.com> Date: Mon, 19 Jan 2026 10:15:16 +0100 Subject: [PATCH] gg: cleanup some testdata and add a new sample draw_rounded_rect_filled.vv (#26389) --- vlib/gg/testdata/draw_arcs.vv | 27 ++++------ vlib/gg/testdata/draw_circles.vv | 33 ++++++------ vlib/gg/testdata/draw_polygons.vv | 33 ++++++------ vlib/gg/testdata/draw_rounded_rect_empty.vv | 53 +++++++++----------- vlib/gg/testdata/draw_rounded_rect_filled.vv | 28 +++++++++++ vlib/gg/testdata/draw_simple_polygons.vv | 16 +++--- 6 files changed, 99 insertions(+), 91 deletions(-) create mode 100644 vlib/gg/testdata/draw_rounded_rect_filled.vv diff --git a/vlib/gg/testdata/draw_arcs.vv b/vlib/gg/testdata/draw_arcs.vv index 65741d30c..7e1d4503f 100644 --- a/vlib/gg/testdata/draw_arcs.vv +++ b/vlib/gg/testdata/draw_arcs.vv @@ -3,19 +3,14 @@ module main import math import gg -fn main() { - mut context := gg.new_context( - width: 200 - height: 200 - window_title: 'Arcs' - frame_fn: frame - ) - context.run() -} - -fn frame(mut ctx gg.Context) { - ctx.begin() - ctx.draw_arc_filled(100, 100, 35, 45, 0, f32(math.radians(290)), 30, gg.red) - ctx.draw_arc_empty(100, 100, 30, 50, 0, f32(math.radians(290)), 30, gg.white) - ctx.end() -} +gg.start( + window_title: 'Arcs' + width: 200 + height: 200 + frame_fn: fn (mut ctx gg.Context) { + ctx.begin() + ctx.draw_arc_filled(100, 100, 35, 45, 0, f32(math.radians(290)), 30, gg.red) + ctx.draw_arc_empty(100, 100, 30, 50, 0, f32(math.radians(290)), 30, gg.white) + ctx.end() + } +) diff --git a/vlib/gg/testdata/draw_circles.vv b/vlib/gg/testdata/draw_circles.vv index 8bd93265b..f5f1c80bb 100644 --- a/vlib/gg/testdata/draw_circles.vv +++ b/vlib/gg/testdata/draw_circles.vv @@ -2,22 +2,17 @@ module main import gg -fn main() { - mut context := gg.new_context( - width: 300 - height: 300 - window_title: 'Circles' - frame_fn: frame - ) - context.run() -} - -fn frame(mut ctx gg.Context) { - ctx.begin() - ctx.draw_circle_empty(150, 150, 80, gg.blue) - ctx.draw_circle_filled(150, 150, 40, gg.yellow) - ctx.draw_circle_line(150, 150, 80, 6, gg.red) - ctx.draw_circle_line(150, 150, 120, 6, gg.green) - ctx.draw_circle_line(150, 150, 150, 8, gg.white) - ctx.end() -} +gg.start( + width: 300 + height: 300 + window_title: 'Circles' + frame_fn: fn (mut ctx gg.Context) { + ctx.begin() + ctx.draw_circle_empty(150, 150, 80, gg.blue) + ctx.draw_circle_filled(150, 150, 40, gg.yellow) + ctx.draw_circle_line(150, 150, 80, 6, gg.red) + ctx.draw_circle_line(150, 150, 120, 6, gg.green) + ctx.draw_circle_line(150, 150, 150, 8, gg.white) + ctx.end() + } +) diff --git a/vlib/gg/testdata/draw_polygons.vv b/vlib/gg/testdata/draw_polygons.vv index a69ad9f07..47b696aac 100644 --- a/vlib/gg/testdata/draw_polygons.vv +++ b/vlib/gg/testdata/draw_polygons.vv @@ -2,22 +2,17 @@ module main import gg -fn main() { - mut context := gg.new_context( - bg_color: gg.rgb(174, 198, 255) - width: 600 - height: 400 - window_title: 'Polygons' - frame_fn: frame - ) - context.run() -} - -fn frame(mut ctx gg.Context) { - ctx.begin() - ctx.draw_convex_poly([f32(100.0), 100.0, 200.0, 100.0, 300.0, 200.0, 200.0, 300.0, 100.0, 300.0], - gg.blue) - ctx.draw_poly_empty([f32(50.0), 50.0, 70.0, 60.0, 90.0, 80.0, 70.0, 110.0], gg.black) - ctx.draw_triangle_filled(450, 142, 530, 280, 370, 280, gg.red) - ctx.end() -} +gg.start( + bg_color: gg.rgb(174, 198, 255) + width: 600 + height: 400 + window_title: 'Polygons' + frame_fn: fn (mut ctx gg.Context) { + ctx.begin() + ctx.draw_convex_poly([f32(100.0), 100.0, 200.0, 100.0, 300.0, 200.0, 200.0, 300.0, 100.0, + 300.0], gg.blue) + ctx.draw_poly_empty([f32(50.0), 50.0, 70.0, 60.0, 90.0, 80.0, 70.0, 110.0], gg.black) + ctx.draw_triangle_filled(450, 142, 530, 280, 370, 280, gg.red) + ctx.end() + } +) diff --git a/vlib/gg/testdata/draw_rounded_rect_empty.vv b/vlib/gg/testdata/draw_rounded_rect_empty.vv index 153fdb1e6..5b79f5c9b 100644 --- a/vlib/gg/testdata/draw_rounded_rect_empty.vv +++ b/vlib/gg/testdata/draw_rounded_rect_empty.vv @@ -2,32 +2,27 @@ module main import gg -fn main() { - mut context := gg.new_context( - width: 325 - height: 275 - window_title: 'Rounded Rectangles' - frame_fn: frame - ) - context.run() -} - -fn frame(mut ctx gg.Context) { - ctx.begin() - // these should be rounded rectangles - ctx.draw_rounded_rect_empty(10, 10, 50, 100, 5, gg.blue) - ctx.draw_rounded_rect_empty(25, 25, 50, 100, 15, gg.yellow) - ctx.draw_rounded_rect_empty(50, 50, 50, 100, 50, gg.red) - ctx.draw_rounded_rect_empty(75, 75, 50, 100, 100, gg.green) - ctx.draw_rounded_rect_empty(100, 100, 50, 100, 1000, gg.white) - ctx.draw_rounded_rect_empty(110, 10, 100, 50, 5, gg.blue) - ctx.draw_rounded_rect_empty(125, 25, 100, 50, 15, gg.yellow) - ctx.draw_rounded_rect_empty(150, 50, 100, 50, 50, gg.red) - ctx.draw_rounded_rect_empty(175, 75, 100, 50, 100, gg.green) - ctx.draw_rounded_rect_empty(200, 100, 100, 50, 1000, gg.white) - // this should be a perfect circle - ctx.draw_rounded_rect_empty(10, 200, 50, 50, 1000, gg.magenta) - // this should be a perfect square - ctx.draw_rounded_rect_empty(250, 200, 50, 50, 0, gg.cyan) - ctx.end() -} +gg.start( + width: 325 + height: 275 + window_title: 'Rounded Rectangles' + frame_fn: fn (mut ctx gg.Context) { + ctx.begin() + // these should be rounded rectangles + ctx.draw_rounded_rect_empty(10, 10, 50, 100, 5, gg.blue) + ctx.draw_rounded_rect_empty(25, 25, 50, 100, 15, gg.yellow) + ctx.draw_rounded_rect_empty(50, 50, 50, 100, 50, gg.red) + ctx.draw_rounded_rect_empty(75, 75, 50, 100, 100, gg.green) + ctx.draw_rounded_rect_empty(100, 100, 50, 100, 1000, gg.white) + ctx.draw_rounded_rect_empty(110, 10, 100, 50, 5, gg.blue) + ctx.draw_rounded_rect_empty(125, 25, 100, 50, 15, gg.yellow) + ctx.draw_rounded_rect_empty(150, 50, 100, 50, 50, gg.red) + ctx.draw_rounded_rect_empty(175, 75, 100, 50, 100, gg.green) + ctx.draw_rounded_rect_empty(200, 100, 100, 50, 1000, gg.white) + // this should be a perfect circle + ctx.draw_rounded_rect_empty(10, 200, 50, 50, 1000, gg.magenta) + // this should be a perfect square + ctx.draw_rounded_rect_empty(250, 200, 50, 50, 0, gg.cyan) + ctx.end() + } +) diff --git a/vlib/gg/testdata/draw_rounded_rect_filled.vv b/vlib/gg/testdata/draw_rounded_rect_filled.vv new file mode 100644 index 000000000..087fb4590 --- /dev/null +++ b/vlib/gg/testdata/draw_rounded_rect_filled.vv @@ -0,0 +1,28 @@ +module main + +import gg + +gg.start( + width: 325 + height: 275 + window_title: 'Rounded Rectangles' + frame_fn: fn (mut ctx gg.Context) { + ctx.begin() + // these should be rounded rectangles + ctx.draw_rounded_rect_filled(10, 10, 50, 100, 5, gg.blue) + ctx.draw_rounded_rect_filled(25, 25, 50, 100, 15, gg.yellow) + ctx.draw_rounded_rect_filled(50, 50, 50, 100, 50, gg.red) + ctx.draw_rounded_rect_filled(75, 75, 50, 100, 100, gg.green) + ctx.draw_rounded_rect_filled(100, 100, 50, 100, 1000, gg.white) + ctx.draw_rounded_rect_filled(110, 10, 100, 50, 5, gg.blue) + ctx.draw_rounded_rect_filled(125, 25, 100, 50, 15, gg.yellow) + ctx.draw_rounded_rect_filled(150, 50, 100, 50, 50, gg.red) + ctx.draw_rounded_rect_filled(175, 75, 100, 50, 100, gg.green) + ctx.draw_rounded_rect_filled(200, 100, 100, 50, 1000, gg.white) + // this should be a perfect circle + ctx.draw_rounded_rect_filled(10, 200, 50, 50, 1000, gg.magenta) + // this should be a perfect square + ctx.draw_rounded_rect_filled(250, 200, 50, 50, 0, gg.cyan) + ctx.end() + } +) diff --git a/vlib/gg/testdata/draw_simple_polygons.vv b/vlib/gg/testdata/draw_simple_polygons.vv index 5f45a8a2e..c6620cdfe 100644 --- a/vlib/gg/testdata/draw_simple_polygons.vv +++ b/vlib/gg/testdata/draw_simple_polygons.vv @@ -5,8 +5,8 @@ import gg struct App { mut: gg &gg.Context = unsafe { nil } - rotation f32 = f32(0) - edge int = 3 + rotation f32 = f32(0) + edge int = 3 } fn main() { @@ -17,12 +17,12 @@ fn main() { app.gg = gg.new_context( window_title: 'Simple Polygons' - width: 500 - height: 500 - bg_color: gg.black - event_fn: event - frame_fn: render - user_data: app + width: 500 + height: 500 + bg_color: gg.black + event_fn: event + frame_fn: render + user_data: app ) app.gg.run() -- 2.39.5