rlottie: fix mask logic when inverted flag is set.

Added the test resource that is fixed by this patch.
mmaciola · Aug 14, 2020 · 05ba5ee · 05ba5ee
1 parent 430304f
commit 05ba5ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/example/resource/29056-nepenthe-illustration.json b/example/resource/29056-nepenthe-illustration.json
diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp
@@ -197,7 +197,6 @@ VRle renderer::Mask::rle()
         mRasterRequest = false;
         if (!vCompare(mCombinedAlpha, 1.0f))
             mRasterizer.rle() *= uchar(mCombinedAlpha * 255);
-        if (mData->mInv) mRasterizer.rle().invert();
     }
     return mRasterizer.rle();
 }
@@ -287,24 +286,27 @@ VRle renderer::LayerMask::maskRle(const VRect &clipRect)
     if (!mDirty) return mRle;
 
     VRle rle;
-    for (auto &i : mMasks) {
-        switch (i.maskMode()) {
+    for (auto &e : mMasks) {
+        auto cur = e.rle();
+        if (e.inverted()) cur = VRle::toRle(clipRect) - cur;
+
+        switch (e.maskMode()) {
         case model::Mask::Mode::Add: {
-            rle = rle + i.rle();
+            rle = rle + cur;
             break;
         }
         case model::Mask::Mode::Substarct: {
             if (rle.empty() && !clipRect.empty()) rle = VRle::toRle(clipRect);
-            rle = rle - i.rle();
+            rle = rle - cur;
             break;
         }
         case model::Mask::Mode::Intersect: {
             if (rle.empty() && !clipRect.empty()) rle = VRle::toRle(clipRect);
-            rle = rle & i.rle();
+            rle = rle & cur;
             break;
         }
         case model::Mask::Mode::Difference: {
-            rle = rle ^ i.rle();
+            rle = rle ^ cur;
             break;
         }
         default:

diff --git a/src/lottie/lottieitem.h b/src/lottie/lottieitem.h
@@ -156,7 +156,7 @@ class Mask {
     model::Mask::Mode maskMode() const { return mData->mMode; }
     VRle              rle();
     void              preprocess(const VRect &clip);
-
+    bool              inverted() const { return mData->mInv; }
 public:
     model::Mask *mData{nullptr};
     VPath        mLocalPath;