git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 21:53:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge "SvgLoader: Inherit parent opacity" into tizen

Browse source
This commit is contained in:
Hermet Park 2020-07-10 00:50:38 +00:00 • committed by Gerrit Code Review
commit 2deb6919c7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/loaders/svg_loader/tvgSvgSceneBuilder.cpp
View file

@ -356,7 +356,7 @@ unique_ptr<Shape> _shapeBuildHelper(SvgNode* node, float vx, float vy, float vw,
} }
unique_ptr<Scene> _sceneBuildHelper(SvgNode* node, float vx, float vy, float vw, float vh) unique_ptr<Scene> _sceneBuildHelper(SvgNode* node, float vx, float vy, float vw, float vh, int parentOpacity)
{ {
if (node->type == SvgNodeType::Doc || node->type == SvgNodeType::G) { if (node->type == SvgNodeType::Doc || node->type == SvgNodeType::G) {
auto scene = Scene::gen(); auto scene = Scene::gen();
@ -367,9 +367,11 @@ unique_ptr<Scene> _sceneBuildHelper(SvgNode* node, float vx, float vy, float vw,
if (!(fmod(fabsf(z), 360.0) <= FLT_EPSILON)) scene->rotate(fmod(z, 360.0)); if (!(fmod(fabsf(z), 360.0) <= FLT_EPSILON)) scene->rotate(fmod(z, 360.0));
if (!(fabsf(tx) <= FLT_EPSILON) && !(fabsf(ty) <= FLT_EPSILON)) scene->translate(tx, ty); if (!(fabsf(tx) <= FLT_EPSILON) && !(fabsf(ty) <= FLT_EPSILON)) scene->translate(tx, ty);
} }
node->style->opacity = (node->style->opacity * parentOpacity) / 255;
for (vector<SvgNode*>::iterator itrChild = node->child.begin(); itrChild != node->child.end(); itrChild++) { for (vector<SvgNode*>::iterator itrChild = node->child.begin(); itrChild != node->child.end(); itrChild++) {
SvgNode* child = *itrChild; SvgNode* child = *itrChild;
if (child->type == SvgNodeType::Doc || child->type == SvgNodeType::G) scene->push(_sceneBuildHelper(*itrChild, vx, vy, vw, vh)); child->style->opacity = (child->style->opacity * node->style->opacity) / 255;
if (child->type == SvgNodeType::Doc || child->type == SvgNodeType::G) scene->push(_sceneBuildHelper(*itrChild, vx, vy, vw, vh, node->style->opacity));
else scene->push(_shapeBuildHelper(*itrChild, vx, vy, vw, vh)); else scene->push(_shapeBuildHelper(*itrChild, vx, vy, vw, vh));
} }
return move(scene); return move(scene);
@ -398,7 +400,7 @@ unique_ptr<Scene> SvgSceneBuilder::build(SvgNode* node)
viewBox.h = node->node.doc.vh; viewBox.h = node->node.doc.vh;
preserveAspect = node->node.doc.preserveAspect; preserveAspect = node->node.doc.preserveAspect;
staticViewBox = true; staticViewBox = true;
return _sceneBuildHelper(node, viewBox.x, viewBox.y, viewBox.w, viewBox.h); return _sceneBuildHelper(node, viewBox.x, viewBox.y, viewBox.w, viewBox.h, 255);
} }