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

lottie/builder: revise the masking update.

Browse source 
Append the mask shape to the previous one, instead of composition,
when it's able by the condition.

issue: https://github.com/thorvg/thorvg/issues/2426
This commit is contained in:
Hermet Park 2024-07-02 13:59:39 +09:00 • committed by Hermet Park
parent 29325c0ff9
commit 269ef22a97
1 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1144,44 +1144,39 @@ static void _updateMaskings(LottieLayer* layer, float frameNo, LottieExpressions
{ {
if (layer->masks.count == 0) return; if (layer->masks.count == 0) return;
//maskings //Apply the base mask
Shape* pmask = nullptr; auto pMask = static_cast<LottieMask*>(layer->masks[0]);
auto pmethod = CompositeMethod::None; auto pMethod = pMask->method;
for (auto m = layer->masks.begin(); m < layer->masks.end(); ++m) { auto pShape = Shape::gen().release();
pShape->fill(255, 255, 255, pMask->opacity(frameNo));
pShape->transform(layer->cache.matrix);
if (pMask->pathset(frameNo, P(pShape)->rs.path.cmds, P(pShape)->rs.path.pts, nullptr, 0.0f, exps)) {
P(pShape)->update(RenderUpdateFlag::Path);
}
layer->scene->composite(tvg::cast(pShape), (pMethod == CompositeMethod::SubtractMask) ? CompositeMethod::InvAlphaMask : CompositeMethod::AlphaMask);
//Apply the subsquent masks
for (auto m = layer->masks.begin() + 1; m < layer->masks.end(); ++m) {
auto mask = static_cast<LottieMask*>(*m); auto mask = static_cast<LottieMask*>(*m);
auto method = mask->method; auto method = mask->method;
if (method == CompositeMethod::None) continue;
//FIXME: None method mask should be appended to the root layer? //Append the mask shape
if (method == CompositeMethod::None) { if (pMethod == method && (method == CompositeMethod::SubtractMask || method == CompositeMethod::DifferenceMask)) {
pmethod = method; mask->pathset(frameNo, P(pShape)->rs.path.cmds, P(pShape)->rs.path.pts, nullptr, 0.0f, exps);
continue; //Chain composition
}
//Masking shape
auto shape = Shape::gen().release();
shape->fill(255, 255, 255, mask->opacity(frameNo));
shape->transform(layer->cache.matrix);
if (mask->pathset(frameNo, P(shape)->rs.path.cmds, P(shape)->rs.path.pts, nullptr, 0.0f, exps)) {
P(shape)->update(RenderUpdateFlag::Path);
}
//Append the chain-masking composition
if (pmask) {
//false of false is true. invert?
if (pmethod == method) {
if (method == CompositeMethod::SubtractMask) method = CompositeMethod::AddMask;
else if (method == CompositeMethod::DifferenceMask) method = CompositeMethod::IntersectMask;
}
pmask->composite(cast<Shape>(shape), method);
//Apply the masking
} else { } else {
method = (method == CompositeMethod::SubtractMask) ? CompositeMethod::InvAlphaMask : CompositeMethod::AlphaMask; auto shape = Shape::gen().release();
layer->scene->composite(cast<Shape>(shape), method); shape->fill(255, 255, 255, mask->opacity(frameNo));
shape->transform(layer->cache.matrix);
if (mask->pathset(frameNo, P(shape)->rs.path.cmds, P(shape)->rs.path.pts, nullptr, 0.0f, exps)) {
P(shape)->update(RenderUpdateFlag::Path);
}
pShape->composite(tvg::cast(shape), method);
pShape = shape;
pMethod = method;
} }
pmethod = mask->method;
pmask = shape;
} }
} }