git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-07-23 14:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

lottie: fixed a repeater opacity logic

Browse source 
preserve the target opacity by multiplying,
do not overwrite it.
This commit is contained in:
Hermet Park 2025-06-09 18:42:56 +09:00 • committed by Mira Grudzinska
parent 16d3ff75dc
commit a2f9b30c58
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -354,9 +354,8 @@ static void _repeat(LottieGroup* parent, Shape* path, RenderContext* ctx)
for (auto propagator = propagators.begin(); propagator < propagators.end(); ++propagator) {
auto shape = static_cast<Shape*>((*propagator)->duplicate());
P(shape)->rs.path = P(path)->rs.path;
auto opacity = repeater->interpOpacity ? lerp<uint8_t>(repeater->startOpacity, repeater->endOpacity, static_cast<float>(i + 1) / repeater->cnt) : repeater->startOpacity;
shape->opacity(opacity);
auto opacity = tvg::lerp<uint8_t>(repeater->startOpacity, repeater->endOpacity, static_cast<float>(i + 1) / repeater->cnt);
shape->opacity(MULTIPLY(shape->opacity(), opacity));
Matrix m;
identity(&m);
@ -364,11 +363,10 @@ static void _repeat(LottieGroup* parent, Shape* path, RenderContext* ctx)
scale(&m, powf(repeater->scale.x * 0.01f, multiplier), powf(repeater->scale.y * 0.01f, multiplier));
rotate(&m, repeater->rotation * multiplier);
translateR(&m, -repeater->anchor.x, -repeater->anchor.y);
m = repeater->transform * m;
Matrix inv;
inverse(&repeater->transform, &inv);
shape->transform(m * (inv * PP(shape)->transform()));
shape->transform((repeater->transform * m) * (inv * PP(shape)->transform()));
shapes.push(shape);
}
}
@ -856,7 +854,6 @@ void LottieBuilder::updateRepeater(TVG_UNUSED LottieGroup* parent, LottieObject*
r.startOpacity = repeater->startOpacity(frameNo, exps);
r.endOpacity = repeater->endOpacity(frameNo, exps);
r.inorder = repeater->inorder;
r.interpOpacity = (r.startOpacity == r.endOpacity) ? false : true;
ctx->repeaters.push(r);
ctx->merging = nullptr;

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

@ -43,7 +43,6 @@ struct RenderRepeater
float rotation;
uint8_t startOpacity;
uint8_t endOpacity;
bool interpOpacity;
bool inorder;
};