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

svg_loader: passing the svgPath information into the _applyComposition

Browse source 
An image can be a mask, so the information about it's path is necessary
during a composition application.
This commit is contained in:
Mira Grudzinska 2021-11-04 02:20:37 +01:00 • committed by Hermet Park
parent 0501863195
commit b85eaddcf2
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,7 @@
#include "tvgSvgUtil.h" #include "tvgSvgUtil.h"
#include <float.h> #include <float.h>
static bool _appendShape(SvgNode* node, Shape* shape, float vx, float vy, float vw, float vh); static bool _appendShape(SvgNode* node, Shape* shape, 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); static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath, bool mask);
/************************************************************************/ /************************************************************************/
@ -199,16 +199,16 @@ static unique_ptr<RadialGradient> _applyRadialGradientProperty(SvgStyleGradient*
} }
static bool _appendChildShape(SvgNode* node, Shape* shape, float vx, float vy, float vw, float vh) static bool _appendChildShape(SvgNode* node, Shape* shape, float vx, float vy, float vw, float vh, const string& svgPath)
{ {
auto valid = false; auto valid = false;
if (_appendShape(node, shape, vx, vy, vw, vh)) valid = true; if (_appendShape(node, shape, vx, vy, vw, vh, svgPath)) valid = true;
if (node->child.count > 0) { if (node->child.count > 0) {
auto child = node->child.data; auto child = node->child.data;
for (uint32_t i = 0; i < node->child.count; ++i, ++child) { for (uint32_t i = 0; i < node->child.count; ++i, ++child) {
if (_appendChildShape(*child, shape, vx, vy, vw, vh)) valid = true; if (_appendChildShape(*child, shape, vx, vy, vw, vh, svgPath)) valid = true;
} }
} }
@ -216,7 +216,7 @@ static bool _appendChildShape(SvgNode* node, Shape* shape, float vx, float vy, f
} }
static void _applyComposition(Paint* paint, const SvgNode* node, float vx, float vy, float vw, float vh) static void _applyComposition(Paint* paint, const SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath)
{ {
/* ClipPath */ /* ClipPath */
/* Do not drop in Circular Dependency for ClipPath. /* Do not drop in Circular Dependency for ClipPath.
@ -236,7 +236,7 @@ static void _applyComposition(Paint* paint, const SvgNode* node, float vx, float
auto valid = false; //Composite only when valid shapes are existed auto valid = false; //Composite only when valid shapes are existed
for (uint32_t i = 0; i < compNode->child.count; ++i, ++child) { for (uint32_t i = 0; i < compNode->child.count; ++i, ++child) {
if (_appendChildShape(*child, comp.get(), vx, vy, vw, vh)) valid = true; if (_appendChildShape(*child, comp.get(), vx, vy, vw, vh, svgPath)) valid = true;
} }
if (valid) paint->composite(move(comp), CompositeMethod::ClipPath); if (valid) paint->composite(move(comp), CompositeMethod::ClipPath);
@ -255,7 +255,7 @@ static void _applyComposition(Paint* paint, const SvgNode* node, float vx, float
if (compNode && compNode->child.count > 0) { if (compNode && compNode->child.count > 0) {
node->style->mask.applying = true; node->style->mask.applying = true;
auto comp = _sceneBuildHelper(compNode, vx, vy, vw, vh, "", true); auto comp = _sceneBuildHelper(compNode, vx, vy, vw, vh, svgPath, true);
if (comp) { if (comp) {
if (node->transform) comp->transform(*node->transform); if (node->transform) comp->transform(*node->transform);
paint->composite(move(comp), CompositeMethod::AlphaMask); paint->composite(move(comp), CompositeMethod::AlphaMask);
@ -267,7 +267,7 @@ static void _applyComposition(Paint* paint, const SvgNode* node, float vx, float
} }
static void _applyProperty(SvgNode* node, Shape* vg, float vx, float vy, float vw, float vh) static void _applyProperty(SvgNode* node, Shape* vg, float vx, float vy, float vw, float vh, const string& svgPath)
{ {
SvgStyleProperty* style = node->style; SvgStyleProperty* style = node->style;
@ -356,19 +356,19 @@ static void _applyProperty(SvgNode* node, Shape* vg, float vx, float vy, float v
vg->stroke(style->stroke.paint.color.r, style->stroke.paint.color.g, style->stroke.paint.color.b, style->stroke.opacity); vg->stroke(style->stroke.paint.color.r, style->stroke.paint.color.g, style->stroke.paint.color.b, style->stroke.opacity);
} }
_applyComposition(vg, node, vx, vy, vw, vh); _applyComposition(vg, node, vx, vy, vw, vh, svgPath);
} }
static unique_ptr<Shape> _shapeBuildHelper(SvgNode* node, float vx, float vy, float vw, float vh) static unique_ptr<Shape> _shapeBuildHelper(SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath)
{ {
auto shape = Shape::gen(); auto shape = Shape::gen();
if (_appendShape(node, shape.get(), vx, vy, vw, vh)) return shape; if (_appendShape(node, shape.get(), vx, vy, vw, vh, svgPath)) return shape;
else return nullptr; else return nullptr;
} }
static bool _appendShape(SvgNode* node, Shape* shape, float vx, float vy, float vw, float vh) static bool _appendShape(SvgNode* node, Shape* shape, float vx, float vy, float vw, float vh, const string& svgPath)
{ {
Array<PathCommand> cmds; Array<PathCommand> cmds;
Array<Point> pts; Array<Point> pts;
@ -421,7 +421,7 @@ static bool _appendShape(SvgNode* node, Shape* shape, float vx, float vy, float
} }
} }
_applyProperty(node, shape, vx, vy, vw, vh); _applyProperty(node, shape, vx, vy, vw, vh, svgPath);
return true; return true;
} }
@ -539,7 +539,7 @@ static unique_ptr<Picture> _imageBuildHelper(SvgNode* node, float vx, float vy,
picture->transform(m); picture->transform(m);
} }
_applyComposition(picture.get(), node, vx, vy, vw, vh); _applyComposition(picture.get(), node, vx, vy, vw, vh, svgPath);
return picture; return picture;
} }
@ -561,7 +561,7 @@ static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float
{ {
if (_isGroupType(node->type) || mask) { if (_isGroupType(node->type) || mask) {
auto scene = Scene::gen(); auto scene = Scene::gen();
if (node->transform) scene->transform(*node->transform); if (!mask && node->transform) scene->transform(*node->transform);
if (node->display && node->style->opacity != 0) { if (node->display && node->style->opacity != 0) {
auto child = node->child.data; auto child = node->child.data;
@ -575,11 +575,11 @@ static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float
auto image = _imageBuildHelper(*child, vx, vy, vw, vh, svgPath); auto image = _imageBuildHelper(*child, vx, vy, vw, vh, svgPath);
if (image) scene->push(move(image)); if (image) scene->push(move(image));
} else if ((*child)->type != SvgNodeType::Mask) { } else if ((*child)->type != SvgNodeType::Mask) {
auto shape = _shapeBuildHelper(*child, vx, vy, vw, vh); auto shape = _shapeBuildHelper(*child, vx, vy, vw, vh, svgPath);
if (shape) scene->push(move(shape)); if (shape) scene->push(move(shape));
} }
} }
_applyComposition(scene.get(), node, vx, vy, vw, vh); _applyComposition(scene.get(), node, vx, vy, vw, vh, svgPath);
scene->opacity(node->style->opacity); scene->opacity(node->style->opacity);
} }
return scene; return scene;