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

lottie: improvement 3d rotation

Browse source 
For rotation around the X and Y axes, the transformation
matrix was incorrectly created - elements e12 and e21
were omitted. Now fixed.
This commit is contained in:
Mira Grudzinska 2024-07-09 22:49:26 +02:00 • committed by Hermet Park
parent 8fceba01d2
commit 29b06e0d9a
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,19 +102,20 @@ static void _updateLayer(LottieLayer* root, LottieLayer* layer, float frameNo, L
static bool _buildComposition(LottieComposition* comp, LottieLayer* parent);
static bool _draw(LottieGroup* parent, RenderContext* ctx);
static void _rotateX(Matrix* m, float degree)
{
if (degree == 0.0f) return;
auto radian = mathDeg2Rad(degree);
m->e22 *= cosf(radian);
}
static void _rotateY(Matrix* m, float degree)
static void _rotationXYZ(Matrix* m, float degreeX, float degreeY, float degreeZ)
{
if (degree == 0.0f) return;
auto radian = mathDeg2Rad(degree);
m->e11 *= cosf(radian);
auto radianX = mathDeg2Rad(degreeX);
auto radianY = mathDeg2Rad(degreeY);
auto radianZ = mathDeg2Rad(degreeZ);
auto cx = cosf(radianX), sx = sinf(radianX);
auto cy = cosf(radianY), sy = sinf(radianY);;
auto cz = cosf(radianZ), sz = sinf(radianZ);;
m->e11 = cy * cz;
m->e12 = -cy * sz;
m->e21 = sx * sy * cz + cx * sz;
m->e22 = -sx * sy * sz + cx * cz;
}
@ -183,12 +184,9 @@ static bool _updateTransform(LottieTransform* transform, float frameNo, bool aut
auto angle = 0.0f;
if (autoOrient) angle = transform->position.angle(frameNo);
_rotationZ(&matrix, transform->rotation(frameNo, exps) + angle);
if (transform->rotationEx) _rotationXYZ(&matrix, transform->rotationEx->x(frameNo, exps), transform->rotationEx->y(frameNo, exps), transform->rotation(frameNo, exps) + angle);
else _rotationZ(&matrix, transform->rotation(frameNo, exps) + angle);
if (transform->rotationEx) {
_rotateY(&matrix, transform->rotationEx->y(frameNo, exps));
_rotateX(&matrix, transform->rotationEx->x(frameNo, exps));
}
auto skewAngle = transform->skewAngle(frameNo, exps);
if (skewAngle != 0.0f) {