From ed275e1296defb6cc5450cf5996cf97c1fa32dfa Mon Sep 17 00:00:00 2001 From: Mitya Selivanov Date: Mon, 10 Feb 2025 23:50:27 +0100 Subject: Naming cleanup --- graphics.c | 85 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/graphics.c b/graphics.c index f5e8af2..95cff6b 100755 --- a/graphics.c +++ b/graphics.c @@ -207,6 +207,15 @@ b8 hit_quad (vec2 vertices[4], vec2 point); b8 hit_ellipse (Box area, vec2 point); b8 hit_line (vec2 vertices[2], f64 width, vec2 point); +void draw_pixels_to_buffer (Pixel_Buffer dst, Box area, Pixel_Buffer src); +void fill_rectangle_to_buffer (Pixel_Buffer dst, vec4_f32 color, Box area); +void fill_triangle_to_buffer (Pixel_Buffer dst, vec4_f32 color, vec2 vertices[3]); +void fill_quad_to_buffer (Pixel_Buffer dst, vec4_f32 color, vec2 vertices[4]); +void fill_ellipse_to_buffer (Pixel_Buffer dst, vec4_f32 color, Box area); +void fill_line_to_buffer (Pixel_Buffer dst, vec4_f32 color, vec2 vertices[2], f64 width); +void draw_text_area_to_buffer (Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_size, i64 num_chars, c32 *text); +void draw_text_cursor_to_buffer(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_size, i64 num_chars, c32 *text, i64 cursor, i64 selection); + void draw_pixels (Box area, Pixel_Buffer src); void fill_rectangle (vec4_f32 color, Box area); void fill_triangle (vec4_f32 color, vec2 vertices[3]); @@ -315,7 +324,7 @@ static void put_pixel_(Pixel_Buffer dst, vec4_f32 color, i64 x, i64 y) { } } -void draw_pixels_raw(Pixel_Buffer dst, Box area, Pixel_Buffer src) { +void draw_pixels_to_buffer(Pixel_Buffer dst, Box area, Pixel_Buffer src) { if (area.width < EPSILON || area.height < EPSILON) return; @@ -344,7 +353,7 @@ void draw_pixels_raw(Pixel_Buffer dst, Box area, Pixel_Buffer src) { } } -void fill_rectangle_raw(Pixel_Buffer dst, vec4_f32 color, Box area) { +void fill_rectangle_to_buffer(Pixel_Buffer dst, vec4_f32 color, Box area) { f64 x1 = area.x + area.width; f64 y1 = area.y + area.height; @@ -433,7 +442,7 @@ void fill_rectangle_raw(Pixel_Buffer dst, vec4_f32 color, Box area) { } } -void fill_triangle_raw(Pixel_Buffer dst, vec4_f32 color, vec2 vertices[3]) { +void fill_triangle_to_buffer(Pixel_Buffer dst, vec4_f32 color, vec2 vertices[3]) { f64 x0 = vertices[0].x; f64 y0 = vertices[0].y; f64 x1 = vertices[1].x; @@ -474,7 +483,7 @@ void fill_triangle_raw(Pixel_Buffer dst, vec4_f32 color, vec2 vertices[3]) { } } -void fill_quad_raw(Pixel_Buffer dst, vec4_f32 color, vec2 vertices[4]) { +void fill_quad_to_buffer(Pixel_Buffer dst, vec4_f32 color, vec2 vertices[4]) { f64 x0 = vertices[0].x; f64 y0 = vertices[0].y; f64 x1 = vertices[1].x; @@ -517,7 +526,7 @@ void fill_quad_raw(Pixel_Buffer dst, vec4_f32 color, vec2 vertices[4]) { } } -void fill_ellipse_raw(Pixel_Buffer dst, vec4_f32 color, Box area) { +void fill_ellipse_to_buffer(Pixel_Buffer dst, vec4_f32 color, Box area) { f64 y1 = area.y + area.height; i64 j0 = (i64) floor(area.y); @@ -583,11 +592,11 @@ b8 quad_from_line_(vec2 *dst, vec2 vertices[2], f64 width) { return 1; } -void fill_line_raw(Pixel_Buffer dst, vec4_f32 color, vec2 vertices[2], f64 width) { +void fill_line_to_buffer(Pixel_Buffer dst, vec4_f32 color, vec2 vertices[2], f64 width) { if (width < EPSILON) return; vec2 quad[4]; if (!quad_from_line_(quad, vertices, width)) return; - fill_quad_raw(dst, color, quad); + fill_quad_to_buffer(dst, color, quad); } static i64 char_column_offset_(c32 c, i64 column_index) { @@ -798,7 +807,7 @@ static void draw_text_(Pixel_Buffer dst, vec4_f32 color, f64 x0, f64 y0, f64 sca } } -void draw_text_area_raw(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_size, i64 num_chars, c32 *text) { +void draw_text_area_to_buffer(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_size, i64 num_chars, c32 *text) { if (text == NULL || num_chars <= 0 || max_size.x < EPSILON || max_size.y < EPSILON) return; @@ -819,7 +828,7 @@ void draw_text_area_raw(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_siz draw_text_(dst, color, area.x, area.y, kx, ky, num_chars, text); } -void draw_text_cursor_raw(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_size, i64 num_chars, c32 *text, i64 cursor, i64 selection) { +void draw_text_cursor_to_buffer(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_size, i64 num_chars, c32 *text, i64 cursor, i64 selection) { if (max_size.x< EPSILON || max_size.y < EPSILON) return; @@ -853,7 +862,7 @@ void draw_text_cursor_raw(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_s } if (cursor_y == selection_y) - fill_rectangle_raw( + fill_rectangle_to_buffer( dst, color, (Box) { @@ -864,7 +873,7 @@ void draw_text_cursor_raw(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_s } ); else { - fill_rectangle_raw( + fill_rectangle_to_buffer( dst, color, (Box) { @@ -875,7 +884,7 @@ void draw_text_cursor_raw(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_s } ); for (i64 j = cursor_y + CHAR_NUM_BITS_Y_ + 1; j < selection_y; j += CHAR_NUM_BITS_Y_ + 1) - fill_rectangle_raw( + fill_rectangle_to_buffer( dst, color, (Box) { @@ -885,7 +894,7 @@ void draw_text_cursor_raw(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_s .height = ky * (CHAR_NUM_BITS_Y_ + 1), } ); - fill_rectangle_raw( + fill_rectangle_to_buffer( dst, color, (Box) { @@ -897,7 +906,7 @@ void draw_text_cursor_raw(Pixel_Buffer dst, vec4_f32 color, Box area, vec2 max_s ); } } else - fill_rectangle_raw( + fill_rectangle_to_buffer( dst, color, (Box) { @@ -1702,10 +1711,10 @@ static Graphics_Request_Norm_ normalize_graphics_request_(Graphics_Request req) }; } -static void perform_raw_graphics_request_(Pixel_Buffer dst, Graphics_Request req) { +static void perform_graphics_request_to_buffer_(Pixel_Buffer dst, Graphics_Request req) { switch (req.op) { case GRAPHICS_DRAW_PIXELS: - draw_pixels_raw( + draw_pixels_to_buffer( dst, req.pixels.area, req.pixels.src @@ -1713,7 +1722,7 @@ static void perform_raw_graphics_request_(Pixel_Buffer dst, Graphics_Request req break; case GRAPHICS_FILL_RECTANGLE: - fill_rectangle_raw( + fill_rectangle_to_buffer( dst, req.rectangle.color, req.rectangle.area @@ -1721,7 +1730,7 @@ static void perform_raw_graphics_request_(Pixel_Buffer dst, Graphics_Request req break; case GRAPHICS_FILL_TRIANGLE: - fill_triangle_raw( + fill_triangle_to_buffer( dst, req.triangle.color, req.triangle.vertices @@ -1729,7 +1738,7 @@ static void perform_raw_graphics_request_(Pixel_Buffer dst, Graphics_Request req break; case GRAPHICS_FILL_QUAD: - fill_quad_raw( + fill_quad_to_buffer( dst, req.quad.color, req.quad.vertices @@ -1737,7 +1746,7 @@ static void perform_raw_graphics_request_(Pixel_Buffer dst, Graphics_Request req break; case GRAPHICS_FILL_ELLIPSE: - fill_ellipse_raw( + fill_ellipse_to_buffer( dst, req.ellipse.color, req.ellipse.area @@ -1745,7 +1754,7 @@ static void perform_raw_graphics_request_(Pixel_Buffer dst, Graphics_Request req break; case GRAPHICS_FILL_LINE: - fill_line_raw( + fill_line_to_buffer( dst, req.line.color, req.line.vertices, @@ -1754,7 +1763,7 @@ static void perform_raw_graphics_request_(Pixel_Buffer dst, Graphics_Request req break; case GRAPHICS_DRAW_TEXT_AREA: - draw_text_area_raw( + draw_text_area_to_buffer( dst, req.text_area.color, req.text_area.area, @@ -1765,7 +1774,7 @@ static void perform_raw_graphics_request_(Pixel_Buffer dst, Graphics_Request req break; case GRAPHICS_DRAW_TEXT_CURSOR: - draw_text_cursor_raw( + draw_text_cursor_to_buffer( dst, req.text_cursor.color, req.text_cursor.area, @@ -1897,7 +1906,7 @@ static void perform_graphics_request_cached_(Pixel_Buffer dst, Graphics_Request .pixels = s->upscaled_buffer, }; Graphics_Request upscaled = graphics_request_scaled_(s->req, (vec2) { ANTIALIASING_SCALE, ANTIALIASING_SCALE }); - perform_raw_graphics_request_(dst, upscaled); + perform_graphics_request_to_buffer_(dst, upscaled); s->done_rendering = 1; _graphics_rendering_budget -= num_pixels * GRAPHICS_RENDER_COST * _graphics_costs[req.op]; } else { @@ -1925,14 +1934,14 @@ static void perform_graphics_request_cached_(Pixel_Buffer dst, Graphics_Request .pixels = s->buffer, }); else - perform_raw_graphics_request_(dst, req); + perform_graphics_request_to_buffer_(dst, req); } static void scale_and_perform_graphics_request_(Graphics_Context context, Graphics_Request req) { Graphics_Request scaled = graphics_request_scaled_(req, context.scale); if (context.disable_antialiasing) - perform_raw_graphics_request_(context.dst, scaled); + perform_graphics_request_to_buffer_(context.dst, scaled); else perform_graphics_request_cached_(context.dst, scaled); } @@ -2076,18 +2085,18 @@ Pixel_Buffer pixels = { vec4_f32 color = { 1., 1., 1., 1., }; -BENCHMARK("fill rectangle raw") { +BENCHMARK("fill rectangle") { BENCHMARK_BEGIN; { - fill_rectangle_raw(pixels, color, (Box) { .x = 100, .y = 100, .width = 300, .height = 200, }); + fill_rectangle_to_buffer(pixels, color, (Box) { .x = 100, .y = 100, .width = 300, .height = 200, }); } BENCHMARK_END; } -BENCHMARK("fill triangle raw") { +BENCHMARK("fill triangle") { BENCHMARK_BEGIN; { - fill_triangle_raw(pixels, color, (vec2[3]) { + fill_triangle_to_buffer(pixels, color, (vec2[3]) { { 100, 100 }, { 300, 100 }, { 200, 250 }, @@ -2096,10 +2105,10 @@ BENCHMARK("fill triangle raw") { BENCHMARK_END; } -BENCHMARK("fill quad raw") { +BENCHMARK("fill quad") { BENCHMARK_BEGIN; { - fill_quad_raw(pixels, color, (vec2[4]) { + fill_quad_to_buffer(pixels, color, (vec2[4]) { { 100, 100 }, { 300, 100 }, { 300, 200 }, @@ -2109,18 +2118,18 @@ BENCHMARK("fill quad raw") { BENCHMARK_END; } -BENCHMARK("fill ellipse raw") { +BENCHMARK("fill ellipse") { BENCHMARK_BEGIN; { - fill_ellipse_raw(pixels, color, (Box) { .x = 80, .y = 80, .width = 340, .height = 240, }); + fill_ellipse_to_buffer(pixels, color, (Box) { .x = 80, .y = 80, .width = 340, .height = 240, }); } BENCHMARK_END; } -BENCHMARK("fill line raw") { +BENCHMARK("fill line") { BENCHMARK_BEGIN; { - fill_line_raw(pixels, color, (vec2[2]) { + fill_line_to_buffer(pixels, color, (vec2[2]) { { 100, 100 }, { 300, 200 }, }, 40); @@ -2128,11 +2137,11 @@ BENCHMARK("fill line raw") { BENCHMARK_END; } -BENCHMARK("draw text area raw") { +BENCHMARK("draw text area") { BENCHMARK_BEGIN; { c32 text[] = { 'H', 'e', 'l', 'l', 'o', ',', ' ', 'S', 'a', 'i', 'l', 'o', 'r', '!', }; - draw_text_area_raw(pixels, color, (Box) { .x = 100, .y = 100, .width = 300, .height = 200, }, (vec2) { 100, 200 }, sizeof text / sizeof *text, text); + draw_text_area_to_buffer(pixels, color, (Box) { .x = 100, .y = 100, .width = 300, .height = 200, }, (vec2) { 100, 200 }, sizeof text / sizeof *text, text); } BENCHMARK_END; } -- cgit v1.2.3