@leafer-game/worker 2.1.1 → 2.1.3

package/dist/worker.js

@@ -2850,7 +2850,7 @@ var LeaferUI = function(exports) {
                     current.length = PathCommandLengthMap[char];
                     current.index = 0;
                     pushData(data, current.name);
-                    if (!needConvert && convertCommand[char]) needConvert = true;
+                    if (char === "m") current.name = PathCommandMap["l"]; else if (char === "M") current.name = PathCommandMap["L"]; else if (!needConvert && convertCommand[char]) needConvert = true;
                 } else {
                     if (char === "-" || char === "+") {
                         if (lastChar === "e" || lastChar === "E") {
@@ -2872,7 +2872,7 @@ var LeaferUI = function(exports) {
             return needConvert ? PathConvert.toCanvasData(data, curveMode) : data;
         },
         toCanvasData(old, curveMode) {
-            let x = 0, y = 0, x1 = 0, y1 = 0, i = 0, len = old.length, controlX, controlY, command, lastCommand, smooth;
+            let x = 0, y = 0, x1 = 0, y1 = 0, startX = 0, startY = 0, i = 0, len = old.length, controlX, controlY, command, lastCommand, smooth;
             const data = [];
             while (i < len) {
                 command = old[i];
@@ -2882,9 +2882,9 @@ var LeaferUI = function(exports) {
                     old[i + 2] += y;
 
                   case M$5:
-                    x = old[i + 1];
-                    y = old[i + 2];
-                    data.push(lastCommand === command ? L$6 : M$5, x, y);
+                    x = startX = old[i + 1];
+                    y = startY = old[i + 2];
+                    data.push(M$5, x, y);
                     i += 3;
                     break;
 
@@ -2999,6 +2999,8 @@ var LeaferUI = function(exports) {
                   case z:
                   case Z$5:
                     data.push(Z$5);
+                    x = startX;
+                    y = startY;
                     i++;
                     break;
 
@@ -5686,39 +5688,45 @@ var LeaferUI = function(exports) {
                 this.__updateRenderPath();
                 this.__updateBoxBounds();
                 layout.resized = "inner";
-                if (data.__strokeGeometry) data.__strokeGeometry = undefined;
             }
             if (layout.localBoxChanged) {
                 if (this.__local) this.__updateLocalBoxBounds();
                 layout.localBoxChanged = undefined;
-                if (layout.strokeSpread) layout.strokeChanged = true;
-                if (layout.renderSpread) layout.renderChanged = true;
+                if (layout.strokeSpread && !layout.strokeChanged) layout.strokeChanged = layout.boxChanged ? true : 2;
+                if (layout.renderSpread && !layout.renderChanged) layout.renderChanged = layout.boxChanged ? true : 2;
                 if (this.parent) this.parent.__layout.boxChange();
             }
             layout.boxChanged = undefined;
             if (layout.strokeChanged) {
-                layout.strokeSpread = this.__updateStrokeSpread();
-                if (layout.strokeSpread) {
-                    if (layout.strokeBounds === layout.boxBounds) layout.spreadStroke();
-                    this.__updateStrokeBounds();
+                if (layout.strokeChanged === 2) {
                     this.__updateLocalStrokeBounds();
                 } else {
-                    layout.spreadStrokeCancel();
+                    layout.strokeSpread = this.__updateStrokeSpread();
+                    if (layout.strokeSpread) {
+                        if (layout.strokeBounds === layout.boxBounds) layout.spreadStroke();
+                        this.__updateStrokeBounds();
+                        this.__updateLocalStrokeBounds();
+                    } else {
+                        layout.spreadStrokeCancel();
+                    }
+                    layout.resized = "inner";
+                    if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true;
                 }
                 layout.strokeChanged = undefined;
-                if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true;
                 if (this.parent) this.parent.__layout.strokeChange();
-                layout.resized = "inner";
-                if (data.__strokeGeometry) data.__strokeGeometry = undefined;
             }
             if (layout.renderChanged) {
-                layout.renderSpread = this.__updateRenderSpread();
-                if (layout.renderSpread) {
-                    if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) layout.spreadRender();
-                    this.__updateRenderBounds();
+                if (layout.renderChanged === 2) {
                     this.__updateLocalRenderBounds();
                 } else {
-                    layout.spreadRenderCancel();
+                    layout.renderSpread = this.__updateRenderSpread();
+                    if (layout.renderSpread) {
+                        if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) layout.spreadRender();
+                        this.__updateRenderBounds();
+                        this.__updateLocalRenderBounds();
+                    } else {
+                        layout.spreadRenderCancel();
+                    }
                 }
                 layout.renderChanged = undefined;
                 if (this.parent) this.parent.__layout.renderChange();
@@ -6665,7 +6673,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.1.1";
+    const version = "2.1.3";
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() {
             return true;
@@ -9059,7 +9067,6 @@ var LeaferUI = function(exports) {
             const {fontSize: fontSize, italic: italic, padding: padding, __autoWidth: autoWidth, __autoHeight: autoHeight} = data;
             this.__updateTextDrawData();
             const {bounds: contentBounds} = data.__textDrawData;
-            console.log(contentBounds);
             const b = layout.boxBounds;
             layout.contentBounds = contentBounds;
             if (data.__lineHeight < fontSize) layout.renderChanged = true;
@@ -11034,7 +11041,7 @@ var LeaferUI = function(exports) {
                 needUpdate = false;
             }
         }
-        if (paint.mode === "brush") PaintImage.brush(leafPaint);
+        if (paint.mode === "brush") PaintImage.brush(leafPaint, ui);
         if (!leafPaint.data) {
             PaintImage.createData(leafPaint, image, paint, boxBounds);
             const {transform: transform} = leafPaint.data, {opacity: opacity} = paint;
@@ -11267,8 +11274,12 @@ var LeaferUI = function(exports) {
                     scale(imageMatrix, 1 / scaleX, 1 / scaleY);
                 }
                 const imageCanvas = image.getCanvas(width, height, opacity, undefined, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace);
-                const pattern = brush ? imageCanvas : image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
-                paint.style = pattern;
+                if (brush) {
+                    paint.style = imageCanvas;
+                    PaintImage.cacheBrush(paint, ui, canvas, renderOptions);
+                } else {
+                    paint.style = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
+                }
                 paint.patternId = id;
             }
         }