fix: Remove clipPath support.

svga · May 28, 2019 · f9e3827 · f9e3827
1 parent a0c5a79
commit f9e3827
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/app/src/main/assets/matte.svga b/app/src/main/assets/matte.svga
diff --git a/app/src/main/java/com/example/ponycui_home/svgaplayer/AnimationFromAssetsActivity.java b/app/src/main/java/com/example/ponycui_home/svgaplayer/AnimationFromAssetsActivity.java
@@ -37,7 +37,7 @@ public void onClick(View view) {
 
     private void loadAnimation() {
         SVGAParser parser = new SVGAParser(this);
-        parser.decodeFromAssets(this.randomSample(), new SVGAParser.ParseCompletion() {
+        parser.decodeFromAssets("matte.svga", new SVGAParser.ParseCompletion() {
             @Override
             public void onComplete(@NotNull SVGAVideoEntity videoItem) {
                 animationView.setVideoItem(videoItem);

diff --git a/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt b/library/src/main/java/com/opensource/svgaplayer/drawer/SVGACanvasDrawer.kt
@@ -173,15 +173,15 @@ internal class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVG
                         paint.style = Paint.Style.FILL
                         paint.color = it
                         paint.alpha = Math.min(255, Math.max(0, (sprite.frameEntity.alpha * 255).toInt()))
-                        if (sprite.frameEntity.maskPath !== null) canvas.save()
-                        sprite.frameEntity.maskPath?.let { maskPath ->
-                            val path2 = this.sharedValues.sharedPath2()
-                            maskPath.buildPath(path2)
-                            path2.transform(frameMatrix)
-                            canvas.clipPath(path2)
-                        }
+//                        if (sprite.frameEntity.maskPath !== null) canvas.save()
+//                        sprite.frameEntity.maskPath?.let { maskPath ->
+//                            val path2 = this.sharedValues.sharedPath2()
+//                            maskPath.buildPath(path2)
+//                            path2.transform(frameMatrix)
+//                            canvas.clipPath(path2)
+//                        }
+//                        if (sprite.frameEntity.maskPath !== null) canvas.restore()
                         canvas.drawPath(path, paint)
-                        if (sprite.frameEntity.maskPath !== null) canvas.restore()
                     }
                 }
                 shape.styles?.strokeWidth?.let {
@@ -220,15 +220,15 @@ internal class SVGACanvasDrawer(videoItem: SVGAVideoEntity, val dynamicItem: SVG
                                 ), it[2] * scale)
                             }
                         }
-                        if (sprite.frameEntity.maskPath !== null) canvas.save()
-                        sprite.frameEntity.maskPath?.let { maskPath ->
-                            val path2 = this.sharedValues.sharedPath2()
-                            maskPath.buildPath(path2)
-                            path2.transform(frameMatrix)
-                            canvas.clipPath(path2)
-                        }
+//                        if (sprite.frameEntity.maskPath !== null) canvas.save()
+//                        sprite.frameEntity.maskPath?.let { maskPath ->
+//                            val path2 = this.sharedValues.sharedPath2()
+//                            maskPath.buildPath(path2)
+//                            path2.transform(frameMatrix)
+//                            canvas.clipPath(path2)
+//                        }
+//                        if (sprite.frameEntity.maskPath !== null) canvas.restore()
                         canvas.drawPath(path, paint)
-                        if (sprite.frameEntity.maskPath !== null) canvas.restore()
                     }
                 }
             }