i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use unpacked scanlines when rendering gradients.

Browse Source 
* There is no point in trying to pack the scanlines in a gradient, as it
is very likely that each pixel will have a different color.
* Moreover, the packed scanline generator will assume all pixels in the
* scanline have the same alpha value (for faster blending), and it may
* not be the case.

Fixes #2946.
Thanks to stippi and jessicah who helped tracking and understanding the issue.
This commit is contained in:
Adrien Destugues
2014-07-24 12:38:53 +02:00
parent a694f30d6c
commit b0ab67351d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/Painter/Painter.cpp
+8 -7
View File
@@ -3067,10 +3067,11 @@ Painter::_MakeGradient(Array& array, const BGradient& gradient) const
from->color.blue, from->color.alpha); from->color.blue, from->color.alpha);
agg::rgba8 toColor(to->color.red, to->color.green, agg::rgba8 toColor(to->color.red, to->color.green,
to->color.blue, to->color.alpha); to->color.blue, to->color.alpha);
GTRACE("Painter::_MakeGradient> fromColor(%d, %d, %d) offset = %f\n", GTRACE("Painter::_MakeGradient> fromColor(%d, %d, %d, %d) offset = %f\n",
fromColor.r, fromColor.g, fromColor.b, from->offset); fromColor.r, fromColor.g, fromColor.b, fromColor.a,
GTRACE("Painter::_MakeGradient> toColor(%d, %d, %d) offset = %f\n", from->offset);
toColor.r, toColor.g, toColor.b, to->offset); GTRACE("Painter::_MakeGradient> toColor(%d, %d, %d %d) offset = %f\n",
toColor.r, toColor.g, toColor.b, toColor.a, to->offset);
float dist = to->offset - from->offset; float dist = to->offset - from->offset;
GTRACE("Painter::_MakeGradient> dist = %f\n", dist); GTRACE("Painter::_MakeGradient> dist = %f\n", dist);
// TODO: Review this... offset should better be on [0..1] // TODO: Review this... offset should better be on [0..1]
@@ -3078,8 +3079,8 @@ Painter::_MakeGradient(Array& array, const BGradient& gradient) const
for (int j = (int)from->offset; j <= (int)to->offset; j++) { for (int j = (int)from->offset; j <= (int)to->offset; j++) {
float f = (float)(to->offset - j) / (float)(dist + 1); float f = (float)(to->offset - j) / (float)(dist + 1);
array[j] = toColor.gradient(fromColor, f); array[j] = toColor.gradient(fromColor, f);
GTRACE("Painter::_MakeGradient> array[%d](%d, %d, %d)\n", GTRACE("Painter::_MakeGradient> array[%d](%d, %d, %d, %d)\n",
array[j].r, array[j].g, array[j].b); j, array[j].r, array[j].g, array[j].b, array[j].a);
} }
} }
} }
@@ -3117,7 +3118,7 @@ Painter::_RasterizePath(VertexSource& path, const BGradient& gradient,
fRasterizer.reset(); fRasterizer.reset();
fRasterizer.add_path(path); fRasterizer.add_path(path);
if (fMaskedUnpackedScanline == NULL) if (fMaskedUnpackedScanline == NULL)
agg::render_scanlines(fRasterizer, fPackedScanline, gradientRenderer); agg::render_scanlines(fRasterizer, fUnpackedScanline, gradientRenderer);
else { else {
agg::render_scanlines(fRasterizer, *fMaskedUnpackedScanline, agg::render_scanlines(fRasterizer, *fMaskedUnpackedScanline,
gradientRenderer); gradientRenderer);