Raster backend (#18)

Author: someone13574

examples/CMakeLists.txt

@@ -29,11 +29,3 @@ if (NOT MSVC)
     target_compile_options(font-example PRIVATE -fsanitize=address,undefined)
     target_link_options(font-example PRIVATE -fsanitize=address,undefined)
 endif()
-
-add_executable(tessellation-example tessellation.c)
-target_link_libraries(tessellation-example PRIVATE canvas)
-target_compile_definitions(tessellation-example PRIVATE DEBUG TEST)
-if (NOT MSVC)
-    target_compile_options(tessellation-example PRIVATE -fsanitize=address,undefined)
-    target_link_options(tessellation-example PRIVATE -fsanitize=address,undefined)
-endif()

examples/font.c

@@ -26,7 +26,13 @@ int main(int argc, char** argv) {
     SfntGlyph glyph;
     REQUIRE(sfnt_get_glyph_for_cid(&font, '%', &glyph));
 
-    Canvas* canvas = canvas_new_scalable(arena, 2000, 2000, 0xffffffff, 1.0);
+    Canvas* canvas = canvas_new_scalable(
+        arena,
+        2000,
+        2000,
+        rgba_new(1.0, 1.0, 1.0, 1.0),
+        1.0
+    );
     GeomMat3 transform =
         geom_mat3_new(1.0, 0.0, 0.0, 0.0, -1.0, 0.0, 500.0, 1500.0, 1.0);
     sfnt_glyph_render(
@@ -35,7 +41,7 @@ int main(int argc, char** argv) {
         transform,
         (CanvasBrush) {.enable_fill = true,
                        .enable_stroke = false,
-                       .fill_rgba = 0x000000ff}
+                       .fill_rgba = rgba_new(0.0, 0.0, 0.0, 1.0)}
     );
     canvas_write_file(canvas, "glyph.svg");
 

examples/pdf.c

@@ -43,7 +43,13 @@ int main(int argc, char** argv) {
         }
 
         Canvas* canvas = NULL;
-        REQUIRE(render_page(arena, resolver, &page, &canvas));
+        REQUIRE(render_page(
+            arena,
+            resolver,
+            &page,
+            RENDER_CANVAS_TYPE_SCALABLE,
+            &canvas
+        ));
         canvas_write_file(canvas, "test.svg");
     };
 

examples/tessellation.c

@@ -1,13 +1,12 @@
 add_library(canvas
     src/canvas.c
     src/path_builder.c
-    src/dcel_builder.c
     src/dcel.c
     src/raster_canvas.c
     src/scalable_canvas.c)
 target_include_directories(canvas PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_link_libraries(canvas PUBLIC arena geom str)
-target_link_libraries(canvas PRIVATE logger $<$<NOT:$<PLATFORM_ID:Windows>>:m>)
+target_link_libraries(canvas PUBLIC arena color geom str)
+target_link_libraries(canvas PRIVATE logger pdf-test $<$<NOT:$<PLATFORM_ID:Windows>>:m>)
 target_compile_features(canvas PUBLIC c_std_11)
 if (NOT MSVC)
     target_compile_options(canvas PRIVATE -fsanitize=address,undefined)

libs/canvas/CMakeLists.txt

@@ -6,6 +6,7 @@
 
 #include "arena/arena.h"
 #include "canvas/path_builder.h"
+#include "color/rgb.h"
 
 typedef enum CanvasLineCap {
     CANVAS_LINECAP_BUTT,
@@ -21,10 +22,11 @@ typedef enum CanvasLineJoin {
 
 typedef struct CanvasBrush {
     bool enable_fill;
+    bool even_odd_fill;
     bool enable_stroke;
 
-    uint32_t fill_rgba;
-    uint32_t stroke_rgba;
+    Rgba fill_rgba;
+    Rgba stroke_rgba;
 
     double stroke_width;
     CanvasLineCap line_cap;
@@ -38,15 +40,14 @@ Canvas* canvas_new_raster(
     Arena* arena,
     uint32_t width,
     uint32_t height,
-    uint32_t rgba,
-    double coordinate_scale
+    Rgba rgba
 );
 
 Canvas* canvas_new_scalable(
     Arena* arena,
     uint32_t width,
     uint32_t height,
-    uint32_t rgba,
+    Rgba rgba,
     double raster_res
 );
 
@@ -58,7 +59,7 @@ void canvas_draw_circle(
     double x,
     double y,
     double radius,
-    uint32_t rgba
+    Rgba rgba
 );
 
 void canvas_draw_line(
@@ -68,7 +69,7 @@ void canvas_draw_line(
     double x2,
     double y2,
     double radius,
-    uint32_t rgba
+    Rgba rgba
 );
 
 void canvas_draw_bezier(
@@ -81,7 +82,7 @@ void canvas_draw_bezier(
     double cy,
     double flatness,
     double radius,
-    uint32_t rgba
+    Rgba rgba
 );
 
 void canvas_draw_path(
@@ -98,7 +99,7 @@ void canvas_push_clip_path(
 
 void canvas_pop_clip_paths(Canvas* canvas, size_t count);
 
-void canvas_draw_pixel(Canvas* canvas, GeomVec2 position, uint32_t rgba);
+void canvas_draw_pixel(Canvas* canvas, GeomVec2 position, Rgba rgba);
 
 /// Writes the canvas to a file. Returns `true` on success.
 bool canvas_write_file(Canvas* canvas, const char* path);

libs/canvas/include/canvas/canvas.h

@@ -1,13 +1,28 @@
 #pragma once
 
+#include <stdbool.h>
+
 #include "arena/arena.h"
 #include "geom/mat3.h"
 #include "geom/vec2.h"
 
 typedef struct PathBuilder PathBuilder;
+typedef struct PathBuilderOptions {
+    bool flatten_curves;
+    double quad_flatness;
+    int quad_max_depth;
+    double cubic_flatness;
+    int cubic_max_depth;
+} PathBuilderOptions;
+
+PathBuilderOptions path_builder_options_default(void);
+PathBuilderOptions path_builder_options_flattened(void);
 
 PathBuilder* path_builder_new(Arena* arena);
+PathBuilder*
+path_builder_new_with_options(Arena* arena, PathBuilderOptions options);
 PathBuilder* path_builder_clone(Arena* arena, const PathBuilder* to_clone);
+void path_builder_set_options(PathBuilder* builder, PathBuilderOptions options);
 
 void path_builder_new_contour(PathBuilder* builder, GeomVec2 point);
 void path_builder_close_contour(PathBuilder* builder);
@@ -24,4 +39,5 @@ void path_builder_cubic_bezier_to(
     GeomVec2 control_a,
     GeomVec2 control_b
 );
+
 void path_builder_apply_transform(PathBuilder* path, GeomMat3 transform);

libs/canvas/include/canvas/dcel_builder.h

@@ -19,12 +19,10 @@ Canvas* canvas_new_raster(
     Arena* arena,
     uint32_t width,
     uint32_t height,
-    uint32_t rgba,
-    double coordinate_scale
+    Rgba rgba
 ) {
     Canvas* canvas = arena_alloc(arena, sizeof(Canvas));
-    canvas->data.raster =
-        raster_canvas_new(arena, width, height, rgba, coordinate_scale);
+    canvas->data.raster = raster_canvas_new(arena, width, height, rgba);
     canvas->type = CANVAS_TYPE_RASTER;
 
     return canvas;
@@ -42,7 +40,7 @@ Canvas* canvas_new_scalable(
     Arena* arena,
     uint32_t width,
     uint32_t height,
-    uint32_t rgba,
+    Rgba rgba,
     double raster_res
 ) {
     Canvas* canvas = arena_alloc(arena, sizeof(Canvas));
@@ -61,7 +59,7 @@ bool canvas_is_raster(Canvas* canvas) {
 double canvas_raster_res(Canvas* canvas) {
     RELEASE_ASSERT(canvas);
     if (canvas->type == CANVAS_TYPE_RASTER) {
-        return 1.0;
+        return raster_canvas_raster_res(canvas->data.raster);
     } else {
         return scalable_canvas_raster_res(canvas->data.scalable);
     }
@@ -72,7 +70,7 @@ void canvas_draw_circle(
     double x,
     double y,
     double radius,
-    uint32_t rgba
+    Rgba rgba
 ) {
     switch (canvas->type) {
         case CANVAS_TYPE_RASTER: {
@@ -102,7 +100,7 @@ void canvas_draw_line(
     double x2,
     double y2,
     double radius,
-    uint32_t rgba
+    Rgba rgba
 ) {
     switch (canvas->type) {
         case CANVAS_TYPE_RASTER: {
@@ -145,7 +143,7 @@ void canvas_draw_bezier(
     double cy,
     double flatness,
     double radius,
-    uint32_t rgba
+    Rgba rgba
 ) {
     switch (canvas->type) {
         case CANVAS_TYPE_RASTER: {
@@ -255,12 +253,13 @@ void canvas_pop_clip_paths(Canvas* canvas, size_t count) {
     }
 }
 
-void canvas_draw_pixel(Canvas* canvas, GeomVec2 position, uint32_t rgba) {
+void canvas_draw_pixel(Canvas* canvas, GeomVec2 position, Rgba rgba) {
     RELEASE_ASSERT(canvas);
 
     switch (canvas->type) {
         case CANVAS_TYPE_RASTER: {
-            LOG_TODO();
+            raster_canvas_draw_pixel(canvas->data.raster, position, rgba);
+            break;
         }
         case CANVAS_TYPE_SCALABLE: {
             scalable_canvas_draw_pixel(canvas->data.scalable, position, rgba);