rlottie: Use opacity value when rendering gradient.

Change-Id: I73d663bf9236ac7899eb6d781cf7cfbb9f9f9728

diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp
index 21a2e13..49e029b 100644 (file)
--- a/src/lottie/lottieitem.cpp
+++ b/src/lottie/lottieitem.cpp
@@ -1172,6 +1172,7 @@ LOTGFillItem::LOTGFillItem(LOTGFillData *data)
 
 void LOTGFillItem::updateContent(int frameNo)
 {
+    mAlpha = mData->opacity(frameNo);
     mData->update(mGradient, frameNo);
     mGradient->mMatrix = static_cast<LOTContentGroupItem *>(parent())->matrix();
     mFillRule = mData->fillRule();
@@ -1179,7 +1180,7 @@ void LOTGFillItem::updateContent(int frameNo)
 
 void LOTGFillItem::updateRenderNode()
 {
-    mGradient->setAlpha(parentAlpha());
+    mGradient->setAlpha(mAlpha * parentAlpha());
     mDrawable->setBrush(VBrush(mGradient.get()));
     mDrawable->setFillRule(mFillRule);
 }
@@ -1245,6 +1246,7 @@ LOTGStrokeItem::LOTGStrokeItem(LOTGStrokeData *data)
 
 void LOTGStrokeItem::updateContent(int frameNo)
 {
+    mAlpha = mData->opacity(frameNo);
     mData->update(mGradient, frameNo);
     mGradient->mMatrix = static_cast<LOTContentGroupItem *>(parent())->matrix();
     mCap = mData->capStyle();
@@ -1259,7 +1261,7 @@ void LOTGStrokeItem::updateContent(int frameNo)
 void LOTGStrokeItem::updateRenderNode()
 {
     float scale = getScale(mGradient->mMatrix);
-    mGradient->setAlpha(parentAlpha());
+    mGradient->setAlpha(mAlpha * parentAlpha());
     mDrawable->setBrush(VBrush(mGradient.get()));
     mDrawable->setStrokeInfo(mCap, mJoin, mMiterLimit,
                             mWidth * scale);

diff --git a/src/lottie/lottieitem.h b/src/lottie/lottieitem.h
index 9eda6d1..bdf1362 100644 (file)
--- a/src/lottie/lottieitem.h
+++ b/src/lottie/lottieitem.h
@@ -413,6 +413,7 @@ protected:
 private:
    LOTGFillData                 *mData;
    std::unique_ptr<VGradient>    mGradient;
+   float                         mAlpha{1.0};
    FillRule                      mFillRule{FillRule::Winding};
 };
 
@@ -448,6 +449,7 @@ private:
    JoinStyle                     mJoin{JoinStyle::Miter};
    float                         mMiterLimit{0};
    VColor                        mColor;
+   float                         mAlpha{1.0};
    float                         mWidth{0};
    float                         mDashArray[6];
    int                           mDashArraySize{0};