leafer-game 2.2.5 → 2.2.6

package/dist/web.esm.min.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.esm.min.js","sources":["../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\nimport { IWindingRule } from '../canvas/ICanvas'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\nexport interface IPathCommandDataWithRadius {\n    data: IPathCommandData\n    radius: number[]\n}\n\nexport interface IPathCommandDataWithWindingRule {\n    data: IPathCommandData\n    windingRule?: IWindingRule\n}\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n    pressure?: number // 压感\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    r?: number // 圆角半径\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n    pressure?: number // 压感\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    r?: number // 圆角半径\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}"],"names":["PathNodeHandleType"],"mappings":"wLA6IYA,GAAZ,SAAYA,GACRA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA,QACH,CALD,CAAYA,IAAAA,EAAkB,CAAA"}
+{"version":3,"file":"web.esm.min.js","sources":["../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\nimport { IWindingRule } from '../canvas/ICanvas'\nimport { IObject } from '../data/IData'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\nexport interface IPathCommandDataWithRadius {\n    data: IPathCommandData\n    radius: number[]\n}\n\nexport interface IPathCommandDataWithWindingRule {\n    data: IPathCommandData\n    windingRule?: IWindingRule\n}\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n    pressure?: number // 压感\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    r?: number // 圆角半径\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n    pressure?: number // 压感\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    r?: number // 圆角半径\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}\n\n// points 转曲线\nexport type IPointsCurveType =\n    | 'Q' // 使用二次贝塞尔曲线平滑 points\n    | 'C'  // 使用三次贝塞尔曲线平滑 points\n    | (string & {})\n\nexport type IPointsCurveValue = boolean | number\n\nexport interface IPointsCurveData {\n    type: IPointsCurveType\n    value: IPointsCurveValue\n}\n\nexport type IPointsCurve = IPointsCurveData | IPointsCurveValue\n\nexport interface IPointsCurveFunction {\n    (data: IPathCommandData, originPoints: number[] | IPointData[], curve?: boolean | number, close?: boolean, options?: IObject): void\n}\n\nexport interface IPointsCurveFunctionMap {\n    [name: string]: IPointsCurveFunction\n}"],"names":["PathNodeHandleType"],"mappings":"wLA8IYA,GAAZ,SAAYA,GACRA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA,QACH,CALD,CAAYA,IAAAA,EAAkB,CAAA"}

package/dist/web.js

@@ -434,7 +434,7 @@ var LeaferUI = function(exports) {
     }
     const {sin: sin$6, cos: cos$6, acos: acos, sqrt: sqrt$5} = Math;
     const {float: float$5} = MathHelper;
