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

loader/lottie: ++optimization.

Browse source 
Removed intermediate scenes that were nothing more than transformations.
This commit is contained in:
Hermet Park 2023-08-21 19:46:40 +09:00
parent 9ba44dc10b
commit b240e781d9
2 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/tvgCommon.h
View file

@ -83,6 +83,6 @@ using Size = Point;
uint16_t THORVG_VERSION_NUMBER(); uint16_t THORVG_VERSION_NUMBER();
#define P(A) (A->pImpl) //Access to pimpl. #define P(A) ((A)->pImpl) //Access to pimpl.
#endif //_TVG_COMMON_H_ #endif //_TVG_COMMON_H_

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

@ -35,25 +35,6 @@ static void _updateChildren(LottieGroup* parent, int32_t frameNo, Shape* baseSha
static void _updateLayer(LottieLayer* root, LottieLayer* layer, int32_t frameNo); static void _updateLayer(LottieLayer* root, LottieLayer* layer, int32_t frameNo);
static bool _buildPrecomp(LottieComposition* comp, LottieGroup* parent); static bool _buildPrecomp(LottieComposition* comp, LottieGroup* parent);
static bool _invisible(LottieGroup* group, int32_t frameNo)
{
auto opacity = group->opacity(frameNo);
if (group->scene) group->scene->opacity(opacity);
if (opacity == 0) return true;
else return false;
}
static bool _invisible(LottieLayer* layer, int32_t frameNo)
{
if (frameNo < layer->inFrame || frameNo > layer->outFrame) {
if (layer->scene) layer->scene->opacity(0);
return true;
}
return _invisible(static_cast<LottieGroup*>(layer), frameNo);
}
static bool _updateTransform(LottieTransform* transform, int32_t frameNo, bool autoOrient, Matrix& matrix, uint8_t& opacity) static bool _updateTransform(LottieTransform* transform, int32_t frameNo, bool autoOrient, Matrix& matrix, uint8_t& opacity)
{ {
@ -127,19 +108,22 @@ static Shape* _updateTransform(Paint* paint, LottieTransform* transform, int32_t
static Shape* _updateGroup(LottieGroup* parent, LottieGroup* group, int32_t frameNo, Shape* baseShape) static Shape* _updateGroup(LottieGroup* parent, LottieGroup* group, int32_t frameNo, Shape* baseShape)
{ {
//Prepare render data //Prepare render data
auto scene = Scene::gen(); group->scene = parent->scene;
group->scene = scene.get();
parent->scene->push(std::move(scene));
if (_invisible(group, frameNo)) return nullptr; auto opacity = group->opacity(frameNo);
if (opacity == 0) return nullptr;
if (group->transform) { if (group->transform) {
TVGERR("LOTTIE", "group transform is not working!");
#if 0
Matrix matrix; Matrix matrix;
uint8_t opacity;
_updateTransform(group->transform, frameNo, false, matrix, opacity); _updateTransform(group->transform, frameNo, false, matrix, opacity);
group->scene->transform(matrix); auto pmatrix = P((Paint*)group->scene)->transform();
group->scene->opacity(opacity); group->scene->transform(pmatrix ? mathMultiply(pmatrix, &matrix) : matrix);
if (opacity < 255) group->scene->opacity(MULTIPLY(opacity, group->scene->opacity()));
#endif
} }
_updateChildren(group, frameNo, baseShape); _updateChildren(group, frameNo, baseShape);
return nullptr; return nullptr;
} }
@ -388,15 +372,15 @@ static void _updateMaskings(LottieLayer* layer, int32_t frameNo)
static void _updateLayer(LottieLayer* root, LottieLayer* layer, int32_t frameNo) static void _updateLayer(LottieLayer* root, LottieLayer* layer, int32_t frameNo)
{ {
layer->scene = nullptr; //visibility
if (frameNo < layer->inFrame || frameNo > layer->outFrame) return;
if (_invisible(layer, frameNo)) return; auto opacity = layer->opacity(frameNo);
if (opacity == 0) return;
//Prepare render data
layer->scene = Scene::gen().release();
_updateTransform(layer, frameNo); _updateTransform(layer, frameNo);
//Prepare render data
layer->scene = Scene::gen().release();
layer->scene->transform(layer->cache.matrix); layer->scene->transform(layer->cache.matrix);
//FIXME: Ignore opacity when Null layer? //FIXME: Ignore opacity when Null layer?