git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-12 15:34:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

svg_loader: a function to establish shapes boundries without a stroke introduced

Browse source 
To handle the objectBoundingBox units, the shape's boundaries have to be known.
According to the SVG standard, a stroke shouldn't be taken into account. Since
the bounds() api uses the shape's stroke information, a new function is introduced,
that compensates this and returns boundaries without any strokes.
This commit is contained in:
Mira Grudzinska 2021-11-24 23:07:35 +01:00 • committed by Mira Grudzinska
parent bd7c19a592
commit 4485db4f15
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/loaders/svg/tvgSvgSceneBuilder.cpp
View file

@ -77,6 +77,24 @@ static inline bool _isGroupType(SvgNodeType type)
} }
//According to: https://www.w3.org/TR/SVG11/coords.html#ObjectBoundingBoxUnits (the last paragraph)
//a stroke width should be ignored for bounding box calculations
static Box _boundingBox(const Shape* shape)
{
float x, y, w, h;
shape->bounds(&x, &y, &w, &h, false);
if (auto strokeW = shape->strokeWidth()) {
x += 0.5f * strokeW;
y += 0.5f * strokeW;
w -= strokeW;
h -= strokeW;
}
return {x, y, w, h};
}
static void _transformMultiply(const Matrix* mBBox, Matrix* gradTransf) static void _transformMultiply(const Matrix* mBBox, Matrix* gradTransf)
{ {
gradTransf->e13 = gradTransf->e13 * mBBox->e11 + mBBox->e13; gradTransf->e13 = gradTransf->e13 * mBBox->e11 + mBBox->e13;
@ -286,17 +304,7 @@ static void _applyProperty(SvgNode* node, Shape* vg, const Box& vBox, const stri
//Do nothing //Do nothing
} else if (style->fill.paint.gradient) { } else if (style->fill.paint.gradient) {
Box bBox = vBox; Box bBox = vBox;
if (!style->fill.paint.gradient->userSpace) { if (!style->fill.paint.gradient->userSpace) bBox = _boundingBox(vg);
vg->bounds(&bBox.x, &bBox.y, &bBox.w, &bBox.h, false);
//According to: https://www.w3.org/TR/SVG11/coords.html#ObjectBoundingBoxUnits (the last paragraph)
//a stroke width should be ignored for bounding box calculations
if (auto strokeW = vg->strokeWidth()) {
bBox.x += 0.5f * strokeW;
bBox.y += 0.5f * strokeW;
bBox.w -= strokeW;
bBox.h -= strokeW;
}
}
if (style->fill.paint.gradient->type == SvgGradientType::Linear) { if (style->fill.paint.gradient->type == SvgGradientType::Linear) {
auto linear = _applyLinearGradientProperty(style->fill.paint.gradient, vg, bBox, style->fill.opacity); auto linear = _applyLinearGradientProperty(style->fill.paint.gradient, vg, bBox, style->fill.opacity);
@ -336,17 +344,7 @@ static void _applyProperty(SvgNode* node, Shape* vg, const Box& vBox, const stri
//Do nothing //Do nothing
} else if (style->stroke.paint.gradient) { } else if (style->stroke.paint.gradient) {
Box bBox = vBox; Box bBox = vBox;
if (!style->stroke.paint.gradient->userSpace) { if (!style->stroke.paint.gradient->userSpace) bBox = _boundingBox(vg);
//According to: https://www.w3.org/TR/SVG11/coords.html#ObjectBoundingBoxUnits (the last paragraph)
//a stroke width should be ignored for bounding box calculations
vg->bounds(&bBox.x, &bBox.y, &bBox.w, &bBox.h, false);
if (auto strokeW = vg->strokeWidth()) {
bBox.x += 0.5f * strokeW;
bBox.y += 0.5f * strokeW;
bBox.w -= strokeW;
bBox.h -= strokeW;
}
}
if (style->stroke.paint.gradient->type == SvgGradientType::Linear) { if (style->stroke.paint.gradient->type == SvgGradientType::Linear) {
auto linear = _applyLinearGradientProperty(style->stroke.paint.gradient, vg, bBox, style->stroke.opacity); auto linear = _applyLinearGradientProperty(style->stroke.paint.gradient, vg, bBox, style->stroke.opacity);