-    const tempPoint$6 = {};
+    const tempPoint$7 = {};
     function getWorld() {
         return Object.assign(Object.assign(Object.assign({}, getMatrixData()), getBoundsData()), {
             scaleX: 1,
@@ -491,8 +491,8 @@ var LeaferUI = function(exports) {
             to.f = t.f * pixelRatio;
         },
         scaleOfOuter(t, origin, scaleX, scaleY) {
-            M$7.toInnerPoint(t, origin, tempPoint$6);
-            M$7.scaleOfInner(t, tempPoint$6, scaleX, scaleY);
+            M$7.toInnerPoint(t, origin, tempPoint$7);
+            M$7.scaleOfInner(t, tempPoint$7, scaleX, scaleY);
         },
         scaleOfInner(t, origin, scaleX, scaleY = scaleX) {
             M$7.translateInner(t, origin.x, origin.y);
@@ -510,8 +510,8 @@ var LeaferUI = function(exports) {
             t.d = c * sinR + d * cosR;
         },
         rotateOfOuter(t, origin, rotation) {
-            M$7.toInnerPoint(t, origin, tempPoint$6);
-            M$7.rotateOfInner(t, tempPoint$6, rotation);
+            M$7.toInnerPoint(t, origin, tempPoint$7);
+            M$7.rotateOfInner(t, tempPoint$7, rotation);
         },
         rotateOfInner(t, origin, rotation) {
             M$7.translateInner(t, origin.x, origin.y);
@@ -532,8 +532,8 @@ var LeaferUI = function(exports) {
             }
         },
         skewOfOuter(t, origin, skewX, skewY) {
-            M$7.toInnerPoint(t, origin, tempPoint$6);
-            M$7.skewOfInner(t, tempPoint$6, skewX, skewY);
+            M$7.toInnerPoint(t, origin, tempPoint$7);
+            M$7.skewOfInner(t, tempPoint$7, skewX, skewY);
         },
         skewOfInner(t, origin, skewX, skewY = 0) {
             M$7.translateInner(t, origin.x, origin.y);
@@ -951,7 +951,7 @@ var LeaferUI = function(exports) {
             return this;
         }
     }
-    const tempPoint$5 = new Point;
+    const tempPoint$6 = new Point;
     class Matrix {
         constructor(a, b, c, d, e, f) {
             this.set(a, b, c, d, e, f);
@@ -1814,7 +1814,7 @@ var LeaferUI = function(exports) {
         return name;
     }
     const D$5 = Debug;
-    const debug$g = Debug.get("RunTime");
+    const debug$h = Debug.get("RunTime");
     const Run = {
         currentId: 0,
         currentName: "",
@@ -1832,7 +1832,7 @@ var LeaferUI = function(exports) {
             const time = R$1.idMap[id], name = R$1.nameMap[id];
             const duration = microsecond ? (performance.now() - time) / 1e3 : Date.now() - time;
             R$1.idMap[id] = R$1.nameMap[id] = R$1.nameToIdMap[name] = undefined;
-            debug$g.log(name, duration, "ms");
+            debug$h.log(name, duration, "ms");
         },
         endOfName(name, microsecond) {
             const id = R$1.nameToIdMap[name];
@@ -1862,17 +1862,17 @@ var LeaferUI = function(exports) {
             return Plugin.need("editor");
         }
     };
-    const debug$f = Debug.get("UICreator");
+    const debug$g = Debug.get("UICreator");
     const UICreator = {
         list: {},
         register(UI) {
             const {__tag: tag} = UI.prototype;
-            if (list$1[tag]) debug$f.repeat(tag);
+            if (list$1[tag]) debug$g.repeat(tag);
             list$1[tag] = UI;
         },
         get(tag, data, x, y, width, height) {
             if (!list$1[tag]) {
-                debug$f.warn("not register " + tag);
+                debug$g.warn("not register " + tag);
                 return undefined;
             }
             const ui = new list$1[tag](data);
@@ -1886,14 +1886,14 @@ var LeaferUI = function(exports) {
         }
     };
     const {list: list$1} = UICreator;
-    const debug$e = Debug.get("EventCreator");
+    const debug$f = Debug.get("EventCreator");
     const EventCreator = {
         nameList: {},
         register(Event) {
             let name;
             Object.keys(Event).forEach(key => {
                 name = Event[key];
-                if (isString(name)) nameList[name] && debug$e.repeat(name), nameList[name] = Event;
+                if (isString(name)) nameList[name] && debug$f.repeat(name), nameList[name] = Event;
             });
         },
         changeName(oldName, newName) {
@@ -2529,7 +2529,7 @@ var LeaferUI = function(exports) {
     const {setPoint: setPoint$1, addPoint: addPoint$1} = TwoPointBoundsHelper;
     const {set: set$3, toNumberPoints: toNumberPoints} = PointHelper;
     const {M: M$6, L: L$7, C: C$5, Q: Q$4, Z: Z$6} = PathCommandMap;
-    const tempPoint$4 = {};
+    const tempPoint$5 = {};
     const BezierHelper = {
         points(data, originPoints, curve, close) {
             let points = toNumberPoints(originPoints);
@@ -2702,8 +2702,8 @@ var LeaferUI = function(exports) {
             addMode ? addPoint$1(pointBounds, fromX, fromY) : setPoint$1(pointBounds, fromX, fromY);
             addPoint$1(pointBounds, toX, toY);
             for (let i = 0, len = tList.length; i < len; i++) {
-                getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$4);
-                addPoint$1(pointBounds, tempPoint$4.x, tempPoint$4.y);
+                getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$5);
+                addPoint$1(pointBounds, tempPoint$5.x, tempPoint$5.y);
             }
         },
         getPointAndSet(t, fromX, fromY, x1, y1, x2, y2, toX, toY, setPoint) {
@@ -2807,7 +2807,7 @@ var LeaferUI = function(exports) {
     const {M: M$5, m: m, L: L$6, l: l, H: H, h: h, V: V, v: v, C: C$4, c: c, S: S, s: s, Q: Q$3, q: q, T: T, t: t, A: A, a: a, Z: Z$5, z: z, N: N$3, D: D$4, X: X$3, G: G$3, F: F$4, O: O$3, P: P$3, U: U$3} = PathCommandMap;
     const {rect: rect$3, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse: ellipse$4, quadraticCurveTo: quadraticCurveTo$1} = BezierHelper;
     const {ellipticalArc: ellipticalArc} = EllipseHelper;
-    const debug$d = Debug.get("PathConvert");
+    const debug$e = Debug.get("PathConvert");
     const setEndPoint$1 = {};
     const PathConvert = {
         current: {
@@ -3072,7 +3072,7 @@ var LeaferUI = function(exports) {
                     break;
 
                   default:
-                    debug$d.error(`command: ${command} [index:${i}]`, old);
+                    debug$e.error(`command: ${command} [index:${i}]`, old);
                     return data;
                 }
                 lastCommand = command;
@@ -3129,7 +3129,9 @@ var LeaferUI = function(exports) {
     const {getMinDistanceFrom: getMinDistanceFrom, getRadianFrom: getRadianFrom} = PointHelper;
     const {tan: tan, min: min$1, abs: abs$5} = Math;
     const startPoint = {};
+    const debug$d = Debug.get("PointsCurve");
     const PathCommandDataHelper = {
+        pointsCurveList: {},
         beginPath(data) {
             data.length = 0;
         },
@@ -3199,11 +3201,19 @@ var LeaferUI = function(exports) {
             data.push(M$4, startPoint.x, startPoint.y);
             arc$2(data, x, y, radius, startAngle, endAngle, anticlockwise);
         },
-        drawPoints(data, points, curve, close) {
-            BezierHelper.points(data, points, curve, close);
+        drawPoints(data, points, curve, close, options) {
+            let type = "Q";
+            if (isObject(curve)) type = curve.type, curve = curve.value;
+            if (!pointsCurveList[type]) debug$d.warn("not found:", type), type = "Q";
+            pointsCurveList[type](data, points, curve, close, options);
         }
     };
-    const {ellipse: ellipse$3, arc: arc$2} = PathCommandDataHelper;
+    const {ellipse: ellipse$3, arc: arc$2, pointsCurveList: pointsCurveList} = PathCommandDataHelper;
+    function registerPointsCurve(type, fn) {
+        if (pointsCurveList[type]) debug$d.repeat(type);
+        pointsCurveList[type] = fn;
+    }
+    registerPointsCurve("Q", BezierHelper.points);
     const {moveTo: moveTo$4, lineTo: lineTo$3, quadraticCurveTo: quadraticCurveTo, bezierCurveTo: bezierCurveTo, closePath: closePath$3, beginPath: beginPath, rect: rect$2, roundRect: roundRect$1, ellipse: ellipse$2, arc: arc$1, arcTo: arcTo$2, drawEllipse: drawEllipse, drawArc: drawArc, drawPoints: drawPoints$2} = PathCommandDataHelper;
     class PathCreator {
         set path(value) {
@@ -5664,7 +5674,7 @@ var LeaferUI = function(exports) {
         }
     };
     const {setLayout: setLayout, multiplyParent: multiplyParent$2, translateInner: translateInner, defaultWorld: defaultWorld} = MatrixHelper;
-    const {toPoint: toPoint$3, tempPoint: tempPoint$3} = AroundHelper;
+    const {toPoint: toPoint$3, tempPoint: tempPoint$4} = AroundHelper;
     const LeafMatrix = {
         __updateWorldMatrix() {
             const {parent: parent, __layout: __layout, __world: __world, __scrollWorld: __scrollWorld, __: __} = this;
@@ -5684,8 +5694,8 @@ var LeaferUI = function(exports) {
                 local.e = data.x + data.offsetX;
                 local.f = data.y + data.offsetY;
                 if (data.around || data.origin) {
-                    toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$3);
-                    translateInner(local, -tempPoint$3.x, -tempPoint$3.y, !data.around);
+                    toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$4);
+                    translateInner(local, -tempPoint$4.x, -tempPoint$4.y, !data.around);
                 }
             }
             this.__layout.matrixChanged = undefined;
@@ -6606,7 +6616,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "2.2.5";
+    const version = "2.2.6";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -7432,7 +7442,7 @@ var LeaferUI = function(exports) {
         }
     }
     Renderer.clipSpread = 10;
-    const tempPoint$2 = {};
+    const tempPoint$3 = {};
     const {copyRadiusPoint: copyRadiusPoint$1} = PointHelper;
     const {hitRadiusPoint: hitRadiusPoint$1} = BoundsHelper;
     class Picker {
@@ -7564,7 +7574,7 @@ var LeaferUI = function(exports) {
             for (let i = len - 1; i > -1; i--) {
                 child = children[i], data = child.__;
                 if (!data.visible || onlyHitMask && !data.mask) continue;
-                hit = hitRadiusPoint$1(child.__world, data.hitRadius ? copyRadiusPoint$1(tempPoint$2, point, data.hitRadius) : point);
+                hit = hitRadiusPoint$1(child.__world, data.hitRadius ? copyRadiusPoint$1(tempPoint$3, point, data.hitRadius) : point);
                 if (child.isBranch) {
                     if (hit || child.__ignoreHitWorld) {
                         if (child.isBranchLeaf && data.__clipAfterFill && !child.__hitWorld(point, true)) continue;
@@ -8073,7 +8083,7 @@ var LeaferUI = function(exports) {
             }
             if (data.__useEffect) {
                 const {shadow: shadow, fill: fill, stroke: stroke} = data, otherEffect = data.innerShadow || data.blur || data.backgroundBlur || data.filter;
-                stintSet$2(data, "__isFastShadow", shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && !Effect.isTransformShadow(shadow[0]) && fill && !data.__isTransparentFill && !(isArray(fill) && fill.length > 1) && (this.useFastShadow || !stroke || stroke && data.strokeAlign === "inside"));
+                stintSet$2(data, "__isFastShadow", shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && !Effect.isTransformShadow(shadow[0]) && !(shadow[0].blendMode && shadow[0].blendMode !== "pass-through") && fill && !data.__isTransparentFill && !(isArray(fill) && fill.length > 1) && (this.useFastShadow || !stroke || stroke && data.strokeAlign === "inside"));
                 data.__useEffect = !!(shadow || otherEffect);
             }
             data.__checkSingle();
@@ -8936,7 +8946,7 @@ var LeaferUI = function(exports) {
     __decorate([ surfaceType("#FFFFFF") ], exports.Frame.prototype, "fill", void 0);
     __decorate([ affectRenderBoundsType("hide") ], exports.Frame.prototype, "overflow", void 0);
     exports.Frame = __decorate([ registerUI() ], exports.Frame);
-    const {moveTo: moveTo$3, closePath: closePath$2, ellipse: ellipse} = PathCommandDataHelper, {tempPoint: tempPoint$1, set: set$2, rotate: rotate$2} = PointHelper, {abs: abs$4} = Math, tempCenter = {};
+    const {moveTo: moveTo$3, closePath: closePath$2, ellipse: ellipse} = PathCommandDataHelper, {tempPoint: tempPoint$2, set: set$2, rotate: rotate$2} = PointHelper, {abs: abs$4} = Math, tempCenter = {};
     exports.Ellipse = class Ellipse extends exports.UI {
         get __tag() {
             return "Ellipse";
@@ -8956,9 +8966,9 @@ var LeaferUI = function(exports) {
                     if (drawInnerEllipse) {
                         if (closedAngle) {
                             closePath$2(path);
-                            set$2(tempPoint$1, rx + innerRx, ry), set$2(tempCenter, rx, ry);
-                            rotate$2(tempPoint$1, endAngle, tempCenter, rx, ry);
-                            moveTo$3(path, tempPoint$1.x, tempPoint$1.y);
+                            set$2(tempPoint$2, rx + innerRx, ry), set$2(tempCenter, rx, ry);
+                            rotate$2(tempPoint$2, endAngle, tempCenter, rx, ry);
+                            moveTo$3(path, tempPoint$2.x, tempPoint$2.y);
                         }
                         ellipse(path, rx, ry, innerRx, innerRy, 0, endAngle, startAngle, true);
                     } else {
@@ -9005,7 +9015,7 @@ var LeaferUI = function(exports) {
             const data = this.__;
             const path = data.path = [];
             if (data.points) {
-                drawPoints$1(path, data.points, data.curve, data.closed);
+                drawPoints$1(path, data.points, data.curve, data.closed, data);
             } else {
                 const {width: width, height: height, sides: sides, startAngle: startAngle} = data;
                 const rx = width / 2, ry = height / 2;
@@ -9080,7 +9090,7 @@ var LeaferUI = function(exports) {
             const data = this.__;
             const path = data.path = [];
             if (data.points) {
-                drawPoints(path, data.points, data.curve, data.closed);
+                drawPoints(path, data.points, data.curve, data.closed, data);
             } else {
                 moveTo(path, 0, 0);
                 lineTo(path, this.width, 0);
@@ -14131,7 +14141,7 @@ var LeaferUI = function(exports) {
     };
     const {getDistance: getDistance} = HighBezierHelper;
     const {M: M, L: L, C: C, Z: Z} = PathCommandMap, {float: float} = MathHelper, {set: set, getAngle: getAngle, getDistanceFrom: getDistanceFrom, getDistancePoint: getDistancePoint} = PointHelper;
-    const tempPoint = {}, tempFrom = {};
+    const tempPoint$1 = {}, tempFrom = {};
     const HighCurveHelper = {
         transform(data, matrix) {
             let i = 0, command;
@@ -14157,11 +14167,11 @@ var LeaferUI = function(exports) {
         },
         transformPoints(data, matrix, start, pointCount) {
             for (let i = start + 1, end = i + pointCount * 2; i < end; i += 2) {
-                tempPoint.x = data[i];
-                tempPoint.y = data[i + 1];
-                MatrixHelper.toOuterPoint(matrix, tempPoint);
-                data[i] = tempPoint.x;
-                data[i + 1] = tempPoint.y;
+                tempPoint$1.x = data[i];
+                tempPoint$1.y = data[i + 1];
+                MatrixHelper.toOuterPoint(matrix, tempPoint$1);
+                data[i] = tempPoint$1.x;
+                data[i + 1] = tempPoint$1.y;
             }
         },
         getMotionPathData(data) {
@@ -14394,9 +14404,11 @@ var LeaferUI = function(exports) {
     const {updateMatrix: updateMatrix, updateAllMatrix: updateAllMatrix} = LeafHelper;
     const {updateBounds: updateBounds} = BranchHelper;
     const {toVertical: toVertical} = PointHelper;
+    const tempPoint = {};
     exports.UI.addAttr("motionPath", undefined, motionPathType);
     exports.UI.addAttr("motionPrecision", 1, motionPathType);
     exports.UI.addAttr("motion", undefined, motionPathType);
+    exports.UI.addAttr("motionAround", undefined, motionPathType);
     exports.UI.addAttr("motionVertical", "below", motionPathType);
     exports.UI.addAttr("motionRotation", true, motionPathType);
     ui$1.getMotionPath = function() {
@@ -14413,8 +14425,14 @@ var LeaferUI = function(exports) {
         const data = getMotionPathData(pathElement);
         if (!data.total) return {};
         const point = HighCurveHelper.getDistancePoint(data, motionDistance, pathElement.motionPrecision, offsetX);
-        const {motionRotation: motionRotation} = this;
+        const {motionRotation: motionRotation, motionAround: motionAround} = this;
         if (isNumber(motionRotation)) point.rotation += motionRotation;
+        if (motionAround && motionAround !== "top-left") {
+            AroundHelper.toPoint(motionAround, this.__layout.boxBounds, tempPoint);
+            PointHelper.set(tempPoint, point.x - tempPoint.x * this.scaleX, point.y - tempPoint.y * this.scaleY);
+            if (point.rotation) PointHelper.rotate(tempPoint, point.rotation, point);
+            PointHelper.copy(point, tempPoint);
+        }
         let verticalType, verticalOffset;
         if (isObject(motionVertical)) verticalType = motionVertical.type, verticalOffset = motionVertical.offset; else if (isNumber(motionVertical)) verticalOffset = motionVertical; else verticalType = motionVertical;
         if (verticalType !== "below" || offsetY) {
@@ -14819,6 +14837,7 @@ var LeaferUI = function(exports) {
     exports.pathType = pathType;
     exports.pen = pen;
     exports.positionType = positionType;
+    exports.registerPointsCurve = registerPointsCurve;
     exports.registerUI = registerUI;
     exports.registerUIEvent = registerUIEvent;
     exports.resizeType = resizeType;
@@ -14834,7 +14853,7 @@ var LeaferUI = function(exports) {
     exports.surfaceType = surfaceType;
     exports.tempBounds = tempBounds$2;
     exports.tempMatrix = tempMatrix$2;
-    exports.tempPoint = tempPoint$5;
+    exports.tempPoint = tempPoint$6;
     exports.tryToNumber = tryToNumber;
     exports.useCanvas = useCanvas;
     exports.useModule = useModule;

package/dist/web.min.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"web.min.cjs","sources":["../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\nimport { IWindingRule } from '../canvas/ICanvas'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\nexport interface IPathCommandDataWithRadius {\n    data: IPathCommandData\n    radius: number[]\n}\n\nexport interface IPathCommandDataWithWindingRule {\n    data: IPathCommandData\n    windingRule?: IWindingRule\n}\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n    pressure?: number // 压感\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    r?: number // 圆角半径\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n    pressure?: number // 压感\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    r?: number // 圆角半径\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}"],"names":["PathNodeHandleType"],"mappings":"iBA6IYA,sLAAAA,QAAAA,wBAAAA,GAAAA,EAAAA,QAAAA,qBAAAA,2BAAkB,CAAA,IAC1BA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA"}
+{"version":3,"file":"web.min.cjs","sources":["../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\nimport { IWindingRule } from '../canvas/ICanvas'\nimport { IObject } from '../data/IData'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\nexport interface IPathCommandDataWithRadius {\n    data: IPathCommandData\n    radius: number[]\n}\n\nexport interface IPathCommandDataWithWindingRule {\n    data: IPathCommandData\n    windingRule?: IWindingRule\n}\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n    pressure?: number // 压感\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n    pressure?: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    r?: number // 圆角半径\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n    pressure?: number // 压感\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    r?: number // 圆角半径\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}\n\n// points 转曲线\nexport type IPointsCurveType =\n    | 'Q' // 使用二次贝塞尔曲线平滑 points\n    | 'C'  // 使用三次贝塞尔曲线平滑 points\n    | (string & {})\n\nexport type IPointsCurveValue = boolean | number\n\nexport interface IPointsCurveData {\n    type: IPointsCurveType\n    value: IPointsCurveValue\n}\n\nexport type IPointsCurve = IPointsCurveData | IPointsCurveValue\n\nexport interface IPointsCurveFunction {\n    (data: IPathCommandData, originPoints: number[] | IPointData[], curve?: boolean | number, close?: boolean, options?: IObject): void\n}\n\nexport interface IPointsCurveFunctionMap {\n    [name: string]: IPointsCurveFunction\n}"],"names":["PathNodeHandleType"],"mappings":"iBA8IYA,sLAAAA,QAAAA,wBAAAA,GAAAA,EAAAA,QAAAA,qBAAAA,2BAAkB,CAAA,IAC1BA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA"}