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

lottie: ++ scene composing optimization

Browse source 
retain reusable precomp clipper shapes during animation.
This commit is contained in:
Hermet Park 2024-07-11 00:06:30 +09:00
parent f7728a8b7a
commit 3adee7238c
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1000,18 +1000,21 @@ static void _updatePrecomp(LottieLayer* precomp, float frameNo, LottieExpression
if (!child->matteSrc) _updateLayer(precomp, child, frameNo, exps); if (!child->matteSrc) _updateLayer(precomp, child, frameNo, exps);
} }
//clip the layer viewport //TODO: remove the intermediate scene....
if (precomp->w > 0 && precomp->h > 0) { if (precomp->scene->composite(nullptr) != tvg::CompositeMethod::None) {
auto clipper = Shape::gen().release(); auto cscene = Scene::gen().release();
clipper->appendRect(0, 0, static_cast<float>(precomp->w), static_cast<float>(precomp->h));
clipper->transform(precomp->cache.matrix);
//TODO: remove the intermediate scene....
auto cscene = Scene::gen();
cscene->composite(cast(clipper), CompositeMethod::ClipPath);
cscene->push(cast(precomp->scene)); cscene->push(cast(precomp->scene));
precomp->scene = cscene.release(); precomp->scene = cscene;
} }
//clip the layer viewport
if (!precomp->clipper) {
precomp->clipper = Shape::gen().release();
precomp->clipper->appendRect(0, 0, static_cast<float>(precomp->w), static_cast<float>(precomp->h));
PP(precomp->clipper)->ref();
}
precomp->clipper->transform(precomp->cache.matrix);
precomp->scene->composite(cast(precomp->clipper), CompositeMethod::ClipPath);
} }

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

@ -331,6 +331,8 @@ LottieLayer::~LottieLayer()
delete(*m); delete(*m);
} }
if (clipper && PP(clipper)->unref() == 0) delete(clipper);
delete(transform); delete(transform);
free(name); free(name);
} }

2
src/loaders/lottie/tvgLottieModel.h
View file

@ -594,6 +594,8 @@ struct LottieLayer : LottieGroup
RGB24 color; //used by Solid layer RGB24 color; //used by Solid layer
LottieLayer* matteTarget = nullptr; LottieLayer* matteTarget = nullptr;
tvg::Shape* clipper = nullptr;
float timeStretch = 1.0f; float timeStretch = 1.0f;
float w = 0.0f, h = 0.0f; float w = 0.0f, h = 0.0f;
float inFrame = 0.0f; float inFrame = 0.0f;