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

svg_loader: mask node loaded as a scene

Browse source 
Since the mask is a container element (in opposite to the clipPath),
it has to be loaded as a scene.
This commit is contained in:
Mira Grudzinska 2021-11-03 01:46:28 +01:00 • committed by Hermet Park
parent 40f2baabae
commit 0501863195
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@
#include <float.h>
static bool _appendShape(SvgNode* node, Shape* shape, float vx, float vy, float vw, float vh);
static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath);
static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath, bool mask);
/************************************************************************/
/* Internal Class Implementation */
@ -255,19 +255,12 @@ static void _applyComposition(Paint* paint, const SvgNode* node, float vx, float
if (compNode && compNode->child.count > 0) {
node->style->mask.applying = true;
auto comp = Shape::gen();
comp->fill(255, 255, 255, 255);
if (node->transform) comp->transform(*node->transform);
auto child = compNode->child.data;
auto valid = false; //Composite only when valid shapes are existed
for (uint32_t i = 0; i < compNode->child.count; ++i, ++child) {
if (_appendChildShape(*child, comp.get(), vx, vy, vw, vh)) valid = true;
auto comp = _sceneBuildHelper(compNode, vx, vy, vw, vh, "", true);
if (comp) {
if (node->transform) comp->transform(*node->transform);
paint->composite(move(comp), CompositeMethod::AlphaMask);
}
if (valid) paint->composite(move(comp), CompositeMethod::AlphaMask);
node->style->mask.applying = false;
}
}
@ -553,7 +546,7 @@ static unique_ptr<Picture> _imageBuildHelper(SvgNode* node, float vx, float vy,
static unique_ptr<Scene> _useBuildHelper(const SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath)
{
auto scene = _sceneBuildHelper(node, vx, vy, vw, vh, svgPath);
auto scene = _sceneBuildHelper(node, vx, vy, vw, vh, svgPath, false);
if (node->node.use.x != 0.0f || node->node.use.y != 0.0f) {
scene->translate(node->node.use.x, node->node.use.y);
}
@ -564,9 +557,9 @@ static unique_ptr<Scene> _useBuildHelper(const SvgNode* node, float vx, float vy
}
static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath)
static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath, bool mask)
{
if (_isGroupType(node->type)) {
if (_isGroupType(node->type) || mask) {
auto scene = Scene::gen();
if (node->transform) scene->transform(*node->transform);
@ -577,11 +570,11 @@ static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float
if ((*child)->type == SvgNodeType::Use)
scene->push(_useBuildHelper(*child, vx, vy, vw, vh, svgPath));
else
scene->push(_sceneBuildHelper(*child, vx, vy, vw, vh, svgPath));
scene->push(_sceneBuildHelper(*child, vx, vy, vw, vh, svgPath, false));
} else if ((*child)->type == SvgNodeType::Image) {
auto image = _imageBuildHelper(*child, vx, vy, vw, vh, svgPath);
if (image) scene->push(move(image));
} else {
} else if ((*child)->type != SvgNodeType::Mask) {
auto shape = _shapeBuildHelper(*child, vx, vy, vw, vh);
if (shape) scene->push(move(shape));
}
@ -603,7 +596,7 @@ unique_ptr<Scene> svgSceneBuild(SvgNode* node, float vx, float vy, float vw, flo
{
if (!node || (node->type != SvgNodeType::Doc)) return nullptr;
auto docNode = _sceneBuildHelper(node, vx, vy, vw, vh, svgPath);
auto docNode = _sceneBuildHelper(node, vx, vy, vw, vh, svgPath, false);
if (fabsf(w - vw) > FLT_EPSILON || fabsf(h - vh) > FLT_EPSILON) {
auto sx = w / vw;