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

lottie: enhance support for ao: 1

Browse source 
Adding support for auto-orient=true for frames <= first
and >= last, as well as for positions specified without
outer and inner tangent.
This commit is contained in:
Mira Grudzinska 2024-07-09 01:38:12 +02:00 • committed by Hermet Park
parent 2309770409
commit 49e58eecc0
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/loaders/lottie/tvgLottieProperty.h
View file

@ -154,12 +154,16 @@ struct LottieVectorFrame
float angle(LottieVectorFrame* next, float frameNo) float angle(LottieVectorFrame* next, float frameNo)
{ {
if (!hasTangent) return 0; if (!hasTangent) {
Point dp = next->value - value;
return mathRad2Deg(atan2(dp.y, dp.x));
}
auto t = (frameNo - no) / (next->no - no); auto t = (frameNo - no) / (next->no - no);
if (interpolator) t = interpolator->progress(t); if (interpolator) t = interpolator->progress(t);
Bezier bz = {value, value + outTangent, next->value + inTangent, next->value}; Bezier bz = {value, value + outTangent, next->value + inTangent, next->value};
t = bezAtApprox(bz, t * length, length); t = bezAtApprox(bz, t * length, length);
return -bezAngleAt(bz, t); return bezAngleAt(bz, t >= 1.0f ? 0.99f : (t <= 0.0f ? 0.01f : t));
} }
void prepare(LottieVectorFrame* next) void prepare(LottieVectorFrame* next)
@ -812,9 +816,13 @@ struct LottiePosition : LottieProperty
float angle(float frameNo) float angle(float frameNo)
{ {
if (!frames) return 0; if (!frames || frames->count == 1) return 0;
if (frames->count == 1 || frameNo <= frames->first().no) return 0;
if (frameNo >= frames->last().no) return 0; if (frameNo <= frames->first().no) return frames->first().angle(frames->data + 1, frames->first().no);
if (frameNo >= frames->last().no) {
auto frame = frames->data + frames->count - 2;
return frame->angle(frame + 1, frames->last().no);
}
auto frame = frames->data + _bsearch(frames, frameNo); auto frame = frames->data + _bsearch(frames, frameNo);
return frame->angle(frame + 1, frameNo); return frame->angle(frame + 1, frameNo);