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

lottie: ++expressions coverage

Browse source 
added missing velocityAtTime() for float types.

issue: https://github.com/thorvg/thorvg/issues/2724
This commit is contained in:
Hermet Park 2024-09-15 16:19:33 +09:00
parent 0e06413749
commit a633322b8b
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/loaders/lottie/tvgLottieExpressions.cpp
View file

@ -735,6 +735,20 @@ static jerry_value_t _valueAtTime(const jerry_call_info_t* info, const jerry_val
} }
static jerry_value_t _velocity(float px, float cx, float py, float cy, float elapsed)
{
float velocity[] = {(cx - px) / elapsed, (cy - py) / elapsed};
auto obj = jerry_object();
auto val1 = jerry_number(velocity[0]);
auto val2 = jerry_number(velocity[1]);
jerry_object_set_index(obj, 0, val1);
jerry_object_set_index(obj, 1, val2);
jerry_value_free(val1);
jerry_value_free(val2);
return obj;
}
static jerry_value_t _velocityAtTime(const jerry_call_info_t* info, const jerry_value_t args[], const jerry_length_t argsCnt) static jerry_value_t _velocityAtTime(const jerry_call_info_t* info, const jerry_value_t args[], const jerry_length_t argsCnt)
{ {
auto exp = static_cast<LottieExpression*>(jerry_object_get_native_ptr(info->function, nullptr)); auto exp = static_cast<LottieExpression*>(jerry_object_get_native_ptr(info->function, nullptr));
@ -745,37 +759,27 @@ static jerry_value_t _velocityAtTime(const jerry_call_info_t* info, const jerry_
auto cframe = exp->property->frameNo(key); auto cframe = exp->property->frameNo(key);
auto elapsed = (cframe - pframe) / (exp->comp->frameRate); auto elapsed = (cframe - pframe) / (exp->comp->frameRate);
Point cur, prv;
//compute the velocity //compute the velocity
switch (exp->property->type) { switch (exp->property->type) {
case LottieProperty::Type::Point: { case LottieProperty::Type::Point: {
prv = (*static_cast<LottiePoint*>(exp->property))(pframe); auto prv = (*static_cast<LottiePoint*>(exp->property))(pframe);
cur = (*static_cast<LottiePoint*>(exp->property))(cframe); auto cur = (*static_cast<LottiePoint*>(exp->property))(cframe);
break; return _velocity(prv.x, cur.x, prv.y, cur.y, elapsed);
} }
case LottieProperty::Type::Position: { case LottieProperty::Type::Position: {
prv = (*static_cast<LottiePosition*>(exp->property))(pframe); auto prv = (*static_cast<LottiePosition*>(exp->property))(pframe);
cur = (*static_cast<LottiePosition*>(exp->property))(cframe); auto cur = (*static_cast<LottiePosition*>(exp->property))(cframe);
break; return _velocity(prv.x, cur.x, prv.y, cur.y, elapsed);
} }
default: { case LottieProperty::Type::Float: {
TVGLOG("LOTTIE", "Non supported type for velocityAtTime?"); auto prv = (*static_cast<LottieFloat*>(exp->property))(pframe);
return jerry_undefined(); auto cur = (*static_cast<LottieFloat*>(exp->property))(cframe);
auto velocity = (cur - prv) / elapsed;
return jerry_number(velocity);
} }
default: TVGLOG("LOTTIE", "Non supported type for velocityAtTime?");
} }
return jerry_undefined();
float velocity[] = {(cur.x - prv.x) / elapsed, (cur.y - prv.y) / elapsed};
auto obj = jerry_object();
auto val1 = jerry_number(velocity[0]);
auto val2 = jerry_number(velocity[1]);
jerry_object_set_index(obj, 0, val1);
jerry_object_set_index(obj, 1, val2);
jerry_value_free(val1);
jerry_value_free(val2);
return obj;
} }