Add smoothing level.

gregersn · Nov 9, 2024 · d9f59d0 · d9f59d0
1 parent 7548dc8
commit d9f59d0
Show file tree

Hide file tree

Showing 52 changed files with 134 additions and 102 deletions.
diff --git a/include/pyro/graphics.h b/include/pyro/graphics.h
@@ -26,7 +26,7 @@ namespace Pyro
         GraphicsMode mode;
         std::filesystem::path filename{""};
 
-        bool _smooth{true};
+        int _smooth{3};
         unsigned int _curvedetail{32};
 
         Shape _shape{Shape()};
@@ -85,6 +85,7 @@ namespace Pyro
         virtual void strokejoin(int join);
 
         virtual void smooth();
+        virtual void smooth(int level);
         virtual void nosmooth();
 
         // Transformation

diff --git a/include/pyro/graphics_cairo.h b/include/pyro/graphics_cairo.h
@@ -39,6 +39,7 @@ namespace Pyro
 
         void background(float r, float g, float b, float a) override;
         void smooth() override;
+        void smooth(int level) override;
         void nosmooth() override;
         void strokecap(int cap) override;
         void strokejoin(int join) override;

diff --git a/include/pyro/pyro.h b/include/pyro/pyro.h
@@ -75,6 +75,7 @@ namespace Pyro
     // **** /RENDERING ****
 
     inline void smooth() { pg->smooth(); };
+    inline void smooth(int level) { pg->smooth(level); };
     inline void nosmooth() { pg->nosmooth(); };
 
     inline float strokeweight() { return pg->strokeweight(); };

diff --git a/screenshots/expected/image_a_over_b.png b/screenshots/expected/image_a_over_b.png
diff --git a/screenshots/expected/image_a_over_b_with_alpha.png b/screenshots/expected/image_a_over_b_with_alpha.png
diff --git a/screenshots/expected/image_blend_ADD.png b/screenshots/expected/image_blend_ADD.png
diff --git a/screenshots/expected/image_blend_BLEND.png b/screenshots/expected/image_blend_BLEND.png
diff --git a/screenshots/expected/image_blend_BURN.png b/screenshots/expected/image_blend_BURN.png
diff --git a/screenshots/expected/image_blend_DARKEST.png b/screenshots/expected/image_blend_DARKEST.png
diff --git a/screenshots/expected/image_blend_DIFFERENCE.png b/screenshots/expected/image_blend_DIFFERENCE.png
diff --git a/screenshots/expected/image_blend_DODGE.png b/screenshots/expected/image_blend_DODGE.png
diff --git a/screenshots/expected/image_blend_EXCLUSION.png b/screenshots/expected/image_blend_EXCLUSION.png
diff --git a/screenshots/expected/image_blend_HARD_LIGHT.png b/screenshots/expected/image_blend_HARD_LIGHT.png
diff --git a/screenshots/expected/image_blend_LIGHTEST.png b/screenshots/expected/image_blend_LIGHTEST.png
diff --git a/screenshots/expected/image_blend_MULTIPLY.png b/screenshots/expected/image_blend_MULTIPLY.png
diff --git a/screenshots/expected/image_blend_OVERLAY.png b/screenshots/expected/image_blend_OVERLAY.png
diff --git a/screenshots/expected/image_blend_SCREEN.png b/screenshots/expected/image_blend_SCREEN.png
diff --git a/screenshots/expected/image_blend_SOFT_LIGHT.png b/screenshots/expected/image_blend_SOFT_LIGHT.png
diff --git a/screenshots/expected/image_blend_SUBTRACT.png b/screenshots/expected/image_blend_SUBTRACT.png
diff --git a/screenshots/expected/image_convert_4ch_to_1ch.png b/screenshots/expected/image_convert_4ch_to_1ch.png
diff --git a/screenshots/expected/image_convert_4ch_to_3ch.png b/screenshots/expected/image_convert_4ch_to_3ch.png
diff --git a/screenshots/expected/image_place_1ch.png b/screenshots/expected/image_place_1ch.png
diff --git a/screenshots/expected/image_place_3ch.png b/screenshots/expected/image_place_3ch.png
diff --git a/screenshots/expected/image_place_4ch.png b/screenshots/expected/image_place_4ch.png
diff --git a/screenshots/expected/image_place_default.png b/screenshots/expected/image_place_default.png
diff --git a/screenshots/expected/image_place_scaled_rotated.png b/screenshots/expected/image_place_scaled_rotated.png
diff --git a/screenshots/expected/image_resize_scale_down_bi_loaded.png b/screenshots/expected/image_resize_scale_down_bi_loaded.png
diff --git a/screenshots/expected/image_resize_scale_down_nn_loaded.png b/screenshots/expected/image_resize_scale_down_nn_loaded.png
diff --git a/screenshots/expected/image_resize_scale_up_bi_loaded.png b/screenshots/expected/image_resize_scale_up_bi_loaded.png
diff --git a/screenshots/expected/image_resize_scale_up_nn_loaded.png b/screenshots/expected/image_resize_scale_up_nn_loaded.png
diff --git a/screenshots/expected/image_single_channel_mask.png b/screenshots/expected/image_single_channel_mask.png
diff --git a/screenshots/expected/noise_2d.png b/screenshots/expected/noise_2d.png
diff --git a/screenshots/expected/push_pop_style.png b/screenshots/expected/push_pop_style.png
diff --git a/screenshots/expected/shape_circle.png b/screenshots/expected/shape_circle.png
diff --git a/screenshots/expected/shape_curve.png b/screenshots/expected/shape_curve.png
diff --git a/screenshots/expected/shape_curve_bezier.png b/screenshots/expected/shape_curve_bezier.png
diff --git a/screenshots/expected/shape_curve_bezier_vertex.png b/screenshots/expected/shape_curve_bezier_vertex.png
diff --git a/screenshots/expected/shape_curve_vertex.png b/screenshots/expected/shape_curve_vertex.png
diff --git a/screenshots/expected/shape_ellipse.png b/screenshots/expected/shape_ellipse.png
diff --git a/screenshots/expected/shape_multi_contour.png b/screenshots/expected/shape_multi_contour.png
diff --git a/screenshots/expected/shape_n_ellipses.png b/screenshots/expected/shape_n_ellipses.png
diff --git a/screenshots/expected/shape_rect_center.png b/screenshots/expected/shape_rect_center.png
diff --git a/screenshots/expected/shape_rect_corner.png b/screenshots/expected/shape_rect_corner.png
diff --git a/screenshots/expected/shape_triangle.png b/screenshots/expected/shape_triangle.png
diff --git a/screenshots/expected/stroke_cap.png b/screenshots/expected/stroke_cap.png
diff --git a/screenshots/expected/stroke_join.png b/screenshots/expected/stroke_join.png
diff --git a/screenshots/expected/stroke_weight.png b/screenshots/expected/stroke_weight.png
diff --git a/screenshots/expected/test_image.png b/screenshots/expected/test_image.png
diff --git a/screenshots/expected/typography_simple_string.png b/screenshots/expected/typography_simple_string.png
diff --git a/screenshots/expected/using_current_unit.png b/screenshots/expected/using_current_unit.png
diff --git a/src/graphics.cpp b/src/graphics.cpp
@@ -330,12 +330,17 @@ namespace Pyro
 
     void Graphics::smooth()
     {
-        this->_smooth = true;
+        this->smooth(2);
+    }
+
+    void Graphics::smooth(int level)
+    {
+        this->_smooth = max(min(level, 8), 0);
     }
 
     void Graphics::nosmooth()
     {
-        this->_smooth = false;
+        this->smooth(0);
     }
 
     float Graphics::strokeweight()

