mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 00:47:45 +00:00
LibGfx: Implement antialiased outline ellipsis
This is a first pass at antialiased outline ellipses, currently this is done by painting two filled AA ellipses, and then subtracting the inner ellipse from the outer. This produces a good result, but unfortunately requires allocating a temporary bitmap in the painter. I did try a simpler method using the existing line painting functions, and drawing the ellipse as many line segments, but that produced very poor results. I think with some work it should be possible to remove the extra allocation, and I've left a big FIXME for this, but I could not get this working well.
This commit is contained in:
parent
8ac5f625e9
commit
8c2a5bbc15
2 changed files with 53 additions and 12 deletions
|
@ -192,14 +192,44 @@ void Gfx::AntiAliasingPainter::draw_cubic_bezier_curve(FloatPoint const& control
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void Gfx::AntiAliasingPainter::fill_circle(IntPoint const& center, int radius, Color color)
|
void Gfx::AntiAliasingPainter::draw_ellipse(IntRect const& a_rect, Color color, int thickness)
|
||||||
|
{
|
||||||
|
// FIXME: Come up with an allocation-free version of this!
|
||||||
|
// Using draw_line() for segments of an ellipse was attempted but gave really poor results :^(
|
||||||
|
// There probably is a way to adjust the fill of draw_ellipse_part() to do this, but gettting it rendering correctly is tricky.
|
||||||
|
// The outline of the steps required to paint it efficiently is:
|
||||||
|
// - Paint the outer ellipse without the fill (from the fill() lambda in draw_ellipse_part())
|
||||||
|
// - Paint the inner ellipse, but in the set_pixel() invert the alpha values
|
||||||
|
// - Somehow fill in the gap between the two ellipses (the tricky part to get right)
|
||||||
|
// - Have to avoid overlapping pixels and accidentally painting over some of the edge pixels
|
||||||
|
|
||||||
|
auto color_no_alpha = color;
|
||||||
|
color_no_alpha.set_alpha(255);
|
||||||
|
auto outline_ellipse_bitmap = ({
|
||||||
|
auto bitmap = Gfx::Bitmap::try_create(BitmapFormat::BGRA8888, a_rect.size());
|
||||||
|
if (bitmap.is_error())
|
||||||
|
return warnln("Failed to allocate temporary bitmap for antialiased outline ellipse!");
|
||||||
|
bitmap.release_value();
|
||||||
|
});
|
||||||
|
|
||||||
|
auto outer_rect = a_rect;
|
||||||
|
outer_rect.set_location({ 0, 0 });
|
||||||
|
auto inner_rect = outer_rect.shrunken(thickness * 2, thickness * 2);
|
||||||
|
Gfx::Painter painter { outline_ellipse_bitmap };
|
||||||
|
AntiAliasingPainter aa_painter { painter };
|
||||||
|
aa_painter.fill_ellipse(outer_rect, color_no_alpha);
|
||||||
|
aa_painter.fill_ellipse(inner_rect, color_no_alpha, BlendMode::AlphaSubtract);
|
||||||
|
m_underlying_painter.blit(a_rect.location(), outline_ellipse_bitmap, outline_ellipse_bitmap->rect(), color.alpha() / 255.);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Gfx::AntiAliasingPainter::fill_circle(IntPoint const& center, int radius, Color color, BlendMode blend_mode)
|
||||||
{
|
{
|
||||||
if (radius <= 0)
|
if (radius <= 0)
|
||||||
return;
|
return;
|
||||||
draw_ellipse_part(center, radius, radius, color, false, {});
|
draw_ellipse_part(center, radius, radius, color, false, {}, blend_mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Gfx::AntiAliasingPainter::fill_ellipse(IntRect const& a_rect, Color color)
|
void Gfx::AntiAliasingPainter::fill_ellipse(IntRect const& a_rect, Color color, BlendMode blend_mode)
|
||||||
{
|
{
|
||||||
auto center = a_rect.center();
|
auto center = a_rect.center();
|
||||||
auto radius_a = a_rect.width() / 2;
|
auto radius_a = a_rect.width() / 2;
|
||||||
|
@ -207,14 +237,14 @@ void Gfx::AntiAliasingPainter::fill_ellipse(IntRect const& a_rect, Color color)
|
||||||
if (radius_a <= 0 || radius_b <= 0)
|
if (radius_a <= 0 || radius_b <= 0)
|
||||||
return;
|
return;
|
||||||
if (radius_a == radius_b)
|
if (radius_a == radius_b)
|
||||||
return fill_circle(center, radius_a, color);
|
return fill_circle(center, radius_a, color, blend_mode);
|
||||||
auto x_paint_range = draw_ellipse_part(center, radius_a, radius_b, color, false, {});
|
auto x_paint_range = draw_ellipse_part(center, radius_a, radius_b, color, false, {}, blend_mode);
|
||||||
// FIXME: This paints some extra fill pixels that are clipped
|
// FIXME: This paints some extra fill pixels that are clipped
|
||||||
draw_ellipse_part(center, radius_b, radius_a, color, true, x_paint_range);
|
draw_ellipse_part(center, radius_b, radius_a, color, true, x_paint_range, blend_mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
Gfx::AntiAliasingPainter::Range Gfx::AntiAliasingPainter::draw_ellipse_part(
|
Gfx::AntiAliasingPainter::Range Gfx::AntiAliasingPainter::draw_ellipse_part(
|
||||||
IntPoint center, int radius_a, int radius_b, Color color, bool flip_x_and_y, Optional<Range> x_clip)
|
IntPoint center, int radius_a, int radius_b, Color color, bool flip_x_and_y, Optional<Range> x_clip, BlendMode blend_mode)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
Algorithm from: https://cs.uwaterloo.ca/research/tr/1984/CS-84-38.pdf
|
Algorithm from: https://cs.uwaterloo.ca/research/tr/1984/CS-84-38.pdf
|
||||||
|
@ -322,9 +352,12 @@ Gfx::AntiAliasingPainter::Range Gfx::AntiAliasingPainter::draw_ellipse_part(
|
||||||
return;
|
return;
|
||||||
min_paint_x = min(x, min_paint_x);
|
min_paint_x = min(x, min_paint_x);
|
||||||
max_paint_x = max(x, max_paint_x);
|
max_paint_x = max(x, max_paint_x);
|
||||||
|
alpha = (alpha * color.alpha()) / 255;
|
||||||
|
if (blend_mode == BlendMode::AlphaSubtract)
|
||||||
|
alpha = ~alpha;
|
||||||
auto pixel_color = color;
|
auto pixel_color = color;
|
||||||
pixel_color.set_alpha((alpha * color.alpha()) / 255);
|
pixel_color.set_alpha(alpha);
|
||||||
m_underlying_painter.set_pixel(center + IntPoint { x, y }, pixel_color, true);
|
m_underlying_painter.set_pixel(center + IntPoint { x, y }, pixel_color, blend_mode == BlendMode::Normal);
|
||||||
};
|
};
|
||||||
|
|
||||||
auto fill = [&](int x, int ymax, int ymin, int alpha) {
|
auto fill = [&](int x, int ymax, int ymin, int alpha) {
|
||||||
|
|
|
@ -28,8 +28,15 @@ public:
|
||||||
void translate(float dx, float dy) { m_transform.translate(dx, dy); }
|
void translate(float dx, float dy) { m_transform.translate(dx, dy); }
|
||||||
void translate(FloatPoint const& delta) { m_transform.translate(delta); }
|
void translate(FloatPoint const& delta) { m_transform.translate(delta); }
|
||||||
|
|
||||||
void fill_circle(IntPoint const& center, int radius, Color);
|
void draw_ellipse(IntRect const& a_rect, Color, int thickness);
|
||||||
void fill_ellipse(IntRect const& a_rect, Color);
|
|
||||||
|
enum class BlendMode {
|
||||||
|
Normal,
|
||||||
|
AlphaSubtract
|
||||||
|
};
|
||||||
|
|
||||||
|
void fill_circle(IntPoint const& center, int radius, Color, BlendMode blend_mode = BlendMode::Normal);
|
||||||
|
void fill_ellipse(IntRect const& a_rect, Color, BlendMode blend_mode = BlendMode::Normal);
|
||||||
|
|
||||||
void fill_rect_with_rounded_corners(IntRect const&, Color, int radius);
|
void fill_rect_with_rounded_corners(IntRect const&, Color, int radius);
|
||||||
void fill_rect_with_rounded_corners(IntRect const&, Color, int top_left_radius, int top_right_radius, int bottom_right_radius, int bottom_left_radius);
|
void fill_rect_with_rounded_corners(IntRect const&, Color, int top_left_radius, int top_right_radius, int bottom_right_radius, int bottom_left_radius);
|
||||||
|
@ -44,7 +51,8 @@ private:
|
||||||
return n >= min && n <= max;
|
return n >= min && n <= max;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
Range draw_ellipse_part(IntPoint a_rect, int radius_a, int radius_b, Color, bool flip_x_and_y, Optional<Range> x_clip);
|
|
||||||
|
Range draw_ellipse_part(IntPoint a_rect, int radius_a, int radius_b, Color, bool flip_x_and_y, Optional<Range> x_clip, BlendMode blend_mode);
|
||||||
|
|
||||||
enum class AntiAliasPolicy {
|
enum class AntiAliasPolicy {
|
||||||
OnlyEnds,
|
OnlyEnds,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue