leafer-draw 2.1.5 → 2.1.6

package/dist/web.module.js

@@ -3722,7 +3722,7 @@ const {arcTo: arcTo} = PathCommandDataHelper;
 
 const PathCorner = {
     smooth(data, cornerRadius, _cornerSmoothing) {
-        let command, lastCommand, commandLen;
+        let command, lastCommand, commandLen, startXIndex, startYIndex, smoothLen;
         let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
         if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0;
         const len = data.length, three = len === 9;
@@ -3731,6 +3731,11 @@ const PathCorner = {
             command = data[i];
             switch (command) {
               case M:
+                smoothLen = smooth.length;
+                if (smoothLen && lastCommand !== Z) {
+                    smooth[startXIndex] = startX;
+                    smooth[startYIndex] = startY;
+                }
                 startX = lastX = data[i + 1];
                 startY = lastY = data[i + 2];
                 i += 3;
@@ -3741,6 +3746,8 @@ const PathCorner = {
                 } else {
                     smooth.push(M, startX, startY);
                 }
+                startXIndex = smoothLen + 1;
+                startYIndex = smoothLen + 2;
                 break;
 
               case L$1:
@@ -3779,8 +3786,8 @@ const PathCorner = {
             lastCommand = command;
         }
         if (command !== Z) {
-            smooth[1] = startX;
-            smooth[2] = startY;
+            smooth[startXIndex] = startX;
+            smooth[startYIndex] = startY;
         }
         return smooth;
     }
@@ -6976,7 +6983,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.1.5";
+const version = "2.1.6";
 
 const debug$4 = Debug.get("LeaferCanvas");
 
@@ -10289,8 +10296,9 @@ function getPatternData(paint, box, image) {
         break;
 
       case "repeat":
-      case "brush":
         if (!sameBox || scaleX || rotation || skew) PaintImage.repeatMode(data, box, width, height, tempImage.x, tempImage.y, scaleX, scaleY, rotation, skew, align, paint.freeTransform);
+
+      case "brush":
         if (!repeat) data.repeat = "repeat";
         const count = isObject(repeat);
         if (gap || count) data.gap = getGapData(gap, count && repeat, tempImage.width, tempImage.height, box);
@@ -10301,7 +10309,7 @@ function getPatternData(paint, box, image) {
       default:
         if (scaleX) PaintImage.fillOrFitMode(data, box, tempImage.x, tempImage.y, scaleX, scaleY, rotation);
     }
-    if (!data.transform) {
+    if (!data.transform && mode !== "brush") {
         if (box.x || box.y) translate$1(data.transform = get$3(), box.x, box.y);
     }
     if (scaleX) {
@@ -10430,8 +10438,9 @@ function createPattern(paint, ui, canvas, renderOptions) {
     let {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
     if (paint.patternId !== id && !ui.destroyed) {
         if (!(Platform.image.isLarge(paint.image, scaleX, scaleY) && !paint.data.repeat)) {
-            const {image: image, brush: brush, data: data} = paint, {opacity: opacity} = paint.originPaint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
-            let imageMatrix, xGap, yGap, {width: width, height: height} = image;
+            const {image: image, brush: brush, data: data} = paint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
+            let imageMatrix, xGap, yGap, {width: width, height: height} = image, {opacity: opacity} = paint.originPaint;
+            if (brush || opacity === 1) opacity = undefined;
             if (fixScale) scaleX *= fixScale, scaleY *= fixScale;
             width *= scaleX;
             height *= scaleY;