From b24d196809f290dd60c3f6b68ef9143fc9644cf2 Mon Sep 17 00:00:00 2001
From: Hermet Park <hermet@lottiefiles.com>
Date: Mon, 9 Dec 2024 15:56:34 +0900
Subject: [PATCH] lottie: code clean up

- a file name (LottieCommon -> LottieData) was changed
- removed duplicate code
- removed dead code
---
 src/loaders/lottie/meson.build                       |  2 +-
 .../lottie/{tvgLottieCommon.h => tvgLottieData.h}    |  0
 src/loaders/lottie/tvgLottieExpressions.cpp          |  2 +-
 src/loaders/lottie/tvgLottieExpressions.h            |  2 +-
 src/loaders/lottie/tvgLottieModel.h                  |  8 --------
 src/loaders/lottie/tvgLottieProperty.h               | 12 +++++++-----
 6 files changed, 10 insertions(+), 16 deletions(-)
 rename src/loaders/lottie/{tvgLottieCommon.h => tvgLottieData.h} (100%)

diff --git a/src/loaders/lottie/meson.build b/src/loaders/lottie/meson.build
index d367a922..d437118c 100644
--- a/src/loaders/lottie/meson.build
+++ b/src/loaders/lottie/meson.build
@@ -4,7 +4,7 @@ endif
 
 source_file = [
    'tvgLottieBuilder.h',
-   'tvgLottieCommon.h',
+   'tvgLottieData.h',
    'tvgLottieExpressions.h',
    'tvgLottieInterpolator.h',
    'tvgLottieLoader.h',
diff --git a/src/loaders/lottie/tvgLottieCommon.h b/src/loaders/lottie/tvgLottieData.h
similarity index 100%
rename from src/loaders/lottie/tvgLottieCommon.h
rename to src/loaders/lottie/tvgLottieData.h
diff --git a/src/loaders/lottie/tvgLottieExpressions.cpp b/src/loaders/lottie/tvgLottieExpressions.cpp
index bae380d7..f4e06d46 100644
--- a/src/loaders/lottie/tvgLottieExpressions.cpp
+++ b/src/loaders/lottie/tvgLottieExpressions.cpp
@@ -238,7 +238,7 @@ static jerry_value_t _buildTrimpath(LottieTrimpath* trimpath, float frameNo)
     jerry_object_set_sz(obj, "end", end);
     jerry_value_free(end);
     auto offset = jerry_number(trimpath->offset(frameNo));
-    jerry_object_set_sz(obj, "offset", offset);
+    jerry_object_set_sz(obj, EXP_OFFSET, offset);
     jerry_value_free(offset);
 
     return obj;
diff --git a/src/loaders/lottie/tvgLottieExpressions.h b/src/loaders/lottie/tvgLottieExpressions.h
index 4a3c2dcf..72415546 100644
--- a/src/loaders/lottie/tvgLottieExpressions.h
+++ b/src/loaders/lottie/tvgLottieExpressions.h
@@ -24,7 +24,7 @@
 #define _TVG_LOTTIE_EXPRESSIONS_H_
 
 #include "tvgCommon.h"
-#include "tvgLottieCommon.h"
+#include "tvgLottieData.h"
 
 struct LottieExpression;
 struct LottieComposition;
diff --git a/src/loaders/lottie/tvgLottieModel.h b/src/loaders/lottie/tvgLottieModel.h
index 634eaca3..93081d34 100644
--- a/src/loaders/lottie/tvgLottieModel.h
+++ b/src/loaders/lottie/tvgLottieModel.h
@@ -760,15 +760,7 @@ struct LottieLayer : LottieGroup
 
     ~LottieLayer();
 
-    uint8_t opacity(float frameNo)
-    {
-        //return zero if the visibility is false.
-        if (type == Null) return 255;
-        return transform->opacity(frameNo);
-    }
-
     bool mergeable() override { return false; }
-
     void prepare(RGB24* color = nullptr);
     float remap(LottieComposition* comp, float frameNo, LottieExpressions* exp);
 
diff --git a/src/loaders/lottie/tvgLottieProperty.h b/src/loaders/lottie/tvgLottieProperty.h
index 932b5e79..4b3517b5 100644
--- a/src/loaders/lottie/tvgLottieProperty.h
+++ b/src/loaders/lottie/tvgLottieProperty.h
@@ -25,7 +25,7 @@
 
 #include <algorithm>
 #include "tvgMath.h"
-#include "tvgLottieCommon.h"
+#include "tvgLottieData.h"
 #include "tvgLottieInterpolator.h"
 #include "tvgLottieExpressions.h"
 #include "tvgLottieModifier.h"
@@ -222,6 +222,8 @@ float _frameNo(T* frames, int32_t key)
 template<typename T>
 float _loop(T* frames, float frameNo, LottieExpression* exp)
 {
+    if (exp->loop.mode == LottieExpression::LoopMode::None) return frameNo;
+
     if (frameNo >= exp->loop.in || frameNo < frames->first().no || frameNo < frames->last().no) return frameNo;
 
     frameNo -= frames->first().no;
@@ -329,7 +331,7 @@ struct LottieGenericProperty : LottieProperty
     {
         if (exps && exp) {
             T out{};
-            if (exp->loop.mode != LottieExpression::LoopMode::None) frameNo = _loop(frames, frameNo, exp);
+            frameNo = _loop(frames, frameNo, exp);
             if (exps->result<LottieGenericProperty<T>>(frameNo, out, exp)) return out;
         }
         return operator()(frameNo);
@@ -496,7 +498,7 @@ struct LottiePathSet : LottieProperty
     bool operator()(float frameNo, Array<PathCommand>& cmds, Array<Point>& pts, Matrix* transform, const LottieRoundnessModifier* roundness, const LottieOffsetModifier* offsetPath, LottieExpressions* exps)
     {
         if (exps && exp) {
-            if (exp->loop.mode != LottieExpression::LoopMode::None) frameNo = _loop(frames, frameNo, exp);
+            frameNo = _loop(frames, frameNo, exp);
             if (exps->result<LottiePathSet>(frameNo, cmds, pts, transform, roundness, offsetPath, exp)) return true;
         }
         return operator()(frameNo, cmds, pts, transform, roundness, offsetPath);
@@ -585,7 +587,7 @@ struct LottieColorStop : LottieProperty
     Result operator()(float frameNo, Fill* fill, LottieExpressions* exps)
     {
         if (exps && exp) {
-            if (exp->loop.mode != LottieExpression::LoopMode::None) frameNo = _loop(frames, frameNo, exp);
+            frameNo = _loop(frames, frameNo, exp);
             if (exps->result<LottieColorStop>(frameNo, fill, exp)) return Result::Success;
         }
 
@@ -719,7 +721,7 @@ struct LottiePosition : LottieProperty
     {
         Point out{};
         if (exps && exp) {
-            if (exp->loop.mode != LottieExpression::LoopMode::None) frameNo = _loop(frames, frameNo, exp);
+            frameNo = _loop(frames, frameNo, exp);
             if (exps->result<LottiePosition>(frameNo, out, exp)) return out;
         }
         return operator()(frameNo);