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

lottie: code clean up++

Browse source
This commit is contained in:
Hermet Park 2025-02-26 19:00:01 +09:00
parent 7ef3352efa
commit 9a79dd0267
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -377,15 +377,12 @@ static void _repeat(LottieGroup* parent, Shape* path, RenderContext* ctx)
void LottieBuilder::appendRect(Shape* shape, Point& pos, Point& size, float r, bool clockwise, RenderContext* ctx) void LottieBuilder::appendRect(Shape* shape, Point& pos, Point& size, float r, bool clockwise, RenderContext* ctx)
{ {
auto temp = (ctx->offset) ? Shape::gen() : shape; auto temp = (ctx->offset) ? Shape::gen() : shape;
auto cnt = SHAPE(temp)->rs.path.pts.count;
auto before = SHAPE(temp)->rs.path.pts.count;
temp->appendRect(pos.x, pos.y, size.x, size.y, r, r, clockwise); temp->appendRect(pos.x, pos.y, size.x, size.y, r, r, clockwise);
auto after = SHAPE(temp)->rs.path.pts.count;
if (ctx->transform) { if (ctx->transform) {
for (uint32_t i = before; i < after; ++i) { for (auto i = cnt; i < SHAPE(temp)->rs.path.pts.count; ++i) {
SHAPE(temp)->rs.path.pts[i] *= *ctx->transform; SHAPE(temp)->rs.path.pts[i] *= *ctx->transform;
} }
} }
@ -410,14 +407,14 @@ void LottieBuilder::updateRect(LottieGroup* parent, LottieObject** child, float
r = std::min({r, size.x * 0.5f, size.y * 0.5f}); r = std::min({r, size.x * 0.5f, size.y * 0.5f});
} }
if (!ctx->repeaters.empty()) { if (ctx->repeaters.empty()) {
_draw(parent, rect, ctx);
appendRect(ctx->merging, pos, size, r, rect->clockwise, ctx);
} else {
auto shape = rect->pooling(); auto shape = rect->pooling();
shape->reset(); shape->reset();
appendRect(shape, pos, size, r, rect->clockwise, ctx); appendRect(shape, pos, size, r, rect->clockwise, ctx);
_repeat(parent, shape, ctx); _repeat(parent, shape, ctx);
} else {
_draw(parent, rect, ctx);
appendRect(ctx->merging, pos, size, r, rect->clockwise, ctx);
} }
} }
@ -426,15 +423,12 @@ static void _appendCircle(Shape* shape, Point& center, Point& radius, bool clock
{ {
if (ctx->offset) ctx->offset->modifyEllipse(radius); if (ctx->offset) ctx->offset->modifyEllipse(radius);
auto before = SHAPE(shape)->rs.path.pts.count; auto cnt = SHAPE(shape)->rs.path.pts.count;
shape->appendCircle(center.x, center.y, radius.x, radius.y, clockwise); shape->appendCircle(center.x, center.y, radius.x, radius.y, clockwise);
auto after = SHAPE(shape)->rs.path.pts.count;
if (ctx->transform) { if (ctx->transform) {
for (uint32_t i = before; i < after; ++i) { for (auto i = cnt; i < SHAPE(shape)->rs.path.pts.count; ++i) {
SHAPE(shape)->rs.path.pts[i] *= *ctx->transform; SHAPE(shape)->rs.path.pts[i] *= *ctx->transform;
} }
} }
@ -444,7 +438,6 @@ static void _appendCircle(Shape* shape, Point& center, Point& radius, bool clock
void LottieBuilder::updateEllipse(LottieGroup* parent, LottieObject** child, float frameNo, TVG_UNUSED Inlist<RenderContext>& contexts, RenderContext* ctx) void LottieBuilder::updateEllipse(LottieGroup* parent, LottieObject** child, float frameNo, TVG_UNUSED Inlist<RenderContext>& contexts, RenderContext* ctx)
{ {
auto ellipse = static_cast<LottieEllipse*>(*child); auto ellipse = static_cast<LottieEllipse*>(*child);
auto pos = ellipse->position(frameNo, tween, exps); auto pos = ellipse->position(frameNo, tween, exps);
auto size = ellipse->size(frameNo, tween, exps) * 0.5f; auto size = ellipse->size(frameNo, tween, exps) * 0.5f;
@ -690,17 +683,17 @@ void LottieBuilder::updatePolystar(LottieGroup* parent, LottieObject** child, fl
auto identity = tvg::identity((const Matrix*)&matrix); auto identity = tvg::identity((const Matrix*)&matrix);
if (!ctx->repeaters.empty()) { if (ctx->repeaters.empty()) {
_draw(parent, star, ctx);
if (star->type == LottiePolyStar::Star) updateStar(star, frameNo, (identity ? nullptr : &matrix), ctx->merging, ctx, tween, exps);
else updatePolygon(parent, star, frameNo, (identity ? nullptr : &matrix), ctx->merging, ctx, tween, exps);
PAINT(ctx->merging)->update(RenderUpdateFlag::Path);
} else {
auto shape = star->pooling(); auto shape = star->pooling();
shape->reset(); shape->reset();
if (star->type == LottiePolyStar::Star) updateStar(star, frameNo, (identity ? nullptr : &matrix), shape, ctx, tween, exps); if (star->type == LottiePolyStar::Star) updateStar(star, frameNo, (identity ? nullptr : &matrix), shape, ctx, tween, exps);
else updatePolygon(parent, star, frameNo, (identity ? nullptr : &matrix), shape, ctx, tween, exps); else updatePolygon(parent, star, frameNo, (identity ? nullptr : &matrix), shape, ctx, tween, exps);
_repeat(parent, shape, ctx); _repeat(parent, shape, ctx);
} else {
_draw(parent, star, ctx);
if (star->type == LottiePolyStar::Star) updateStar(star, frameNo, (identity ? nullptr : &matrix), ctx->merging, ctx, tween, exps);
else updatePolygon(parent, star, frameNo, (identity ? nullptr : &matrix), ctx->merging, ctx, tween, exps);
PAINT(ctx->merging)->update(RenderUpdateFlag::Path);
} }
} }