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

lottie: multiply opacity to the fill alpha value,

Browse source 
opacity of a shape may bring a composition
when it has both stroke and fill
This commit is contained in:
Hermet Park 2024-10-17 15:42:28 +09:00 • committed by Hermet Park
parent 7e8eee6e3b
commit f5af7b13a5
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/loaders/lottie/tvgLottieBuilder.cpp
View file

@ -304,7 +304,6 @@ void LottieBuilder::updateGradientFill(LottieGroup* parent, LottieObject** child
//TODO: reuse the fill instance? //TODO: reuse the fill instance?
ctx->propagator->fill(unique_ptr<Fill>(fill->fill(frameNo, exps))); ctx->propagator->fill(unique_ptr<Fill>(fill->fill(frameNo, exps)));
ctx->propagator->fill(fill->rule); ctx->propagator->fill(fill->rule);
ctx->propagator->opacity(MULTIPLY(fill->opacity(frameNo), PP(ctx->propagator)->opacity));
if (ctx->propagator->strokeWidth() > 0) ctx->propagator->order(true); if (ctx->propagator->strokeWidth() > 0) ctx->propagator->order(true);
} }

12
src/loaders/lottie/tvgLottieModel.cpp
View file

@ -272,6 +272,9 @@ uint32_t LottieGradient::populate(ColorStop& color, size_t count)
Fill* LottieGradient::fill(float frameNo, LottieExpressions* exps) Fill* LottieGradient::fill(float frameNo, LottieExpressions* exps)
{ {
auto opacity = this->opacity(frameNo);
if (opacity == 0) return nullptr;
Fill* fill = nullptr; Fill* fill = nullptr;
auto s = start(frameNo, exps); auto s = start(frameNo, exps);
auto e = end(frameNo, exps); auto e = end(frameNo, exps);
@ -307,6 +310,15 @@ Fill* LottieGradient::fill(float frameNo, LottieExpressions* exps)
colorStops(frameNo, fill, exps); colorStops(frameNo, fill, exps);
//multiply the current opacity with the fill
if (opacity < 255) {
const Fill::ColorStop* colorStops;
auto cnt = fill->colorStops(&colorStops);
for (uint32_t i = 0; i < cnt; ++i) {
const_cast<Fill::ColorStop*>(&colorStops[i])->a = MULTIPLY(colorStops[i].a, opacity);
}
}
return fill; return fill;
} }