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

lottie: fix points calculation for rounded polygon

Browse source 
Added missing factor.

issue: https://github.com/thorvg/thorvg/issues/2629
This commit is contained in:
Mira Grudzinska 2025-05-14 04:34:01 +02:00 • committed by Hermet Park
parent bb6458b50a
commit 751ad1c1ec
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -719,7 +719,7 @@ static void _updatePolygon(LottieGroup* parent, LottiePolyStar* star, Matrix* tr
auto radius = star->outerRadius(frameNo, exps); auto radius = star->outerRadius(frameNo, exps);
auto outerRoundness = star->outerRoundness(frameNo, exps) * 0.01f; auto outerRoundness = star->outerRoundness(frameNo, exps) * 0.01f;
auto angle = deg2rad(-90.0f); auto angle = -MATH_PI2;
auto anglePerPoint = 2.0f * MATH_PI / float(ptsCnt); auto anglePerPoint = 2.0f * MATH_PI / float(ptsCnt);
auto direction = star->clockwise ? 1.0f : -1.0f; auto direction = star->clockwise ? 1.0f : -1.0f;
auto hasRoundness = !tvg::zero(outerRoundness); auto hasRoundness = !tvg::zero(outerRoundness);
@ -748,6 +748,7 @@ static void _updatePolygon(LottieGroup* parent, LottiePolyStar* star, Matrix* tr
if (transform) in *= *transform; if (transform) in *= *transform;
shape->moveTo(in.x, in.y); shape->moveTo(in.x, in.y);
auto coeff = anglePerPoint * radius * outerRoundness * POLYGON_MAGIC_NUMBER;
for (size_t i = 0; i < ptsCnt; i++) { for (size_t i = 0; i < ptsCnt; i++) {
auto previousX = x; auto previousX = x;
auto previousY = y; auto previousY = y;
@ -756,16 +757,11 @@ static void _updatePolygon(LottieGroup* parent, LottiePolyStar* star, Matrix* tr
if (hasRoundness) { if (hasRoundness) {
auto cp1Theta = tvg::atan2(previousY, previousX) - MATH_PI2 * direction; auto cp1Theta = tvg::atan2(previousY, previousX) - MATH_PI2 * direction;
auto cp1Dx = cosf(cp1Theta); auto cp1x = coeff * cosf(cp1Theta);
auto cp1Dy = sinf(cp1Theta); auto cp1y = coeff * sinf(cp1Theta);
auto cp2Theta = tvg::atan2(y, x) - MATH_PI2 * direction; auto cp2Theta = tvg::atan2(y, x) - MATH_PI2 * direction;
auto cp2Dx = cosf(cp2Theta); auto cp2x = coeff * cosf(cp2Theta);
auto cp2Dy = sinf(cp2Theta); auto cp2y = coeff * sinf(cp2Theta);
auto cp1x = radius * outerRoundness * POLYGON_MAGIC_NUMBER * cp1Dx;
auto cp1y = radius * outerRoundness * POLYGON_MAGIC_NUMBER * cp1Dy;
auto cp2x = radius * outerRoundness * POLYGON_MAGIC_NUMBER * cp2Dx;
auto cp2y = radius * outerRoundness * POLYGON_MAGIC_NUMBER * cp2Dy;
Point in2 = {previousX - cp1x, previousY - cp1y}; Point in2 = {previousX - cp1x, previousY - cp1y};
Point in3 = {x + cp2x, y + cp2y}; Point in3 = {x + cp2x, y + cp2y};