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

lottie: support matte+masking combination

Browse source 
introduced an intermediate scene for embracing
the matte and maskings
This commit is contained in:
Hermet Park 2024-08-08 11:48:09 +09:00 • committed by Hermet Park
parent 69dccc326a
commit 3e78a95b57
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1195,6 +1195,13 @@ static void _updateMaskings(LottieLayer* layer, float frameNo, LottieExpressions
{ {
if (layer->masks.count == 0) return; if (layer->masks.count == 0) return;
//Introduce an intermediate scene for embracing the matte + masking
if (layer->matteTarget) {
auto scene = Scene::gen().release();
scene->push(cast(layer->scene));
layer->scene = scene;
}
//Apply the base mask //Apply the base mask
auto pMask = static_cast<LottieMask*>(layer->masks[0]); auto pMask = static_cast<LottieMask*>(layer->masks[0]);
auto pMethod = pMask->method; auto pMethod = pMask->method;
@ -1277,12 +1284,8 @@ static void _updateLayer(LottieComposition* comp, Scene* scene, LottieLayer* lay
layer->scene->transform(layer->cache.matrix); layer->scene->transform(layer->cache.matrix);
if (layer->matteTarget && layer->masks.count > 0) TVGERR("LOTTIE", "FIXME: Matte + Masking??");
if (!_updateMatte(comp, frameNo, scene, layer, exps)) return; if (!_updateMatte(comp, frameNo, scene, layer, exps)) return;
_updateMaskings(layer, frameNo, exps);
switch (layer->type) { switch (layer->type) {
case LottieLayer::Precomp: { case LottieLayer::Precomp: {
_updatePrecomp(comp, layer, frameNo, exps); _updatePrecomp(comp, layer, frameNo, exps);
@ -1311,6 +1314,8 @@ static void _updateLayer(LottieComposition* comp, Scene* scene, LottieLayer* lay
} }
} }
_updateMaskings(layer, frameNo, exps);
layer->scene->blend(layer->blendMethod); layer->scene->blend(layer->blendMethod);
//the given matte source was composited by the target earlier. //the given matte source was composited by the target earlier.