leafer-game 2.1.0 → 2.1.1

package/dist/web.js

@@ -2884,7 +2884,7 @@ var LeaferUI = function(exports) {
                   case M$5:
                     x = old[i + 1];
                     y = old[i + 2];
-                    data.push(M$5, x, y);
+                    data.push(lastCommand === command ? L$6 : M$5, x, y);
                     i += 3;
                     break;
 
@@ -5680,12 +5680,13 @@ var LeaferUI = function(exports) {
             if (this.__hasWorldEvent) BoundsEvent.emitWorld(this);
         },
         __updateLocalBounds() {
-            const layout = this.__layout;
+            const layout = this.__layout, data = this.__;
             if (layout.boxChanged) {
-                if (!this.__.__pathInputed) this.__updatePath();
+                if (!data.__pathInputed) this.__updatePath();
                 this.__updateRenderPath();
                 this.__updateBoxBounds();
                 layout.resized = "inner";
+                if (data.__strokeGeometry) data.__strokeGeometry = undefined;
             }
             if (layout.localBoxChanged) {
                 if (this.__local) this.__updateLocalBoxBounds();
@@ -5708,6 +5709,7 @@ var LeaferUI = function(exports) {
                 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();
@@ -6663,7 +6665,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.1.0";
+    const version = "2.1.1";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -7875,7 +7877,7 @@ var LeaferUI = function(exports) {
             const isStr = isString(value);
             if (isStr || value && isObject(value[0])) {
                 this.__setInput("path", value);
-                this._path = isStr ? parse(value) : objectToCanvasData(value);
+                this._path = isStr ? parse(value, this.__useArrow) : objectToCanvasData(value);
             } else {
                 if (this.__input) this.__removeInput("path");
                 this._path = value;
@@ -7981,7 +7983,11 @@ var LeaferUI = function(exports) {
             return !this.__pathInputed;
         }
     }
-    class PolygonData extends LineData {}
+    class PolygonData extends UIData {
+        get __usePathBox() {
+            return this.points || this.__pathInputed;
+        }
+    }
     class StarData extends UIData {
         get __boxStroke() {
             return !this.__pathInputed;
@@ -8083,7 +8089,7 @@ var LeaferUI = function(exports) {
             if ((data.stroke || data.hitStroke === "all") && strokeWidth && strokeAlign !== "inside") {
                 boxSpread = spread = strokeAlign === "center" ? strokeWidth / 2 : strokeWidth;
                 if (!data.__boxStroke || data.__useArrow) {
-                    const miterLimitAddWidth = data.__isLinePath ? 0 : 10 * spread;
+                    const miterLimitAddWidth = data.__isLinePath ? 0 : (data.strokeJoin === "miter" ? 10 : 1) * spread;
                     const storkeCapAddWidth = data.strokeCap === "none" ? 0 : strokeWidth;
                     spread += Math.max(miterLimitAddWidth, storkeCapAddWidth);
                 }
@@ -9220,7 +9226,7 @@ var LeaferUI = function(exports) {
     __decorate([ dataType(false) ], exports.Canvas.prototype, "safeResize", void 0);
     __decorate([ resizeType() ], exports.Canvas.prototype, "contextSettings", void 0);
     exports.Canvas = __decorate([ registerUI() ], exports.Canvas);
-    const {copyAndSpread: copyAndSpread$1, includes: includes, spread: spread, setList: setList} = BoundsHelper, {stintSet: stintSet$1} = DataHelper;
+    const {copyAndSpread: copyAndSpread$1, includes: includes, setList: setList} = BoundsHelper, {stintSet: stintSet$1} = DataHelper;
     exports.Text = class Text extends exports.UI {
         get __tag() {
             return "Text";
@@ -9247,9 +9253,10 @@ 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) spread(contentBounds, fontSize / 2);
+            if (data.__lineHeight < fontSize) layout.renderChanged = true;
             if (autoWidth || autoHeight) {
                 b.x = autoWidth ? contentBounds.x : 0;
                 b.y = autoHeight ? contentBounds.y : 0;
@@ -9269,6 +9276,8 @@ var LeaferUI = function(exports) {
         __updateRenderSpread() {
             let spread = super.__updateRenderSpread();
             if (!spread) spread = this.isOverflow ? 1 : 0;
+            const {__lineHeight: __lineHeight, fontSize: fontSize} = this.__;
+            if (__lineHeight < fontSize) spread = FourNumberHelper.max(spread, (fontSize - __lineHeight) / 2);
             return spread;
         }
         __updateRenderBounds() {
@@ -11388,8 +11397,8 @@ var LeaferUI = function(exports) {
                 }
             }
         }
-        data["_" + attrName] = leafPaints.length ? leafPaints : undefined;
         if (leafPaints.length) {
+            data["_" + attrName] = leafPaints;
             if (leafPaints.every(item => item.isTransparent)) {
                 if (leafPaints.some(item => item.image)) isAlphaPixel = true;
                 isTransparent = true;
@@ -11404,6 +11413,7 @@ var LeaferUI = function(exports) {
             }
         } else {
             data.__removePaint(attrName, false);
+            data["_" + attrName] = "";
         }
     }
     function getLeafPaint(attrName, paint, ui) {
@@ -11547,11 +11557,12 @@ var LeaferUI = function(exports) {
                 needUpdate = false;
             }
         }
+        if (paint.mode === "brush") PaintImage.brush(leafPaint);
         if (!leafPaint.data) {
             PaintImage.createData(leafPaint, image, paint, boxBounds);
-            const {transform: transform} = leafPaint.data, {opacity: opacity, blendMode: blendMode} = paint;
-            const clip = transform && !transform.onlyScale || data.path || data.cornerRadius;
-            if (clip || opacity && opacity < 1 || blendMode) leafPaint.complex = clip ? 2 : true;
+            const {transform: transform} = leafPaint.data, {opacity: opacity} = paint;
+            const clip = (transform && !transform.onlyScale || data.path || data.cornerRadius) && !leafPaint.brush;
+            if (clip || opacity && opacity < 1 || paint.blendMode) leafPaint.complex = clip ? 2 : true;
         }
         if (paint.filter) PaintImage.applyFilter(leafPaint, image, paint.filter, ui);
         return needUpdate;
@@ -11630,6 +11641,7 @@ var LeaferUI = function(exports) {
             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);
             if (!repeat) data.repeat = "repeat";
             const count = isObject(repeat);
@@ -11757,7 +11769,7 @@ var LeaferUI = function(exports) {
         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, data: data} = paint, {opacity: opacity} = paint.originPaint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
+                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;
                 if (fixScale) scaleX *= fixScale, scaleY *= fixScale;
                 width *= scaleX;
@@ -11765,6 +11777,10 @@ var LeaferUI = function(exports) {
                 if (gap) {
                     xGap = gap.x * scaleX / abs$2(data.scaleX || 1);
                     yGap = gap.y * scaleY / abs$2(data.scaleY || 1);
+                    if (brush) {
+                        const brushScale = PaintImage.getBrushScale(paint, ui);
+                        xGap /= brushScale, yGap /= brushScale;
+                    }
                 }
                 if (transform || scaleX !== 1 || scaleY !== 1) {
                     scaleX *= getFloorScale(width + (xGap || 0));
@@ -11774,7 +11790,7 @@ 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 = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
+                const pattern = brush ? imageCanvas : image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
                 paint.style = pattern;
                 paint.patternId = id;
             }
@@ -11793,9 +11809,9 @@ var LeaferUI = function(exports) {
     }
     function checkImage(paint, drawImage, ui, canvas, renderOptions) {
         const {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
-        const {image: image, data: data, originPaint: originPaint} = paint, {exporting: exporting, snapshot: snapshot} = renderOptions;
+        const {image: image, brush: brush, data: data, originPaint: originPaint} = paint, {exporting: exporting, snapshot: snapshot} = renderOptions;
         if (!data || paint.patternId === id && !exporting || snapshot) {
-            return false;
+            if (!(brush && paint.style)) return false;
         } else {
             if (drawImage) {
                 if (data.repeat) {
@@ -11809,17 +11825,17 @@ var LeaferUI = function(exports) {
                     canvas.fillStyle = paint.style || "#000";
                     canvas.fill();
                 }
-                PaintImage.drawImage(paint, scaleX, scaleY, ui, canvas, renderOptions);
-                return true;
             } else {
                 if (!paint.style || originPaint.sync || exporting) PaintImage.createPattern(paint, ui, canvas, renderOptions); else PaintImage.createPatternTask(paint, ui, canvas, renderOptions);
-                return false;
+                if (!(brush && paint.style)) return false;
             }
         }
+        PaintImage.drawImage(paint, scaleX, scaleY, ui, canvas, renderOptions);
+        return true;
     }
     function drawImage(paint, imageScaleX, imageScaleY, ui, canvas, _renderOptions) {
-        const {data: data, image: image, complex: complex} = paint;
-        let {width: width, height: height} = image;
+        const {data: data, image: image, brush: brush, complex: complex} = paint;
+        let {width: width, height: height} = image, view = brush || image;
         if (complex) {
             const {blendMode: blendMode, opacity: opacity} = paint.originPaint, {transform: transform} = data;
             canvas.save();
@@ -11827,15 +11843,16 @@ var LeaferUI = function(exports) {
             blendMode && (canvas.blendMode = blendMode);
             opacity && (canvas.opacity *= opacity);
             transform && canvas.transform(transform);
-            image.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
+            view.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
             canvas.restore();
         } else {
             if (data.scaleX) width *= data.scaleX, height *= data.scaleY;
-            image.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
+            view.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
         }
     }
     function getImageRenderScaleData(paint, ui, canvas, _renderOptions) {
         const scaleData = ui.getRenderScaleData(true, paint.originPaint.scaleFixed), {data: data} = paint;
+        if (paint.brush) PaintImage.addBrushScale(scaleData, paint, ui);
         if (canvas) {
             const {pixelRatio: pixelRatio} = canvas;
             scaleData.scaleX *= pixelRatio;
@@ -11851,6 +11868,7 @@ var LeaferUI = function(exports) {
         const paints = data["_" + attrName];
         if (isArray(paints)) {
             let paint, image, recycleMap, input, url;
+            const ui = data.__leaf;
             for (let i = 0, len = paints.length; i < len; i++) {
                 paint = paints[i];
                 image = paint.image;
@@ -11859,7 +11877,8 @@ var LeaferUI = function(exports) {
                     if (!recycleMap) recycleMap = {};
                     recycleMap[url] = true;
                     ImageManager.recyclePaint(paint);
-                    if (data.__willDestroy && image.parent) PaintImage.recycleFilter(image, data.__leaf);
+                    if (paint.brush) PaintImage.recycleBrush(paint, ui);
+                    if (data.__willDestroy && image.parent) PaintImage.recycleFilter(image, ui);
                     if (image.loading) {
                         if (!input) {
                             input = data.__input && data.__input[attrName] || [];