git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-13 11:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

sw_engine: revised code.

Browse source 
add a concrete logic for validating the stroke width
This commit is contained in:
Hermet Park 2023-09-05 14:31:09 +09:00 • committed by Hermet Park
parent dae6636d29
commit 0dafe9ff64
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/renderer/sw_engine/tvgSwRenderer.cpp
View file

@ -82,22 +82,29 @@ struct SwShapeTask : SwTask
the shape's outline beneath the stroke could be adequately covered by the stroke drawing. the shape's outline beneath the stroke could be adequately covered by the stroke drawing.
Therefore, antialiasing is disabled under this condition. Therefore, antialiasing is disabled under this condition.
Additionally, the stroke style should not be dashed. */ Additionally, the stroke style should not be dashed. */
bool antialiasing() bool antialiasing(float strokeWidth)
{ {
if (!rshape->stroke) return true; return strokeWidth < 2.0f || rshape->stroke->dashCnt > 0 || rshape->stroke->strokeFirst;
}
float validStrokeWidth()
{
if (!rshape->stroke) return 0.0f;
auto width = rshape->stroke->width; auto width = rshape->stroke->width;
if (mathZero(width)) return true; if (mathZero(width)) return 0.0f;
if (rshape->strokeTrim()) return true;
if (!rshape->stroke->fill && (MULTIPLY(rshape->stroke->color[3], opacity) == 0)) return 0.0f;
if (mathZero(rshape->stroke->trim.begin - rshape->stroke->trim.end)) return 0.0f;
if (transform) { if (transform) {
if (transform->e11 > transform->e22) width *= transform->e11; if (transform->e11 > transform->e22) width *= transform->e11;
else width *= transform->e22; else width *= transform->e22;
} }
return fabsf(width);
return rshape->stroke->color[3] < 255 || width < 2.0f || rshape->stroke->dashCnt > 0 || rshape->stroke->strokeFirst;
} }
bool clip(SwRleData* target) override bool clip(SwRleData* target) override
{ {
if (shape.fastTrack) rleClipRect(target, &bbox); if (shape.fastTrack) rleClipRect(target, &bbox);
@ -119,17 +126,10 @@ struct SwShapeTask : SwTask
{ {
if (opacity == 0 && !clipper) return; //Invisible if (opacity == 0 && !clipper) return; //Invisible
auto visibleStroke = false; auto strokeWidth = validStrokeWidth();
bool visibleFill = false; bool visibleFill = false;
auto clipRegion = bbox; auto clipRegion = bbox;
//confirm valid stroke
if (auto stroke = rshape->stroke) {
if (HALF_STROKE(stroke->width) > 0 && !mathZero(stroke->trim.begin - stroke->trim.end)) {
visibleStroke = stroke->fill || (MULTIPLY(stroke->color[3], opacity) > 0);
}
}
//This checks also for the case, if the invisible shape turned to visible by alpha. //This checks also for the case, if the invisible shape turned to visible by alpha.
auto prepareShape = false; auto prepareShape = false;
if (!shapePrepared(&shape) && (flags & RenderUpdateFlag::Color)) prepareShape = true; if (!shapePrepared(&shape) && (flags & RenderUpdateFlag::Color)) prepareShape = true;
@ -140,16 +140,15 @@ struct SwShapeTask : SwTask
rshape->fillColor(nullptr, nullptr, nullptr, &alpha); rshape->fillColor(nullptr, nullptr, nullptr, &alpha);
alpha = MULTIPLY(alpha, opacity); alpha = MULTIPLY(alpha, opacity);
visibleFill = (alpha > 0 || rshape->fill); visibleFill = (alpha > 0 || rshape->fill);
if (visibleFill || visibleStroke || clipper) { if (visibleFill || clipper) {
shapeReset(&shape); shapeReset(&shape);
if (!shapePrepare(&shape, rshape, transform, clipRegion, bbox, mpool, tid, clips.count > 0 ? true : false)) goto err; if (!shapePrepare(&shape, rshape, transform, clipRegion, bbox, mpool, tid, clips.count > 0 ? true : false)) goto err;
} }
} }
//Fill //Fill
if (flags & (RenderUpdateFlag::Gradient | RenderUpdateFlag::Transform | RenderUpdateFlag::Color)) { if (flags & (RenderUpdateFlag::Gradient | RenderUpdateFlag::Transform | RenderUpdateFlag::Color)) {
if (visibleFill || clipper) { if (visibleFill || clipper) {
if (!shapeGenRle(&shape, rshape, antialiasing())) goto err; if (!shapeGenRle(&shape, rshape, antialiasing(strokeWidth))) goto err;
} }
if (auto fill = rshape->fill) { if (auto fill = rshape->fill) {
auto ctable = (flags & RenderUpdateFlag::Gradient) ? true : false; auto ctable = (flags & RenderUpdateFlag::Gradient) ? true : false;
@ -159,10 +158,9 @@ struct SwShapeTask : SwTask
shapeDelFill(&shape); shapeDelFill(&shape);
} }
} }
//Stroke //Stroke
if (flags & (RenderUpdateFlag::Stroke | RenderUpdateFlag::Transform)) { if (flags & (RenderUpdateFlag::Stroke | RenderUpdateFlag::Transform)) {
if (visibleStroke) { if (strokeWidth > 0.0f) {
shapeResetStroke(&shape, rshape, transform); shapeResetStroke(&shape, rshape, transform);
if (!shapeGenStrokeRle(&shape, rshape, transform, clipRegion, bbox, mpool, tid)) goto err; if (!shapeGenStrokeRle(&shape, rshape, transform, clipRegion, bbox, mpool, tid)) goto err;