diff --git a/src/graphics_cairo.cpp b/src/graphics_cairo.cpp
@@ -89,7 +89,6 @@ namespace Pyro
 
     void GraphicsCairo::shape(Shape s, float x, float y)
     {
-        // TODO: Use unit
         cairo_save(this->cr);
         cairo_new_path(this->cr);
 
@@ -218,14 +217,39 @@ namespace Pyro
 
     void GraphicsCairo::smooth()
     {
-        this->_smooth = true;
-        cairo_set_antialias(this->cr, CAIRO_ANTIALIAS_DEFAULT);
+        this->smooth(2);
+    }
+
+    void GraphicsCairo::smooth(int level)
+    {
+        this->_smooth = level;
+        cairo_antialias_t cairo_antialias_level = CAIRO_ANTIALIAS_DEFAULT;
+        switch (this->_smooth)
+        {
+        case 0:
+            cairo_antialias_level = CAIRO_ANTIALIAS_NONE;
+            break;
+        case 1:
+        case 2:
+            cairo_antialias_level = CAIRO_ANTIALIAS_FAST;
+            break;
+        case 3:
+            cairo_antialias_level = CAIRO_ANTIALIAS_GOOD;
+            break;
+        case 4:
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+            cairo_antialias_level = CAIRO_ANTIALIAS_BEST;
+            break;
+        }
+        cairo_set_antialias(this->cr, cairo_antialias_level);
     }
 
     void GraphicsCairo::nosmooth()
     {
-        this->_smooth = false;
-        cairo_set_antialias(this->cr, CAIRO_ANTIALIAS_NONE);
+        this->smooth(0);
     }
 
     void GraphicsCairo::strokecap(int cap)