leafer-game 2.2.5 → 2.2.6

package/dist/web.module.js

@@ -472,7 +472,7 @@ 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()), {
@@ -531,8 +531,8 @@ const MatrixHelper = {
         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);
@@ -550,8 +550,8 @@ const MatrixHelper = {
         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);
@@ -572,8 +572,8 @@ const MatrixHelper = {
         }
     },
     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);
@@ -1000,7 +1000,7 @@ class Point {
     }
 }
 
-const tempPoint$5 = new Point;
+const tempPoint$6 = new Point;
 
 class Matrix {
     constructor(a, b, c, d, e, f) {
@@ -1904,7 +1904,7 @@ function getNameList(name) {
 
 const D$5 = Debug;
 
-const debug$g = Debug.get("RunTime");
+const debug$h = Debug.get("RunTime");
 
 const Run = {
     currentId: 0,
@@ -1923,7 +1923,7 @@ const Run = {
         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];
@@ -1959,18 +1959,18 @@ const Creator = {
     }
 };
 
-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);
@@ -1986,7 +1986,7 @@ const UICreator = {
 
 const {list: list$1} = UICreator;
 
-const debug$e = Debug.get("EventCreator");
+const debug$f = Debug.get("EventCreator");
 
 const EventCreator = {
     nameList: {},
@@ -1994,7 +1994,7 @@ const EventCreator = {
         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) {
@@ -2715,7 +2715,7 @@ 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) {
@@ -2889,8 +2889,8 @@ const BezierHelper = {
         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) {
@@ -3003,7 +3003,7 @@ const {rect: rect$3, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse
 
 const {ellipticalArc: ellipticalArc} = EllipseHelper;
 
-const debug$d = Debug.get("PathConvert");
+const debug$e = Debug.get("PathConvert");
 
 const setEndPoint$1 = {};
 
@@ -3270,7 +3270,7 @@ const PathConvert = {
                 break;
 
               default:
-                debug$d.error(`command: ${command} [index:${i}]`, old);
+                debug$e.error(`command: ${command} [index:${i}]`, old);
                 return data;
             }
             lastCommand = command;
@@ -3333,7 +3333,10 @@ 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;
     },
@@ -3403,12 +3406,22 @@ const PathCommandDataHelper = {
         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;
 
@@ -6054,7 +6067,7 @@ const LeafDataProxy = {
 
 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() {
@@ -6075,8 +6088,8 @@ const LeafMatrix = {
             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;
@@ -7023,7 +7036,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.2.5";
+const version = "2.2.6";
 
 const debug$5 = Debug.get("LeaferCanvas");
 
@@ -7877,7 +7890,7 @@ class Renderer {
 
 Renderer.clipSpread = 10;
 
-const tempPoint$2 = {};
+const tempPoint$3 = {};
 
 const {copyRadiusPoint: copyRadiusPoint$1} = PointHelper;
 
@@ -8012,7 +8025,7 @@ class Picker {
         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;
@@ -8567,7 +8580,7 @@ const UIRender = {
         }
         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();
@@ -9547,7 +9560,7 @@ __decorate([ affectRenderBoundsType("hide") ], Frame.prototype, "overflow", void
 
 Frame = __decorate([ registerUI() ], 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 = {};
 
 let Ellipse = class Ellipse extends UI {
     get __tag() {
@@ -9568,9 +9581,9 @@ let Ellipse = class Ellipse extends UI {
                 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 {
@@ -9625,7 +9638,7 @@ let Polygon = class Polygon extends UI {
         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;
@@ -9717,7 +9730,7 @@ let Line = class Line extends UI {
         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);
@@ -15273,7 +15286,7 @@ 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) {
@@ -15300,11 +15313,11 @@ const HighCurveHelper = {
     },
     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) {
@@ -15546,12 +15559,16 @@ const {updateBounds: updateBounds} = BranchHelper;
 
 const {toVertical: toVertical} = PointHelper;
 
+const tempPoint = {};
+
 UI.addAttr("motionPath", undefined, motionPathType);
 
 UI.addAttr("motionPrecision", 1, motionPathType);
 
 UI.addAttr("motion", undefined, motionPathType);
 
+UI.addAttr("motionAround", undefined, motionPathType);
+
 UI.addAttr("motionVertical", "below", motionPathType);
 
 UI.addAttr("motionRotation", true, motionPathType);
@@ -15573,8 +15590,14 @@ ui$1.getMotionPoint = function(motionDistance, motionVertical, pathElement, offs
     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) {
@@ -15814,4 +15837,4 @@ LeafHelper.cacheId = function(t) {
     if (leafer.cacheInnerId) leafer.app.innerIdMap[t.innerId] = t;
 };
 
-export { AlignHelper, Animate, AnimateEasing, AnimateEvent, AnimateList, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent$1 as DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image$1 as Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent$1 as PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Robot, RobotData, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, doSurfaceType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, motionPathType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$5 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };
+export { AlignHelper, Animate, AnimateEasing, AnimateEvent, AnimateList, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent$1 as DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image$1 as Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent$1 as PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Robot, RobotData, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, doSurfaceType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, motionPathType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerPointsCurve, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$6 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };