@leafer-game/worker 2.1.2 → 2.1.4

package/dist/worker.js

@@ -2850,6 +2850,7 @@ var LeaferUI = function(exports) {
                     current.length = PathCommandLengthMap[char];
                     current.index = 0;
                     pushData(data, current.name);
+                    if (char === "m") current.name = PathCommandMap["l"]; else if (char === "M") current.name = PathCommandMap["L"];
                     if (!needConvert && convertCommand[char]) needConvert = true;
                 } else {
                     if (char === "-" || char === "+") {
@@ -2882,10 +2883,9 @@ var LeaferUI = function(exports) {
                     old[i + 2] += y;
 
                   case M$5:
-                    x = old[i + 1];
-                    y = old[i + 2];
-                    if (lastCommand === command) data.push(L$6, x, y); else data.push(M$5, x, y), startX = x, 
-                    startY = y;
+                    x = startX = old[i + 1];
+                    y = startY = old[i + 2];
+                    data.push(M$5, x, y);
                     i += 3;
                     break;
 
@@ -2927,8 +2927,8 @@ var LeaferUI = function(exports) {
 
                   case S:
                     smooth = lastCommand === C$4 || lastCommand === S;
-                    x1 = smooth ? x * 2 - controlX : old[i + 1];
-                    y1 = smooth ? y * 2 - controlY : old[i + 2];
+                    x1 = smooth ? x * 2 - controlX : x;
+                    y1 = smooth ? y * 2 - controlY : y;
                     controlX = old[i + 1];
                     controlY = old[i + 2];
                     x = old[i + 3];
@@ -2962,8 +2962,8 @@ var LeaferUI = function(exports) {
 
                   case T:
                     smooth = lastCommand === Q$3 || lastCommand === T;
-                    controlX = smooth ? x * 2 - controlX : old[i + 1];
-                    controlY = smooth ? y * 2 - controlY : old[i + 2];
+                    controlX = smooth ? x * 2 - controlX : x;
+                    controlY = smooth ? y * 2 - controlY : y;
                     curveMode ? quadraticCurveTo$1(data, x, y, controlX, controlY, old[i + 1], old[i + 2]) : data.push(Q$3, controlX, controlY, old[i + 1], old[i + 2]);
                     x = old[i + 1];
                     y = old[i + 2];
@@ -4569,10 +4569,10 @@ var LeaferUI = function(exports) {
                 y: y
             }, transition) : (t.x = x, t.y = y);
         },
-        zoomOfWorld(t, origin, scaleX, scaleY, resize, transition) {
-            L$1.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize, transition);
+        zoomOfWorld(t, origin, scaleX, scaleY, resize, transition, boundsType) {
+            L$1.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize, transition, boundsType);
         },
-        zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize, transition) {
+        zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize, transition, boundsType) {
             const o = t.__localMatrix;
             if (!isNumber(scaleY)) {
                 if (scaleY) transition = scaleY;
@@ -4581,7 +4581,7 @@ var LeaferUI = function(exports) {
             copy$5(matrix$1, o);
             scaleOfOuter$2(matrix$1, origin, scaleX, scaleY);
             if (L$1.hasHighPosition(t)) {
-                L$1.setTransform(t, matrix$1, resize, transition);
+                L$1.setTransform(t, matrix$1, resize, transition, boundsType);
             } else {
                 const x = t.x + matrix$1.e - o.e, y = t.y + matrix$1.f - o.f;
                 if (transition && !resize) t.animate({
@@ -4589,7 +4589,7 @@ var LeaferUI = function(exports) {
                     y: y,
                     scaleX: t.scaleX * scaleX,
                     scaleY: t.scaleY * scaleY
-                }, transition); else t.x = x, t.y = y, t.scaleResize(scaleX, scaleY, resize !== true);
+                }, transition); else t.x = x, t.y = y, t.scaleResize(scaleX, scaleY, resize !== true, boundsType);
             }
         },
         rotateOfWorld(t, origin, angle, transition) {
@@ -4613,18 +4613,18 @@ var LeaferUI = function(exports) {
             skewOfOuter(matrix$1, origin, skewX, skewY);
             L$1.setTransform(t, matrix$1, resize, transition);
         },
-        transformWorld(t, transform, resize, transition) {
+        transformWorld(t, transform, resize, transition, boundsType) {
             copy$5(matrix$1, t.worldTransform);
             multiplyParent$3(matrix$1, transform);
             if (t.parent) divideParent(matrix$1, t.parent.scrollWorldTransform);
-            L$1.setTransform(t, matrix$1, resize, transition);
+            L$1.setTransform(t, matrix$1, resize, transition, boundsType);
         },
-        transform(t, transform, resize, transition) {
+        transform(t, transform, resize, transition, boundsType) {
             copy$5(matrix$1, t.localTransform);
             multiplyParent$3(matrix$1, transform);
-            L$1.setTransform(t, matrix$1, resize, transition);
+            L$1.setTransform(t, matrix$1, resize, transition, boundsType);
         },
-        setTransform(t, transform, resize, transition) {
+        setTransform(t, transform, resize, transition, boundsType) {
             const data = t.__, originPoint = data.origin && L$1.getInnerOrigin(t, data.origin);
             const layout = getLayout(transform, originPoint, data.around && L$1.getInnerOrigin(t, data.around));
             if (L$1.hasOffset(t)) {
@@ -4640,7 +4640,7 @@ var LeaferUI = function(exports) {
                     PointHelper.move(layout, originPoint.x - changedPoint.x, originPoint.y - changedPoint.y);
                 }
                 t.set(layout);
-                t.scaleResize(scaleX, scaleY, false);
+                t.scaleResize(scaleX, scaleY, false, boundsType);
             } else t.set(layout, transition);
         },
         getFlipTransform(t, axis) {
@@ -5689,39 +5689,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();
@@ -6264,11 +6270,11 @@ var LeaferUI = function(exports) {
             const layer = this.leafer ? this.leafer.zoomLayer : this;
             return layer.getWorldPoint(page, relative, distance, change);
         }
-        setTransform(matrix, resize, transition) {
-            setTransform(this, matrix, resize, transition);
+        setTransform(matrix, resize, transition, boundsType) {
+            setTransform(this, matrix, resize, transition, boundsType);
         }
-        transform(matrix, resize, transition) {
-            transform(this, matrix, resize, transition);
+        transform(matrix, resize, transition, boundsType) {
+            transform(this, matrix, resize, transition, boundsType);
         }
         move(x, y, transition) {
             moveLocal(this, x, y, transition);
@@ -6276,8 +6282,8 @@ var LeaferUI = function(exports) {
         moveInner(x, y, transition) {
             moveWorld(this, x, y, true, transition);
         }
-        scaleOf(origin, scaleX, scaleY, resize, transition) {
-            zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition);
+        scaleOf(origin, scaleX, scaleY, resize, transition, boundsType) {
+            zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition, boundsType);
         }
         rotateOf(origin, rotation, transition) {
             rotateOfLocal(this, getLocalOrigin(this, origin), rotation, transition);
@@ -6285,14 +6291,14 @@ var LeaferUI = function(exports) {
         skewOf(origin, skewX, skewY, resize, transition) {
             skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize, transition);
         }
-        transformWorld(worldTransform, resize, transition) {
-            transformWorld(this, worldTransform, resize, transition);
+        transformWorld(worldTransform, resize, transition, boundsType) {
+            transformWorld(this, worldTransform, resize, transition, boundsType);
         }
         moveWorld(x, y, transition) {
             moveWorld(this, x, y, false, transition);
         }
-        scaleOfWorld(worldOrigin, scaleX, scaleY, resize, transition) {
-            zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition);
+        scaleOfWorld(worldOrigin, scaleX, scaleY, resize, transition, boundsType) {
+            zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition, boundsType);
         }
         rotateOfWorld(worldOrigin, rotation) {
             rotateOfWorld(this, worldOrigin, rotation);
@@ -6303,7 +6309,7 @@ var LeaferUI = function(exports) {
         flip(axis, transition) {
             transform(this, getFlipTransform(this, axis), false, transition);
         }
-        scaleResize(scaleX, scaleY = scaleX, _noResize) {
+        scaleResize(scaleX, scaleY = scaleX, _noResize, _boundsType) {
             this.scaleX *= scaleX;
             this.scaleY *= scaleY;
         }
@@ -6668,7 +6674,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.1.2";
+    const version = "2.1.4";
     class LeaferCanvas extends LeaferCanvasBase {
         get allowBackgroundColor() {
             return true;
@@ -11036,7 +11042,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;
@@ -11269,8 +11275,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;
             }
         }