@leafer-game/miniapp 1.12.1 → 1.12.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/miniapp.module.js +232 -138
- package/dist/miniapp.module.min.js +1 -1
- package/dist/miniapp.module.min.js.map +1 -1
- package/package.json +12 -12
package/dist/miniapp.module.js
CHANGED
|
@@ -461,9 +461,9 @@ function getMatrixData() {
|
|
|
461
461
|
|
|
462
462
|
const {sin: sin$6, cos: cos$6, acos: acos, sqrt: sqrt$5} = Math;
|
|
463
463
|
|
|
464
|
-
const {float: float$
|
|
464
|
+
const {float: float$5} = MathHelper;
|
|
465
465
|
|
|
466
|
-
const tempPoint$
|
|
466
|
+
const tempPoint$5 = {};
|
|
467
467
|
|
|
468
468
|
function getWorld() {
|
|
469
469
|
return Object.assign(Object.assign(Object.assign({}, getMatrixData()), getBoundsData()), {
|
|
@@ -522,8 +522,8 @@ const MatrixHelper = {
|
|
|
522
522
|
to.f = t.f * pixelRatio;
|
|
523
523
|
},
|
|
524
524
|
scaleOfOuter(t, origin, scaleX, scaleY) {
|
|
525
|
-
M$7.toInnerPoint(t, origin, tempPoint$
|
|
526
|
-
M$7.scaleOfInner(t, tempPoint$
|
|
525
|
+
M$7.toInnerPoint(t, origin, tempPoint$5);
|
|
526
|
+
M$7.scaleOfInner(t, tempPoint$5, scaleX, scaleY);
|
|
527
527
|
},
|
|
528
528
|
scaleOfInner(t, origin, scaleX, scaleY = scaleX) {
|
|
529
529
|
M$7.translateInner(t, origin.x, origin.y);
|
|
@@ -541,8 +541,8 @@ const MatrixHelper = {
|
|
|
541
541
|
t.d = c * sinR + d * cosR;
|
|
542
542
|
},
|
|
543
543
|
rotateOfOuter(t, origin, rotation) {
|
|
544
|
-
M$7.toInnerPoint(t, origin, tempPoint$
|
|
545
|
-
M$7.rotateOfInner(t, tempPoint$
|
|
544
|
+
M$7.toInnerPoint(t, origin, tempPoint$5);
|
|
545
|
+
M$7.rotateOfInner(t, tempPoint$5, rotation);
|
|
546
546
|
},
|
|
547
547
|
rotateOfInner(t, origin, rotation) {
|
|
548
548
|
M$7.translateInner(t, origin.x, origin.y);
|
|
@@ -563,8 +563,8 @@ const MatrixHelper = {
|
|
|
563
563
|
}
|
|
564
564
|
},
|
|
565
565
|
skewOfOuter(t, origin, skewX, skewY) {
|
|
566
|
-
M$7.toInnerPoint(t, origin, tempPoint$
|
|
567
|
-
M$7.skewOfInner(t, tempPoint$
|
|
566
|
+
M$7.toInnerPoint(t, origin, tempPoint$5);
|
|
567
|
+
M$7.skewOfInner(t, tempPoint$5, skewX, skewY);
|
|
568
568
|
},
|
|
569
569
|
skewOfInner(t, origin, skewX, skewY = 0) {
|
|
570
570
|
M$7.translateInner(t, origin.x, origin.y);
|
|
@@ -712,12 +712,12 @@ const MatrixHelper = {
|
|
|
712
712
|
const cosR = c / scaleY;
|
|
713
713
|
rotation = PI_2 - (d > 0 ? acos(-cosR) : -acos(cosR));
|
|
714
714
|
}
|
|
715
|
-
const cosR = float$
|
|
715
|
+
const cosR = float$5(cos$6(rotation));
|
|
716
716
|
const sinR = sin$6(rotation);
|
|
717
|
-
scaleX = float$
|
|
718
|
-
skewX = cosR ? float$
|
|
719
|
-
skewY = cosR ? float$
|
|
720
|
-
rotation = float$
|
|
717
|
+
scaleX = float$5(scaleX), scaleY = float$5(scaleY);
|
|
718
|
+
skewX = cosR ? float$5((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
|
|
719
|
+
skewY = cosR ? float$5((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
|
|
720
|
+
rotation = float$5(rotation / OneRadian);
|
|
721
721
|
} else {
|
|
722
722
|
scaleX = a;
|
|
723
723
|
scaleY = d;
|
|
@@ -761,6 +761,8 @@ const MatrixHelper = {
|
|
|
761
761
|
|
|
762
762
|
const M$7 = MatrixHelper;
|
|
763
763
|
|
|
764
|
+
const {float: float$4} = MathHelper;
|
|
765
|
+
|
|
764
766
|
const {toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3} = MatrixHelper;
|
|
765
767
|
|
|
766
768
|
const {sin: sin$5, cos: cos$5, abs: abs$6, sqrt: sqrt$4, atan2: atan2$2, min: min$2, round: round$5} = Math;
|
|
@@ -812,22 +814,27 @@ const PointHelper = {
|
|
|
812
814
|
},
|
|
813
815
|
tempToInnerOf(t, matrix) {
|
|
814
816
|
const {tempPoint: temp} = P$5;
|
|
815
|
-
copy$
|
|
817
|
+
copy$9(temp, t);
|
|
816
818
|
toInnerPoint$2(matrix, temp, temp);
|
|
817
819
|
return temp;
|
|
818
820
|
},
|
|
819
821
|
tempToOuterOf(t, matrix) {
|
|
820
822
|
const {tempPoint: temp} = P$5;
|
|
821
|
-
copy$
|
|
823
|
+
copy$9(temp, t);
|
|
822
824
|
toOuterPoint$3(matrix, temp, temp);
|
|
823
825
|
return temp;
|
|
824
826
|
},
|
|
825
827
|
tempToInnerRadiusPointOf(t, matrix) {
|
|
826
828
|
const {tempRadiusPoint: temp} = P$5;
|
|
827
|
-
copy$
|
|
829
|
+
copy$9(temp, t);
|
|
828
830
|
P$5.toInnerRadiusPointOf(t, matrix, temp);
|
|
829
831
|
return temp;
|
|
830
832
|
},
|
|
833
|
+
copyRadiusPoint(t, point, x, y) {
|
|
834
|
+
copy$9(t, point);
|
|
835
|
+
setRadius(t, x, y);
|
|
836
|
+
return t;
|
|
837
|
+
},
|
|
831
838
|
toInnerRadiusPointOf(t, matrix, to) {
|
|
832
839
|
to || (to = t);
|
|
833
840
|
toInnerPoint$2(matrix, t, to);
|
|
@@ -895,7 +902,7 @@ const PointHelper = {
|
|
|
895
902
|
return points;
|
|
896
903
|
},
|
|
897
904
|
isSame(t, point) {
|
|
898
|
-
return t.x === point.x && t.y === point.y;
|
|
905
|
+
return float$4(t.x) === float$4(point.x) && float$4(t.y) === float$4(point.y);
|
|
899
906
|
},
|
|
900
907
|
reset(t) {
|
|
901
908
|
P$5.reset(t);
|
|
@@ -904,7 +911,7 @@ const PointHelper = {
|
|
|
904
911
|
|
|
905
912
|
const P$5 = PointHelper;
|
|
906
913
|
|
|
907
|
-
const {getDistanceFrom: getDistanceFrom, copy: copy$
|
|
914
|
+
const {getDistanceFrom: getDistanceFrom, copy: copy$9, setRadius: setRadius, getAtan2: getAtan2} = P$5;
|
|
908
915
|
|
|
909
916
|
class Point {
|
|
910
917
|
constructor(x, y) {
|
|
@@ -979,7 +986,7 @@ class Point {
|
|
|
979
986
|
}
|
|
980
987
|
}
|
|
981
988
|
|
|
982
|
-
const tempPoint$
|
|
989
|
+
const tempPoint$4 = new Point;
|
|
983
990
|
|
|
984
991
|
class Matrix {
|
|
985
992
|
constructor(a, b, c, d, e, f) {
|
|
@@ -1250,7 +1257,7 @@ const {tempPointBounds: tempPointBounds$1, setPoint: setPoint$2, addPoint: addPo
|
|
|
1250
1257
|
|
|
1251
1258
|
const {toOuterPoint: toOuterPoint$2} = MatrixHelper;
|
|
1252
1259
|
|
|
1253
|
-
const {float: float$
|
|
1260
|
+
const {float: float$3, fourNumber: fourNumber$1} = MathHelper;
|
|
1254
1261
|
|
|
1255
1262
|
const {floor: floor$1, ceil: ceil$2} = Math;
|
|
1256
1263
|
|
|
@@ -1315,7 +1322,7 @@ const BoundsHelper = {
|
|
|
1315
1322
|
return t;
|
|
1316
1323
|
},
|
|
1317
1324
|
toOffsetOutBounds(t, to, offsetBounds) {
|
|
1318
|
-
if (!to) to = t; else copy$
|
|
1325
|
+
if (!to) to = t; else copy$8(to, t);
|
|
1319
1326
|
if (!offsetBounds) offsetBounds = t;
|
|
1320
1327
|
to.offsetX = B.maxX(offsetBounds);
|
|
1321
1328
|
to.offsetY = B.maxY(offsetBounds);
|
|
@@ -1425,10 +1432,10 @@ const BoundsHelper = {
|
|
|
1425
1432
|
}
|
|
1426
1433
|
},
|
|
1427
1434
|
float(t, maxLength) {
|
|
1428
|
-
t.x = float$
|
|
1429
|
-
t.y = float$
|
|
1430
|
-
t.width = float$
|
|
1431
|
-
t.height = float$
|
|
1435
|
+
t.x = float$3(t.x, maxLength);
|
|
1436
|
+
t.y = float$3(t.y, maxLength);
|
|
1437
|
+
t.width = float$3(t.width, maxLength);
|
|
1438
|
+
t.height = float$3(t.height, maxLength);
|
|
1432
1439
|
},
|
|
1433
1440
|
add(t, bounds, isPoint) {
|
|
1434
1441
|
right$1 = t.x + t.width;
|
|
@@ -1462,7 +1469,7 @@ const BoundsHelper = {
|
|
|
1462
1469
|
if (bounds && (bounds.width || bounds.height)) {
|
|
1463
1470
|
if (first) {
|
|
1464
1471
|
first = false;
|
|
1465
|
-
if (!addMode) copy$
|
|
1472
|
+
if (!addMode) copy$8(t, bounds);
|
|
1466
1473
|
} else {
|
|
1467
1474
|
add$2(t, bounds);
|
|
1468
1475
|
}
|
|
@@ -1549,7 +1556,7 @@ const BoundsHelper = {
|
|
|
1549
1556
|
|
|
1550
1557
|
const B = BoundsHelper;
|
|
1551
1558
|
|
|
1552
|
-
const {add: add$2, copy: copy$
|
|
1559
|
+
const {add: add$2, copy: copy$8} = B;
|
|
1553
1560
|
|
|
1554
1561
|
class Bounds {
|
|
1555
1562
|
get minX() {
|
|
@@ -2247,7 +2254,7 @@ __decorate([ contextMethod() ], Canvas$1.prototype, "measureText", null);
|
|
|
2247
2254
|
|
|
2248
2255
|
__decorate([ contextMethod() ], Canvas$1.prototype, "strokeText", null);
|
|
2249
2256
|
|
|
2250
|
-
const {copy: copy$
|
|
2257
|
+
const {copy: copy$7, multiplyParent: multiplyParent$4, pixelScale: pixelScale} = MatrixHelper, {round: round$4} = Math, tempPixelBounds = new Bounds, tempPixelBounds2 = new Bounds;
|
|
2251
2258
|
|
|
2252
2259
|
const minSize = {
|
|
2253
2260
|
width: 1,
|
|
@@ -2407,7 +2414,7 @@ class LeaferCanvasBase extends Canvas$1 {
|
|
|
2407
2414
|
const {pixelRatio: pixelRatio} = this;
|
|
2408
2415
|
this.filter = `blur(${blur * pixelRatio}px)`;
|
|
2409
2416
|
}
|
|
2410
|
-
copyWorld(canvas, from, to, blendMode, ceilPixel
|
|
2417
|
+
copyWorld(canvas, from, to, blendMode, ceilPixel) {
|
|
2411
2418
|
if (blendMode) this.blendMode = blendMode;
|
|
2412
2419
|
if (from) {
|
|
2413
2420
|
this.setTempPixelBounds(from, ceilPixel);
|
|
@@ -2418,7 +2425,7 @@ class LeaferCanvasBase extends Canvas$1 {
|
|
|
2418
2425
|
}
|
|
2419
2426
|
if (blendMode) this.blendMode = "source-over";
|
|
2420
2427
|
}
|
|
2421
|
-
copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel
|
|
2428
|
+
copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel) {
|
|
2422
2429
|
if (fromWorld.b || fromWorld.c) {
|
|
2423
2430
|
this.save();
|
|
2424
2431
|
this.resetTransform();
|
|
@@ -2431,7 +2438,7 @@ class LeaferCanvasBase extends Canvas$1 {
|
|
|
2431
2438
|
if (blendMode) this.blendMode = "source-over";
|
|
2432
2439
|
}
|
|
2433
2440
|
}
|
|
2434
|
-
copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel
|
|
2441
|
+
copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel) {
|
|
2435
2442
|
this.resetTransform();
|
|
2436
2443
|
this.copyWorld(canvas, from, to, blendMode, ceilPixel);
|
|
2437
2444
|
if (!onlyResetTransform) this.useWorldTransform();
|
|
@@ -2501,7 +2508,7 @@ class LeaferCanvasBase extends Canvas$1 {
|
|
|
2501
2508
|
getSameCanvas(useSameWorldTransform, useSameSmooth) {
|
|
2502
2509
|
const {size: size, pixelSnap: pixelSnap} = this, canvas = this.manager ? this.manager.get(size) : Creator.canvas(Object.assign({}, size));
|
|
2503
2510
|
canvas.save();
|
|
2504
|
-
if (useSameWorldTransform) copy$
|
|
2511
|
+
if (useSameWorldTransform) copy$7(canvas.worldTransform, this.worldTransform), canvas.useWorldTransform();
|
|
2505
2512
|
if (useSameSmooth) canvas.smooth = this.smooth;
|
|
2506
2513
|
canvas.pixelSnap !== pixelSnap && (canvas.pixelSnap = pixelSnap);
|
|
2507
2514
|
return canvas;
|
|
@@ -2650,7 +2657,7 @@ const {set: set$1, toNumberPoints: toNumberPoints} = PointHelper;
|
|
|
2650
2657
|
|
|
2651
2658
|
const {M: M$6, L: L$7, C: C$5, Q: Q$4, Z: Z$6} = PathCommandMap;
|
|
2652
2659
|
|
|
2653
|
-
const tempPoint$
|
|
2660
|
+
const tempPoint$3 = {};
|
|
2654
2661
|
|
|
2655
2662
|
const BezierHelper = {
|
|
2656
2663
|
points(data, originPoints, curve, close) {
|
|
@@ -2658,7 +2665,7 @@ const BezierHelper = {
|
|
|
2658
2665
|
data.push(M$6, points[0], points[1]);
|
|
2659
2666
|
if (curve && points.length > 5) {
|
|
2660
2667
|
let aX, aY, bX, bY, cX, cY, c1X, c1Y, c2X, c2Y;
|
|
2661
|
-
let ba, cb, d, len = points.length;
|
|
2668
|
+
let baX, baY, ba, cb, d, len = points.length;
|
|
2662
2669
|
const t = curve === true ? .5 : curve;
|
|
2663
2670
|
if (close) {
|
|
2664
2671
|
points = [ points[len - 2], points[len - 1], ...points, points[0], points[1], points[2], points[3] ];
|
|
@@ -2671,7 +2678,9 @@ const BezierHelper = {
|
|
|
2671
2678
|
bY = points[i + 1];
|
|
2672
2679
|
cX = points[i + 2];
|
|
2673
2680
|
cY = points[i + 3];
|
|
2674
|
-
|
|
2681
|
+
baX = bX - aX;
|
|
2682
|
+
baY = bY - aY;
|
|
2683
|
+
ba = sqrt$3(pow$1(baX, 2) + pow$1(baY, 2));
|
|
2675
2684
|
cb = sqrt$3(pow$1(cX - bX, 2) + pow$1(cY - bY, 2));
|
|
2676
2685
|
if (!ba && !cb) continue;
|
|
2677
2686
|
d = ba + cb;
|
|
@@ -2684,7 +2693,7 @@ const BezierHelper = {
|
|
|
2684
2693
|
if (i === 2) {
|
|
2685
2694
|
if (!close) data.push(Q$4, c1X, c1Y, bX, bY);
|
|
2686
2695
|
} else {
|
|
2687
|
-
data.push(C$5, c2X, c2Y, c1X, c1Y, bX, bY);
|
|
2696
|
+
if (baX || baY) data.push(C$5, c2X, c2Y, c1X, c1Y, bX, bY);
|
|
2688
2697
|
}
|
|
2689
2698
|
c2X = bX + cb * cX;
|
|
2690
2699
|
c2Y = bY + cb * cY;
|
|
@@ -2819,8 +2828,8 @@ const BezierHelper = {
|
|
|
2819
2828
|
addMode ? addPoint$1(pointBounds, fromX, fromY) : setPoint$1(pointBounds, fromX, fromY);
|
|
2820
2829
|
addPoint$1(pointBounds, toX, toY);
|
|
2821
2830
|
for (let i = 0, len = tList.length; i < len; i++) {
|
|
2822
|
-
getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$
|
|
2823
|
-
addPoint$1(pointBounds, tempPoint$
|
|
2831
|
+
getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$3);
|
|
2832
|
+
addPoint$1(pointBounds, tempPoint$3.x, tempPoint$3.y);
|
|
2824
2833
|
}
|
|
2825
2834
|
},
|
|
2826
2835
|
getPointAndSet(t, fromX, fromY, x1, y1, x2, y2, toX, toY, setPoint) {
|
|
@@ -3269,6 +3278,7 @@ const PathCommandDataHelper = {
|
|
|
3269
3278
|
}
|
|
3270
3279
|
},
|
|
3271
3280
|
ellipse(data, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
|
|
3281
|
+
if (radiusX === radiusY) return arc$2(data, x, y, radiusX, startAngle, endAngle, anticlockwise);
|
|
3272
3282
|
if (isNull(rotation)) {
|
|
3273
3283
|
data.push(F$3, x, y, radiusX, radiusY);
|
|
3274
3284
|
} else {
|
|
@@ -3281,6 +3291,7 @@ const PathCommandDataHelper = {
|
|
|
3281
3291
|
if (isNull(startAngle)) {
|
|
3282
3292
|
data.push(P$2, x, y, radius);
|
|
3283
3293
|
} else {
|
|
3294
|
+
if (isNull(startAngle)) startAngle = 0;
|
|
3284
3295
|
if (isNull(endAngle)) endAngle = 360;
|
|
3285
3296
|
data.push(O$2, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0);
|
|
3286
3297
|
}
|
|
@@ -3490,7 +3501,7 @@ const {M: M$2, L: L$3, C: C$1, Q: Q, Z: Z$2, N: N, D: D$1, X: X, G: G, F: F$1, O
|
|
|
3490
3501
|
|
|
3491
3502
|
const {toTwoPointBounds: toTwoPointBounds, toTwoPointBoundsByQuadraticCurve: toTwoPointBoundsByQuadraticCurve, arcTo: arcTo$1, arc: arc, ellipse: ellipse$1} = BezierHelper;
|
|
3492
3503
|
|
|
3493
|
-
const {addPointBounds: addPointBounds, copy: copy$
|
|
3504
|
+
const {addPointBounds: addPointBounds, copy: copy$6, addPoint: addPoint, setPoint: setPoint, addBounds: addBounds, toBounds: toBounds$1} = TwoPointBoundsHelper;
|
|
3494
3505
|
|
|
3495
3506
|
const debug$a = Debug.get("PathBounds");
|
|
3496
3507
|
|
|
@@ -3572,7 +3583,7 @@ const PathBounds = {
|
|
|
3572
3583
|
|
|
3573
3584
|
case G:
|
|
3574
3585
|
ellipse$1(null, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6], data[i + 7], data[i + 8], tempPointBounds, setEndPoint);
|
|
3575
|
-
i === 0 ? copy$
|
|
3586
|
+
i === 0 ? copy$6(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
|
|
3576
3587
|
x = setEndPoint.x;
|
|
3577
3588
|
y = setEndPoint.y;
|
|
3578
3589
|
i += 9;
|
|
@@ -3590,7 +3601,7 @@ const PathBounds = {
|
|
|
3590
3601
|
|
|
3591
3602
|
case O:
|
|
3592
3603
|
arc(null, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6], tempPointBounds, setEndPoint);
|
|
3593
|
-
i === 0 ? copy$
|
|
3604
|
+
i === 0 ? copy$6(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
|
|
3594
3605
|
x = setEndPoint.x;
|
|
3595
3606
|
y = setEndPoint.y;
|
|
3596
3607
|
i += 7;
|
|
@@ -3607,7 +3618,7 @@ const PathBounds = {
|
|
|
3607
3618
|
|
|
3608
3619
|
case U:
|
|
3609
3620
|
arcTo$1(null, x, y, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], tempPointBounds, setEndPoint);
|
|
3610
|
-
i === 0 ? copy$
|
|
3621
|
+
i === 0 ? copy$6(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
|
|
3611
3622
|
x = setEndPoint.x;
|
|
3612
3623
|
y = setEndPoint.y;
|
|
3613
3624
|
i += 6;
|
|
@@ -3631,6 +3642,7 @@ const PathCorner = {
|
|
|
3631
3642
|
smooth(data, cornerRadius, _cornerSmoothing) {
|
|
3632
3643
|
let command, lastCommand, commandLen;
|
|
3633
3644
|
let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
|
|
3645
|
+
if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0;
|
|
3634
3646
|
const len = data.length;
|
|
3635
3647
|
const smooth = [];
|
|
3636
3648
|
while (i < len) {
|
|
@@ -4046,7 +4058,9 @@ const R = Resource;
|
|
|
4046
4058
|
const ImageManager = {
|
|
4047
4059
|
maxRecycled: 10,
|
|
4048
4060
|
recycledList: [],
|
|
4049
|
-
patternTasker: new TaskProcessor
|
|
4061
|
+
patternTasker: new TaskProcessor({
|
|
4062
|
+
parallel: 1
|
|
4063
|
+
}),
|
|
4050
4064
|
get(config) {
|
|
4051
4065
|
let image = Resource.get(config.url);
|
|
4052
4066
|
if (!image) Resource.set(config.url, image = Creator.image(config));
|
|
@@ -4103,6 +4117,10 @@ class LeaferImage {
|
|
|
4103
4117
|
get url() {
|
|
4104
4118
|
return this.config.url;
|
|
4105
4119
|
}
|
|
4120
|
+
get crossOrigin() {
|
|
4121
|
+
const {crossOrigin: crossOrigin} = this.config;
|
|
4122
|
+
return isUndefined(crossOrigin) ? Platform.image.crossOrigin : crossOrigin;
|
|
4123
|
+
}
|
|
4106
4124
|
get completed() {
|
|
4107
4125
|
return this.ready || !!this.error;
|
|
4108
4126
|
}
|
|
@@ -4120,12 +4138,14 @@ class LeaferImage {
|
|
|
4120
4138
|
ImageManager.isFormat("svg", config) && (this.isSVG = true);
|
|
4121
4139
|
ImageManager.hasAlphaPixel(config) && (this.hasAlphaPixel = true);
|
|
4122
4140
|
}
|
|
4123
|
-
load(onSuccess, onError) {
|
|
4141
|
+
load(onSuccess, onError, thumbSize) {
|
|
4124
4142
|
if (!this.loading) {
|
|
4125
4143
|
this.loading = true;
|
|
4126
|
-
const {crossOrigin: crossOrigin} = this.config;
|
|
4127
4144
|
Resource.tasker.add(() => __awaiter(this, void 0, void 0, function*() {
|
|
4128
|
-
return yield Platform.origin.loadImage(this.
|
|
4145
|
+
return yield Platform.origin.loadImage(this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
|
|
4146
|
+
if (thumbSize) this.setThumbView(img);
|
|
4147
|
+
this.setView(img);
|
|
4148
|
+
}).catch(e => {
|
|
4129
4149
|
this.error = e;
|
|
4130
4150
|
this.onComplete(false);
|
|
4131
4151
|
});
|
|
@@ -4146,9 +4166,11 @@ class LeaferImage {
|
|
|
4146
4166
|
}
|
|
4147
4167
|
setView(img) {
|
|
4148
4168
|
this.ready = true;
|
|
4149
|
-
this.width
|
|
4150
|
-
|
|
4151
|
-
|
|
4169
|
+
if (!this.width) {
|
|
4170
|
+
this.width = img.width;
|
|
4171
|
+
this.height = img.height;
|
|
4172
|
+
this.view = img;
|
|
4173
|
+
}
|
|
4152
4174
|
this.onComplete(true);
|
|
4153
4175
|
}
|
|
4154
4176
|
onComplete(isSuccess) {
|
|
@@ -4194,6 +4216,19 @@ class LeaferImage {
|
|
|
4194
4216
|
Platform.image.setPatternTransform(pattern, transform, paint);
|
|
4195
4217
|
return pattern;
|
|
4196
4218
|
}
|
|
4219
|
+
getLoadUrl(_thumbSize) {
|
|
4220
|
+
return this.url;
|
|
4221
|
+
}
|
|
4222
|
+
setThumbView(_view) {}
|
|
4223
|
+
getThumbSize() {
|
|
4224
|
+
return undefined;
|
|
4225
|
+
}
|
|
4226
|
+
getMinLevel() {
|
|
4227
|
+
return undefined;
|
|
4228
|
+
}
|
|
4229
|
+
getLevelData(_level) {
|
|
4230
|
+
return undefined;
|
|
4231
|
+
}
|
|
4197
4232
|
clearLevels(_checkUse) {}
|
|
4198
4233
|
destroy() {
|
|
4199
4234
|
this.clearLevels();
|
|
@@ -4627,7 +4662,7 @@ function registerUIEvent() {
|
|
|
4627
4662
|
};
|
|
4628
4663
|
}
|
|
4629
4664
|
|
|
4630
|
-
const {copy: copy$
|
|
4665
|
+
const {copy: copy$5, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter: skewOfOuter, multiplyParent: multiplyParent$3, divideParent: divideParent, getLayout: getLayout} = MatrixHelper;
|
|
4631
4666
|
|
|
4632
4667
|
const matrix$1 = {}, {round: round$3} = Math;
|
|
4633
4668
|
|
|
@@ -4725,7 +4760,7 @@ const LeafHelper = {
|
|
|
4725
4760
|
if (scaleY) transition = scaleY;
|
|
4726
4761
|
scaleY = scaleX;
|
|
4727
4762
|
}
|
|
4728
|
-
copy$
|
|
4763
|
+
copy$5(matrix$1, o);
|
|
4729
4764
|
scaleOfOuter$2(matrix$1, origin, scaleX, scaleY);
|
|
4730
4765
|
if (L$1.hasHighPosition(t)) {
|
|
4731
4766
|
L$1.setTransform(t, matrix$1, resize, transition);
|
|
@@ -4744,7 +4779,7 @@ const LeafHelper = {
|
|
|
4744
4779
|
},
|
|
4745
4780
|
rotateOfLocal(t, origin, angle, transition) {
|
|
4746
4781
|
const o = t.__localMatrix;
|
|
4747
|
-
copy$
|
|
4782
|
+
copy$5(matrix$1, o);
|
|
4748
4783
|
rotateOfOuter$2(matrix$1, origin, angle);
|
|
4749
4784
|
if (L$1.hasHighPosition(t)) L$1.setTransform(t, matrix$1, false, transition); else t.set({
|
|
4750
4785
|
x: t.x + matrix$1.e - o.e,
|
|
@@ -4756,18 +4791,18 @@ const LeafHelper = {
|
|
|
4756
4791
|
L$1.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY, resize, transition);
|
|
4757
4792
|
},
|
|
4758
4793
|
skewOfLocal(t, origin, skewX, skewY = 0, resize, transition) {
|
|
4759
|
-
copy$
|
|
4794
|
+
copy$5(matrix$1, t.__localMatrix);
|
|
4760
4795
|
skewOfOuter(matrix$1, origin, skewX, skewY);
|
|
4761
4796
|
L$1.setTransform(t, matrix$1, resize, transition);
|
|
4762
4797
|
},
|
|
4763
4798
|
transformWorld(t, transform, resize, transition) {
|
|
4764
|
-
copy$
|
|
4799
|
+
copy$5(matrix$1, t.worldTransform);
|
|
4765
4800
|
multiplyParent$3(matrix$1, transform);
|
|
4766
4801
|
if (t.parent) divideParent(matrix$1, t.parent.scrollWorldTransform);
|
|
4767
4802
|
L$1.setTransform(t, matrix$1, resize, transition);
|
|
4768
4803
|
},
|
|
4769
4804
|
transform(t, transform, resize, transition) {
|
|
4770
|
-
copy$
|
|
4805
|
+
copy$5(matrix$1, t.localTransform);
|
|
4771
4806
|
multiplyParent$3(matrix$1, transform);
|
|
4772
4807
|
L$1.setTransform(t, matrix$1, resize, transition);
|
|
4773
4808
|
},
|
|
@@ -4805,7 +4840,7 @@ const LeafHelper = {
|
|
|
4805
4840
|
return innerOrigin;
|
|
4806
4841
|
},
|
|
4807
4842
|
getRelativeWorld(t, relative, temp) {
|
|
4808
|
-
copy$
|
|
4843
|
+
copy$5(matrix$1, t.worldTransform);
|
|
4809
4844
|
divideParent(matrix$1, relative.scrollWorldTransform);
|
|
4810
4845
|
return temp ? matrix$1 : Object.assign({}, matrix$1);
|
|
4811
4846
|
},
|
|
@@ -5013,7 +5048,7 @@ const WaitHelper = {
|
|
|
5013
5048
|
|
|
5014
5049
|
const {getRelativeWorld: getRelativeWorld$1, updateBounds: updateBounds$3} = LeafHelper;
|
|
5015
5050
|
|
|
5016
|
-
const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$
|
|
5051
|
+
const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$4} = BoundsHelper;
|
|
5017
5052
|
|
|
5018
5053
|
const localContent = "_localContentBounds";
|
|
5019
5054
|
|
|
@@ -5252,7 +5287,7 @@ class LeafLayout {
|
|
|
5252
5287
|
matrix = getRelativeWorld$1(leaf, relative, true);
|
|
5253
5288
|
}
|
|
5254
5289
|
if (!layoutBounds) layoutBounds = MatrixHelper.getLayout(matrix);
|
|
5255
|
-
copy$
|
|
5290
|
+
copy$4(layoutBounds, bounds);
|
|
5256
5291
|
PointHelper.copy(layoutBounds, point);
|
|
5257
5292
|
if (unscale) {
|
|
5258
5293
|
const {scaleX: scaleX, scaleY: scaleY} = layoutBounds;
|
|
@@ -5874,7 +5909,7 @@ const LeafDataProxy = {
|
|
|
5874
5909
|
|
|
5875
5910
|
const {setLayout: setLayout, multiplyParent: multiplyParent$2, translateInner: translateInner, defaultWorld: defaultWorld} = MatrixHelper;
|
|
5876
5911
|
|
|
5877
|
-
const {toPoint: toPoint$3, tempPoint: tempPoint$
|
|
5912
|
+
const {toPoint: toPoint$3, tempPoint: tempPoint$2} = AroundHelper;
|
|
5878
5913
|
|
|
5879
5914
|
const LeafMatrix = {
|
|
5880
5915
|
__updateWorldMatrix() {
|
|
@@ -5894,8 +5929,8 @@ const LeafMatrix = {
|
|
|
5894
5929
|
local.e = data.x + data.offsetX;
|
|
5895
5930
|
local.f = data.y + data.offsetY;
|
|
5896
5931
|
if (data.around || data.origin) {
|
|
5897
|
-
toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$
|
|
5898
|
-
translateInner(local, -tempPoint$
|
|
5932
|
+
toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$2);
|
|
5933
|
+
translateInner(local, -tempPoint$2.x, -tempPoint$2.y, !data.around);
|
|
5899
5934
|
}
|
|
5900
5935
|
}
|
|
5901
5936
|
this.__layout.matrixChanged = undefined;
|
|
@@ -5906,7 +5941,7 @@ const {updateMatrix: updateMatrix$2, updateAllMatrix: updateAllMatrix$3} = LeafH
|
|
|
5906
5941
|
|
|
5907
5942
|
const {updateBounds: updateBounds$2} = BranchHelper;
|
|
5908
5943
|
|
|
5909
|
-
const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$2, copy: copy$
|
|
5944
|
+
const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$2, copy: copy$3} = BoundsHelper;
|
|
5910
5945
|
|
|
5911
5946
|
const {toBounds: toBounds} = PathBounds;
|
|
5912
5947
|
|
|
@@ -6017,7 +6052,7 @@ const LeafBounds = {
|
|
|
6017
6052
|
},
|
|
6018
6053
|
__updateRenderBounds(_bounds) {
|
|
6019
6054
|
const layout = this.__layout, {renderSpread: renderSpread} = layout;
|
|
6020
|
-
isNumber(renderSpread) && renderSpread <= 0 ? copy$
|
|
6055
|
+
isNumber(renderSpread) && renderSpread <= 0 ? copy$3(layout.renderBounds, layout.strokeBounds) : copyAndSpread$2(layout.renderBounds, layout.boxBounds, renderSpread);
|
|
6021
6056
|
}
|
|
6022
6057
|
};
|
|
6023
6058
|
|
|
@@ -6122,7 +6157,7 @@ const {toInnerPoint: toInnerPoint, toOuterPoint: toOuterPoint, multiplyParent: m
|
|
|
6122
6157
|
|
|
6123
6158
|
const {toOuterOf: toOuterOf$1} = BoundsHelper;
|
|
6124
6159
|
|
|
6125
|
-
const {copy: copy$
|
|
6160
|
+
const {copy: copy$2, move: move$2} = PointHelper;
|
|
6126
6161
|
|
|
6127
6162
|
const {moveLocal: moveLocal, zoomOfLocal: zoomOfLocal, rotateOfLocal: rotateOfLocal, skewOfLocal: skewOfLocal, moveWorld: moveWorld, zoomOfWorld: zoomOfWorld, rotateOfWorld: rotateOfWorld, skewOfWorld: skewOfWorld, transform: transform, transformWorld: transformWorld, setTransform: setTransform, getFlipTransform: getFlipTransform, getLocalOrigin: getLocalOrigin, getRelativeWorld: getRelativeWorld, drop: drop} = LeafHelper;
|
|
6128
6163
|
|
|
@@ -6441,14 +6476,14 @@ let Leaf = class Leaf {
|
|
|
6441
6476
|
if (this.parent) {
|
|
6442
6477
|
this.parent.worldToInner(world, to, distance, relative);
|
|
6443
6478
|
} else {
|
|
6444
|
-
if (to) copy$
|
|
6479
|
+
if (to) copy$2(to, world);
|
|
6445
6480
|
}
|
|
6446
6481
|
}
|
|
6447
6482
|
localToWorld(local, to, distance, relative) {
|
|
6448
6483
|
if (this.parent) {
|
|
6449
6484
|
this.parent.innerToWorld(local, to, distance, relative);
|
|
6450
6485
|
} else {
|
|
6451
|
-
if (to) copy$
|
|
6486
|
+
if (to) copy$2(to, local);
|
|
6452
6487
|
}
|
|
6453
6488
|
}
|
|
6454
6489
|
worldToInner(world, to, distance, relative) {
|
|
@@ -6923,7 +6958,7 @@ class LeafLevelList {
|
|
|
6923
6958
|
}
|
|
6924
6959
|
}
|
|
6925
6960
|
|
|
6926
|
-
const version = "1.12.
|
|
6961
|
+
const version = "1.12.3";
|
|
6927
6962
|
|
|
6928
6963
|
class LeaferCanvas extends LeaferCanvasBase {
|
|
6929
6964
|
get allowBackgroundColor() {
|
|
@@ -7725,6 +7760,10 @@ class Renderer {
|
|
|
7725
7760
|
|
|
7726
7761
|
Renderer.clipSpread = 10;
|
|
7727
7762
|
|
|
7763
|
+
const tempPoint$1 = {};
|
|
7764
|
+
|
|
7765
|
+
const {copyRadiusPoint: copyRadiusPoint$1} = PointHelper;
|
|
7766
|
+
|
|
7728
7767
|
const {hitRadiusPoint: hitRadiusPoint$1} = BoundsHelper;
|
|
7729
7768
|
|
|
7730
7769
|
class Picker {
|
|
@@ -7851,15 +7890,15 @@ class Picker {
|
|
|
7851
7890
|
this.eachFind(branch.children, branch.__onlyHitMask);
|
|
7852
7891
|
}
|
|
7853
7892
|
eachFind(children, hitMask) {
|
|
7854
|
-
let child, hit;
|
|
7893
|
+
let child, hit, data;
|
|
7855
7894
|
const {point: point} = this, len = children.length;
|
|
7856
7895
|
for (let i = len - 1; i > -1; i--) {
|
|
7857
|
-
child = children[i];
|
|
7858
|
-
if (!
|
|
7859
|
-
hit = child.
|
|
7896
|
+
child = children[i], data = child.__;
|
|
7897
|
+
if (!data.visible || hitMask && !data.mask) continue;
|
|
7898
|
+
hit = hitRadiusPoint$1(child.__world, data.hitRadius ? copyRadiusPoint$1(tempPoint$1, point, data.hitRadius) : point);
|
|
7860
7899
|
if (child.isBranch) {
|
|
7861
7900
|
if (hit || child.__ignoreHitWorld) {
|
|
7862
|
-
if (child.isBranchLeaf &&
|
|
7901
|
+
if (child.isBranchLeaf && data.__clipAfterFill && !child.__hitWorld(point, true)) continue;
|
|
7863
7902
|
if (child.topChildren) this.eachFind(child.topChildren, false);
|
|
7864
7903
|
this.eachFind(child.children, child.__onlyHitMask);
|
|
7865
7904
|
if (child.isBranchLeaf) this.hitChild(child, point);
|
|
@@ -8436,7 +8475,7 @@ const UIRender = {
|
|
|
8436
8475
|
if (stroke && !__fillAfterStroke) data.__isStrokes ? Paint.strokes(stroke, this, canvas, options) : Paint.stroke(stroke, this, canvas, options);
|
|
8437
8476
|
}
|
|
8438
8477
|
} else {
|
|
8439
|
-
if (data.
|
|
8478
|
+
if (data.__pathForRender) drawFast(this, canvas, options); else this.__drawFast(canvas, options);
|
|
8440
8479
|
}
|
|
8441
8480
|
},
|
|
8442
8481
|
__drawShape(canvas, options) {
|
|
@@ -8560,7 +8599,7 @@ let UI = UI_1 = class UI extends Leaf {
|
|
|
8560
8599
|
getPath(curve, pathForRender) {
|
|
8561
8600
|
this.__layout.update();
|
|
8562
8601
|
let path = pathForRender ? this.__.__pathForRender : this.__.path;
|
|
8563
|
-
if (!path) pen.set(path = []), this.__drawPathByBox(pen);
|
|
8602
|
+
if (!path) pen.set(path = []), this.__drawPathByBox(pen, !pathForRender);
|
|
8564
8603
|
return curve ? PathConvert.toCanvasData(path, true) : path;
|
|
8565
8604
|
}
|
|
8566
8605
|
getPathString(curve, pathForRender, floatLength) {
|
|
@@ -8588,17 +8627,18 @@ let UI = UI_1 = class UI extends Leaf {
|
|
|
8588
8627
|
}
|
|
8589
8628
|
__drawPath(canvas) {
|
|
8590
8629
|
canvas.beginPath();
|
|
8591
|
-
this.__drawPathByData(canvas, this.__.path);
|
|
8630
|
+
this.__drawPathByData(canvas, this.__.path, true);
|
|
8592
8631
|
}
|
|
8593
|
-
__drawPathByData(drawer, data) {
|
|
8594
|
-
data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer);
|
|
8632
|
+
__drawPathByData(drawer, data, ignoreCornerRadius) {
|
|
8633
|
+
data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer, ignoreCornerRadius);
|
|
8595
8634
|
}
|
|
8596
|
-
__drawPathByBox(drawer) {
|
|
8635
|
+
__drawPathByBox(drawer, ignoreCornerRadius) {
|
|
8597
8636
|
const {x: x, y: y, width: width, height: height} = this.__layout.boxBounds;
|
|
8598
|
-
if (this.__.cornerRadius) {
|
|
8637
|
+
if (this.__.cornerRadius && !ignoreCornerRadius) {
|
|
8599
8638
|
const {cornerRadius: cornerRadius} = this.__;
|
|
8600
8639
|
drawer.roundRect(x, y, width, height, isNumber(cornerRadius) ? [ cornerRadius ] : cornerRadius);
|
|
8601
8640
|
} else drawer.rect(x, y, width, height);
|
|
8641
|
+
drawer.closePath();
|
|
8602
8642
|
}
|
|
8603
8643
|
drawImagePlaceholder(_paint, canvas, renderOptions) {
|
|
8604
8644
|
Paint.fill(this.__.placeholderColor, this, canvas, renderOptions);
|
|
@@ -8867,6 +8907,9 @@ let Leafer = Leafer_1 = class Leafer extends Group {
|
|
|
8867
8907
|
get layoutLocked() {
|
|
8868
8908
|
return !this.layouter.running;
|
|
8869
8909
|
}
|
|
8910
|
+
get view() {
|
|
8911
|
+
return this.canvas && this.canvas.view;
|
|
8912
|
+
}
|
|
8870
8913
|
get FPS() {
|
|
8871
8914
|
return this.renderer ? this.renderer.FPS : 60;
|
|
8872
8915
|
}
|
|
@@ -8918,7 +8961,6 @@ let Leafer = Leafer_1 = class Leafer extends Group {
|
|
|
8918
8961
|
this.__controllers.push(this.renderer = Creator.renderer(this, canvas, config), this.watcher = Creator.watcher(this, config), this.layouter = Creator.layouter(this, config));
|
|
8919
8962
|
if (this.isApp) this.__setApp();
|
|
8920
8963
|
this.__checkAutoLayout();
|
|
8921
|
-
this.view = canvas.view;
|
|
8922
8964
|
if (!parentApp) {
|
|
8923
8965
|
this.selector = Creator.selector(this);
|
|
8924
8966
|
this.interaction = Creator.interaction(this, canvas, this.selector, config);
|
|
@@ -9198,7 +9240,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
|
|
|
9198
9240
|
if (this.canvasManager) this.canvasManager.destroy();
|
|
9199
9241
|
}
|
|
9200
9242
|
if (this.canvas) this.canvas.destroy();
|
|
9201
|
-
this.config.view = this.
|
|
9243
|
+
this.config.view = this.parentApp = null;
|
|
9202
9244
|
if (this.userConfig) this.userConfig.view = null;
|
|
9203
9245
|
super.destroy();
|
|
9204
9246
|
setTimeout(() => {
|
|
@@ -9382,7 +9424,6 @@ let Ellipse = class Ellipse extends UI {
|
|
|
9382
9424
|
if (startAngle || endAngle) {
|
|
9383
9425
|
if (innerRadius < 1) ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle, false);
|
|
9384
9426
|
ellipse(path, rx, ry, rx, ry, 0, endAngle, startAngle, true);
|
|
9385
|
-
if (innerRadius < 1) closePath$2(path);
|
|
9386
9427
|
} else {
|
|
9387
9428
|
if (innerRadius < 1) {
|
|
9388
9429
|
ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius);
|
|
@@ -9390,16 +9431,16 @@ let Ellipse = class Ellipse extends UI {
|
|
|
9390
9431
|
}
|
|
9391
9432
|
ellipse(path, rx, ry, rx, ry, 0, 360, 0, true);
|
|
9392
9433
|
}
|
|
9393
|
-
if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
|
|
9394
9434
|
} else {
|
|
9395
9435
|
if (startAngle || endAngle) {
|
|
9396
9436
|
moveTo$3(path, rx, ry);
|
|
9397
9437
|
ellipse(path, rx, ry, rx, ry, 0, startAngle, endAngle, false);
|
|
9398
|
-
closePath$2(path);
|
|
9399
9438
|
} else {
|
|
9400
9439
|
ellipse(path, rx, ry, rx, ry);
|
|
9401
9440
|
}
|
|
9402
9441
|
}
|
|
9442
|
+
closePath$2(path);
|
|
9443
|
+
if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
|
|
9403
9444
|
}
|
|
9404
9445
|
};
|
|
9405
9446
|
|
|
@@ -10050,7 +10091,7 @@ class UIEvent extends Event {
|
|
|
10050
10091
|
}
|
|
10051
10092
|
}
|
|
10052
10093
|
|
|
10053
|
-
const {min: min, max: max$1, abs: abs$3} = Math, {float: float$
|
|
10094
|
+
const {min: min, max: max$1, abs: abs$3} = Math, {float: float$2, sign: sign} = MathHelper, {minX: minX, maxX: maxX, minY: minY, maxY: maxY} = BoundsHelper;
|
|
10054
10095
|
|
|
10055
10096
|
const tempContent = new Bounds, tempDragBounds = new Bounds;
|
|
10056
10097
|
|
|
@@ -10090,8 +10131,8 @@ const DragBoundsHelper = {
|
|
|
10090
10131
|
} else {
|
|
10091
10132
|
if (y < dragBounds.y) move.y += dragBounds.y - y; else if (bottom > boundsBottom) move.y += boundsBottom - bottom;
|
|
10092
10133
|
}
|
|
10093
|
-
move.x = float$
|
|
10094
|
-
move.y = float$
|
|
10134
|
+
move.x = float$2(move.x);
|
|
10135
|
+
move.y = float$2(move.y);
|
|
10095
10136
|
return move;
|
|
10096
10137
|
},
|
|
10097
10138
|
getValidScaleOf(content, dragBounds, dragBoundsType, origin, scale, lockRatio, change) {
|
|
@@ -10103,26 +10144,26 @@ const DragBoundsHelper = {
|
|
|
10103
10144
|
let correctScaleX = 1, correctScaleY = 1, aScale, bScale, aSize, bSize;
|
|
10104
10145
|
if (D.isInnerMode(content, dragBounds, dragBoundsType, "width")) {
|
|
10105
10146
|
if (scale.x < 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
|
|
10106
|
-
aSize = float$
|
|
10107
|
-
bSize = float$
|
|
10147
|
+
aSize = float$2(tempContent.minX - tempDragBounds.minX);
|
|
10148
|
+
bSize = float$2(tempDragBounds.maxX - tempContent.maxX);
|
|
10108
10149
|
aScale = originLeftScale && aSize > 0 ? 1 + aSize / (originLeftScale * tempContent.width) : 1;
|
|
10109
10150
|
bScale = originRightScale && bSize > 0 ? 1 + bSize / (originRightScale * tempContent.width) : 1;
|
|
10110
10151
|
correctScaleX *= max$1(aScale, bScale);
|
|
10111
10152
|
} else {
|
|
10112
10153
|
if (scale.x < 0) {
|
|
10113
|
-
if (float$
|
|
10154
|
+
if (float$2(minX(content) - minX(dragBounds)) <= 0 || float$2(maxX(dragBounds) - maxX(content)) <= 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
|
|
10114
10155
|
tempContent.unsign();
|
|
10115
10156
|
}
|
|
10116
|
-
aSize = float$
|
|
10117
|
-
bSize = float$
|
|
10157
|
+
aSize = float$2(tempDragBounds.minX - tempContent.minX);
|
|
10158
|
+
bSize = float$2(tempContent.maxX - tempDragBounds.maxX);
|
|
10118
10159
|
aScale = originLeftScale && aSize > 0 ? 1 - aSize / (originLeftScale * tempContent.width) : 1;
|
|
10119
10160
|
bScale = originRightScale && bSize > 0 ? 1 - bSize / (originRightScale * tempContent.width) : 1;
|
|
10120
10161
|
correctScaleX *= min(aScale, bScale);
|
|
10121
10162
|
}
|
|
10122
10163
|
if (D.isInnerMode(content, dragBounds, dragBoundsType, "height")) {
|
|
10123
10164
|
if (scale.y < 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
|
|
10124
|
-
aSize = float$
|
|
10125
|
-
bSize = float$
|
|
10165
|
+
aSize = float$2(tempContent.minY - tempDragBounds.minY);
|
|
10166
|
+
bSize = float$2(tempDragBounds.maxY - tempContent.maxY);
|
|
10126
10167
|
aScale = originTopScale && aSize > 0 ? 1 + aSize / (originTopScale * tempContent.height) : 1;
|
|
10127
10168
|
bScale = originBottomScale && bSize > 0 ? 1 + bSize / (originBottomScale * tempContent.height) : 1;
|
|
10128
10169
|
correctScaleY *= max$1(aScale, bScale);
|
|
@@ -10133,11 +10174,11 @@ const DragBoundsHelper = {
|
|
|
10133
10174
|
}
|
|
10134
10175
|
} else {
|
|
10135
10176
|
if (scale.y < 0) {
|
|
10136
|
-
if (float$
|
|
10177
|
+
if (float$2(minY(content) - minY(dragBounds)) <= 0 || float$2(maxY(dragBounds) - maxY(content)) <= 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
|
|
10137
10178
|
tempContent.unsign();
|
|
10138
10179
|
}
|
|
10139
|
-
aSize = float$
|
|
10140
|
-
bSize = float$
|
|
10180
|
+
aSize = float$2(tempDragBounds.minY - tempContent.minY);
|
|
10181
|
+
bSize = float$2(tempContent.maxY - tempDragBounds.maxY);
|
|
10141
10182
|
aScale = originTopScale && aSize > 0 ? 1 - aSize / (originTopScale * tempContent.height) : 1;
|
|
10142
10183
|
bScale = originBottomScale && bSize > 0 ? 1 - bSize / (originBottomScale * tempContent.height) : 1;
|
|
10143
10184
|
correctScaleY *= min(aScale, bScale);
|
|
@@ -10289,8 +10330,14 @@ MoveEvent.START = "move.start";
|
|
|
10289
10330
|
|
|
10290
10331
|
MoveEvent.MOVE = "move";
|
|
10291
10332
|
|
|
10333
|
+
MoveEvent.DRAG_ANIMATE = "move.drag_animate";
|
|
10334
|
+
|
|
10292
10335
|
MoveEvent.END = "move.end";
|
|
10293
10336
|
|
|
10337
|
+
MoveEvent.PULL_DOWN = "move.pull_down";
|
|
10338
|
+
|
|
10339
|
+
MoveEvent.REACH_BOTTOM = "move.reach_bottom";
|
|
10340
|
+
|
|
10294
10341
|
MoveEvent = __decorate([ registerUIEvent() ], MoveEvent);
|
|
10295
10342
|
|
|
10296
10343
|
let TouchEvent = class TouchEvent extends UIEvent {};
|
|
@@ -10387,6 +10434,7 @@ const InteractionHelper = {
|
|
|
10387
10434
|
ctrlKey: e.ctrlKey,
|
|
10388
10435
|
shiftKey: e.shiftKey,
|
|
10389
10436
|
metaKey: e.metaKey,
|
|
10437
|
+
time: Date.now(),
|
|
10390
10438
|
buttons: isUndefined(e.buttons) ? 1 : e.buttons === 0 ? pointerUpButtons : e.buttons,
|
|
10391
10439
|
origin: e
|
|
10392
10440
|
};
|
|
@@ -10422,6 +10470,7 @@ const {getDragEventData: getDragEventData, getDropEventData: getDropEventData, g
|
|
|
10422
10470
|
|
|
10423
10471
|
class Dragger {
|
|
10424
10472
|
constructor(interaction) {
|
|
10473
|
+
this.dragDataList = [];
|
|
10425
10474
|
this.interaction = interaction;
|
|
10426
10475
|
}
|
|
10427
10476
|
setDragData(data) {
|
|
@@ -10484,6 +10533,7 @@ class Dragger {
|
|
|
10484
10533
|
this.dragData = getDragEventData(downData, dragData, data);
|
|
10485
10534
|
if (throughPath) this.dragData.throughPath = throughPath;
|
|
10486
10535
|
this.dragData.path = path;
|
|
10536
|
+
this.dragDataList.push(this.dragData);
|
|
10487
10537
|
if (this.moving) {
|
|
10488
10538
|
data.moving = true;
|
|
10489
10539
|
this.dragData.moveType = "drag";
|
|
@@ -10534,9 +10584,9 @@ class Dragger {
|
|
|
10534
10584
|
interaction.emit(DragEvent.ENTER, data, path, dragEnterPath);
|
|
10535
10585
|
this.dragEnterPath = path;
|
|
10536
10586
|
}
|
|
10537
|
-
dragEnd(data
|
|
10587
|
+
dragEnd(data) {
|
|
10538
10588
|
if (!this.dragging && !this.moving) return;
|
|
10539
|
-
if (this.checkDragEndAnimate(data
|
|
10589
|
+
if (this.checkDragEndAnimate(data)) return;
|
|
10540
10590
|
this.dragEndReal(data);
|
|
10541
10591
|
}
|
|
10542
10592
|
dragEndReal(data) {
|
|
@@ -10578,11 +10628,13 @@ class Dragger {
|
|
|
10578
10628
|
}
|
|
10579
10629
|
dragReset() {
|
|
10580
10630
|
DragEvent.list = DragEvent.data = this.draggableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null;
|
|
10631
|
+
this.dragDataList = [];
|
|
10581
10632
|
}
|
|
10582
10633
|
checkDragEndAnimate(_data, _speed) {
|
|
10583
10634
|
return false;
|
|
10584
10635
|
}
|
|
10585
10636
|
animate(_func, _off) {}
|
|
10637
|
+
stopAnimate() {}
|
|
10586
10638
|
checkDragOut(_data) {}
|
|
10587
10639
|
autoMoveOnDragOut(_data) {}
|
|
10588
10640
|
autoMoveCancel() {}
|
|
@@ -10976,6 +11028,9 @@ class InteractionBase {
|
|
|
10976
11028
|
this.pointerHover(hoverData);
|
|
10977
11029
|
}
|
|
10978
11030
|
}
|
|
11031
|
+
stopDragAnimate() {
|
|
11032
|
+
this.dragger.stopAnimate();
|
|
11033
|
+
}
|
|
10979
11034
|
updateDownData(data, options, merge) {
|
|
10980
11035
|
const {downData: downData} = this;
|
|
10981
11036
|
if (!data && downData) data = downData;
|
|
@@ -11159,7 +11214,7 @@ Platform.getSelector = function(leaf) {
|
|
|
11159
11214
|
return leaf.leafer ? leaf.leafer.selector : Platform.selector || (Platform.selector = Creator.selector());
|
|
11160
11215
|
};
|
|
11161
11216
|
|
|
11162
|
-
const {toInnerRadiusPointOf: toInnerRadiusPointOf,
|
|
11217
|
+
const {toInnerRadiusPointOf: toInnerRadiusPointOf, copyRadiusPoint: copyRadiusPoint} = PointHelper;
|
|
11163
11218
|
|
|
11164
11219
|
const {hitRadiusPoint: hitRadiusPoint, hitPoint: hitPoint} = BoundsHelper;
|
|
11165
11220
|
|
|
@@ -11169,8 +11224,7 @@ const leaf = Leaf.prototype;
|
|
|
11169
11224
|
|
|
11170
11225
|
leaf.hit = function(worldPoint, hitRadius = 0) {
|
|
11171
11226
|
this.updateLayout();
|
|
11172
|
-
|
|
11173
|
-
setRadius(worldRadiusPoint, hitRadius);
|
|
11227
|
+
copyRadiusPoint(worldRadiusPoint, worldPoint, hitRadius);
|
|
11174
11228
|
const world = this.__world;
|
|
11175
11229
|
if (hitRadius ? !hitRadiusPoint(world, worldRadiusPoint) : !hitPoint(world, worldRadiusPoint)) return false;
|
|
11176
11230
|
return this.isBranch ? Platform.getSelector(this).hitPoint(Object.assign({}, worldRadiusPoint), hitRadius, {
|
|
@@ -11184,8 +11238,8 @@ leaf.__hitWorld = function(point, forceHitFill) {
|
|
|
11184
11238
|
const world = this.__world, layout = this.__layout;
|
|
11185
11239
|
const isSmall = world.width < 10 && world.height < 10;
|
|
11186
11240
|
if (data.hitRadius) {
|
|
11187
|
-
|
|
11188
|
-
|
|
11241
|
+
copyRadiusPoint(inner, point, data.hitRadius);
|
|
11242
|
+
point = inner;
|
|
11189
11243
|
}
|
|
11190
11244
|
toInnerRadiusPointOf(point, world, inner);
|
|
11191
11245
|
if (data.hitBox || isSmall) {
|
|
@@ -11865,7 +11919,7 @@ function image(ui, attrName, paint, boxBounds, firstUse) {
|
|
|
11865
11919
|
ignoreRender(ui, false);
|
|
11866
11920
|
onLoadError(ui, event, error);
|
|
11867
11921
|
leafPaint.loadId = undefined;
|
|
11868
|
-
});
|
|
11922
|
+
}, paint.lod && image.getThumbSize());
|
|
11869
11923
|
if (ui.placeholderColor) {
|
|
11870
11924
|
if (!ui.placeholderDelay) image.isPlacehold = true; else setTimeout(() => {
|
|
11871
11925
|
if (!image.ready) {
|
|
@@ -12105,10 +12159,12 @@ const {getFloorScale: getFloorScale} = MathHelper, {abs: abs$2} = Math;
|
|
|
12105
12159
|
function createPatternTask(paint, ui, canvas, renderOptions) {
|
|
12106
12160
|
if (!paint.patternTask) {
|
|
12107
12161
|
paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function*() {
|
|
12108
|
-
paint
|
|
12109
|
-
if (canvas.bounds.hit(ui.__nowWorld)) PaintImage.createPattern(paint, ui, canvas, renderOptions);
|
|
12162
|
+
PaintImage.createPattern(paint, ui, canvas, renderOptions);
|
|
12110
12163
|
ui.forceUpdate("surface");
|
|
12111
|
-
}),
|
|
12164
|
+
}), 0, () => {
|
|
12165
|
+
paint.patternTask = null;
|
|
12166
|
+
return canvas.bounds.hit(ui.__nowWorld);
|
|
12167
|
+
});
|
|
12112
12168
|
}
|
|
12113
12169
|
}
|
|
12114
12170
|
|
|
@@ -13843,6 +13899,8 @@ let Animate = class Animate extends Eventer {
|
|
|
13843
13899
|
}
|
|
13844
13900
|
constructor(target, keyframe, options, isTemp) {
|
|
13845
13901
|
super();
|
|
13902
|
+
this.nowIndex = 0;
|
|
13903
|
+
this.playedTotalTime = 0;
|
|
13846
13904
|
if (keyframe) {
|
|
13847
13905
|
if (keyframe.keyframes) options = keyframe, keyframe = keyframe.keyframes; else if (keyframe.style) options = keyframe,
|
|
13848
13906
|
keyframe = keyframe.style;
|
|
@@ -13889,7 +13947,7 @@ let Animate = class Animate extends Eventer {
|
|
|
13889
13947
|
play() {
|
|
13890
13948
|
if (this.destroyed) return;
|
|
13891
13949
|
this.running = true;
|
|
13892
|
-
if (!this.started) this.clearTimer(), this.start(); else if (!this.timer) this.
|
|
13950
|
+
if (!this.started) this.clearTimer(), this.start(); else if (!this.timer) this.startRequestAnimate();
|
|
13893
13951
|
this.emitType(AnimateEvent.PLAY);
|
|
13894
13952
|
}
|
|
13895
13953
|
pause() {
|
|
@@ -13903,14 +13961,28 @@ let Animate = class Animate extends Eventer {
|
|
|
13903
13961
|
this.complete();
|
|
13904
13962
|
this.emitType(AnimateEvent.STOP);
|
|
13905
13963
|
}
|
|
13906
|
-
seek(time) {
|
|
13964
|
+
seek(time, includeDelay) {
|
|
13907
13965
|
if (this.destroyed) return;
|
|
13908
|
-
|
|
13966
|
+
const {delay: delay} = this;
|
|
13967
|
+
if (isObject(time)) time = UnitConvert.number(time, this.duration + (includeDelay ? delay : 0));
|
|
13968
|
+
if (includeDelay) time -= delay;
|
|
13909
13969
|
if (time) time /= this.speed;
|
|
13910
|
-
|
|
13970
|
+
let waitBeginTime;
|
|
13971
|
+
if (time < 0) {
|
|
13972
|
+
waitBeginTime = -time;
|
|
13973
|
+
time = 0;
|
|
13974
|
+
}
|
|
13975
|
+
if (!this.started || time < this.time || !time) this.start(true);
|
|
13911
13976
|
this.time = time;
|
|
13912
|
-
this.animate(0, true);
|
|
13913
|
-
this.clearTimer(() =>
|
|
13977
|
+
if (!waitBeginTime) this.animate(0, true);
|
|
13978
|
+
this.clearTimer(() => {
|
|
13979
|
+
if (waitBeginTime) {
|
|
13980
|
+
this.timer = setTimeout(() => {
|
|
13981
|
+
this.timer = 0;
|
|
13982
|
+
this.begin();
|
|
13983
|
+
}, waitBeginTime * 1e3);
|
|
13984
|
+
} else this.startRequestAnimate();
|
|
13985
|
+
});
|
|
13914
13986
|
this.emitType(AnimateEvent.SEEK);
|
|
13915
13987
|
}
|
|
13916
13988
|
kill(complete = true, killStyle) {
|
|
@@ -13993,14 +14065,24 @@ let Animate = class Animate extends Eventer {
|
|
|
13993
14065
|
}
|
|
13994
14066
|
}
|
|
13995
14067
|
}
|
|
13996
|
-
|
|
14068
|
+
startRequestAnimate() {
|
|
13997
14069
|
this.requestAnimateTime = Date.now();
|
|
14070
|
+
this.requestAnimatePageTime = 0;
|
|
14071
|
+
if (!this.waitRequestRender) this.requestAnimate();
|
|
14072
|
+
}
|
|
14073
|
+
requestAnimate() {
|
|
14074
|
+
this.waitRequestRender = true;
|
|
13998
14075
|
Platform.requestRender(this.animate.bind(this));
|
|
13999
14076
|
}
|
|
14000
|
-
animate(
|
|
14077
|
+
animate(pageTime, seek) {
|
|
14001
14078
|
if (!seek) {
|
|
14079
|
+
this.waitRequestRender = false;
|
|
14002
14080
|
if (!this.running) return;
|
|
14003
|
-
|
|
14081
|
+
let frameTime;
|
|
14082
|
+
if (pageTime && this.requestAnimatePageTime) frameTime = pageTime - this.requestAnimatePageTime; else frameTime = Date.now() - this.requestAnimateTime;
|
|
14083
|
+
this.time += frameTime / 1e3;
|
|
14084
|
+
this.requestAnimatePageTime = pageTime;
|
|
14085
|
+
this.requestAnimateTime = Date.now();
|
|
14004
14086
|
}
|
|
14005
14087
|
const {duration: duration} = this, realTime = this.time * this.speed;
|
|
14006
14088
|
if (realTime < duration) {
|
|
@@ -14041,21 +14123,24 @@ let Animate = class Animate extends Eventer {
|
|
|
14041
14123
|
}
|
|
14042
14124
|
start(seek) {
|
|
14043
14125
|
this.requestAnimateTime = 1;
|
|
14044
|
-
const {reverse: reverse} = this;
|
|
14126
|
+
const {reverse: reverse, jump: jump} = this;
|
|
14045
14127
|
if (reverse || this.mainReverse) this.mainReverse = reverse;
|
|
14046
14128
|
if (this.looped) this.looped = 0;
|
|
14047
14129
|
if (seek) this.begin(true); else {
|
|
14048
14130
|
const {delay: delay} = this;
|
|
14049
|
-
if (delay)
|
|
14050
|
-
this.
|
|
14051
|
-
this.
|
|
14052
|
-
|
|
14131
|
+
if (delay) {
|
|
14132
|
+
if (jump) this.begin(true);
|
|
14133
|
+
this.timer = setTimeout(() => {
|
|
14134
|
+
this.timer = 0;
|
|
14135
|
+
this.begin();
|
|
14136
|
+
}, delay / this.speed * 1e3);
|
|
14137
|
+
} else this.begin();
|
|
14053
14138
|
}
|
|
14054
14139
|
}
|
|
14055
14140
|
begin(seek) {
|
|
14056
14141
|
this.playedTotalTime = this.time = 0;
|
|
14057
14142
|
this.mainReverse ? this.setTo() : this.setFrom();
|
|
14058
|
-
if (!seek) this.
|
|
14143
|
+
if (!seek) this.startRequestAnimate();
|
|
14059
14144
|
}
|
|
14060
14145
|
end() {
|
|
14061
14146
|
this.mainReverse ? this.setFrom() : this.setTo();
|
|
@@ -14171,6 +14256,8 @@ __decorate([ animateAttr(true) ], Animate.prototype, "autoplay", void 0);
|
|
|
14171
14256
|
|
|
14172
14257
|
__decorate([ animateAttr() ], Animate.prototype, "join", void 0);
|
|
14173
14258
|
|
|
14259
|
+
__decorate([ animateAttr() ], Animate.prototype, "jump", void 0);
|
|
14260
|
+
|
|
14174
14261
|
__decorate([ animateAttr() ], Animate.prototype, "attrs", void 0);
|
|
14175
14262
|
|
|
14176
14263
|
Animate = __decorate([ useModule(LeafEventer) ], Animate);
|
|
@@ -14217,8 +14304,8 @@ let AnimateList = class AnimateList extends Animate {
|
|
|
14217
14304
|
this.each(item => item.stop());
|
|
14218
14305
|
this.emitType(AnimateEvent.STOP);
|
|
14219
14306
|
}
|
|
14220
|
-
seek(time) {
|
|
14221
|
-
this.each(item => item.seek(time));
|
|
14307
|
+
seek(time, includeDelay) {
|
|
14308
|
+
this.each(item => item.seek(time, includeDelay));
|
|
14222
14309
|
this.emitType(AnimateEvent.SEEK);
|
|
14223
14310
|
}
|
|
14224
14311
|
kill(complete, killStyle) {
|
|
@@ -14409,7 +14496,7 @@ const hslMatch = /^hsl\((\d+),\s*(\d+)%\s*,\s*(\d+)%/i;
|
|
|
14409
14496
|
|
|
14410
14497
|
const hslaMatch = /^hsla\((\d+),\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d*\.?\d+)/i;
|
|
14411
14498
|
|
|
14412
|
-
const int = parseInt, float = parseFloat, {round: round$1} = Math;
|
|
14499
|
+
const int = parseInt, float$1 = parseFloat, {round: round$1} = Math;
|
|
14413
14500
|
|
|
14414
14501
|
let cache = {}, totalCache = 0;
|
|
14415
14502
|
|
|
@@ -14522,18 +14609,18 @@ function rgbaToRGBA(color) {
|
|
|
14522
14609
|
r: int(match[1]),
|
|
14523
14610
|
g: int(match[2]),
|
|
14524
14611
|
b: int(match[3]),
|
|
14525
|
-
a: float(match[4])
|
|
14612
|
+
a: float$1(match[4])
|
|
14526
14613
|
};
|
|
14527
14614
|
}
|
|
14528
14615
|
|
|
14529
14616
|
function hslToRGBA(color) {
|
|
14530
14617
|
const match = hslMatch.exec(color);
|
|
14531
|
-
return hsla(float(match[1]), float(match[2]), float(match[3]), 1);
|
|
14618
|
+
return hsla(float$1(match[1]), float$1(match[2]), float$1(match[3]), 1);
|
|
14532
14619
|
}
|
|
14533
14620
|
|
|
14534
14621
|
function hslaToRGBA(color) {
|
|
14535
14622
|
const match = hslaMatch.exec(color);
|
|
14536
|
-
return hsla(float(match[1]), float(match[2]), float(match[3]), float(match[4]));
|
|
14623
|
+
return hsla(float$1(match[1]), float$1(match[2]), float$1(match[3]), float$1(match[4]));
|
|
14537
14624
|
}
|
|
14538
14625
|
|
|
14539
14626
|
const n1 = 1 / 6, n2 = .5, n3 = 2 / 3, n4 = 1 / 3;
|
|
@@ -14772,7 +14859,7 @@ const HighBezierHelper = {
|
|
|
14772
14859
|
|
|
14773
14860
|
const {getDistance: getDistance} = HighBezierHelper;
|
|
14774
14861
|
|
|
14775
|
-
const {M: M, L: L, C: C, Z: Z} = PathCommandMap;
|
|
14862
|
+
const {M: M, L: L, C: C, Z: Z} = PathCommandMap, {float: float} = MathHelper;
|
|
14776
14863
|
|
|
14777
14864
|
const tempPoint = {}, tempFrom = {};
|
|
14778
14865
|
|
|
@@ -14909,7 +14996,7 @@ const HighCurveHelper = {
|
|
|
14909
14996
|
getDistancePath(distanceData, motionDistance, motionPrecision) {
|
|
14910
14997
|
const {segments: segments, data: data} = distanceData, path = [];
|
|
14911
14998
|
motionDistance = UnitConvert.number(motionDistance, distanceData.total);
|
|
14912
|
-
let total = 0, distance, to = {};
|
|
14999
|
+
let total = 0, distance, cutDistance, to = {};
|
|
14913
15000
|
let i = 0, index = 0, x = 0, y = 0, toX, toY, command;
|
|
14914
15001
|
let x1, y1, x2, y2, t;
|
|
14915
15002
|
const len = data.length;
|
|
@@ -14921,14 +15008,17 @@ const HighCurveHelper = {
|
|
|
14921
15008
|
toX = data[i + 1];
|
|
14922
15009
|
toY = data[i + 2];
|
|
14923
15010
|
distance = segments[index];
|
|
14924
|
-
if (total + distance
|
|
15011
|
+
if (total + distance > motionDistance || !distanceData.total) {
|
|
14925
15012
|
if (!i) x = toX, y = toY;
|
|
14926
15013
|
tempFrom.x = x;
|
|
14927
15014
|
tempFrom.y = y;
|
|
14928
15015
|
to.x = toX;
|
|
14929
15016
|
to.y = toY;
|
|
14930
|
-
|
|
14931
|
-
|
|
15017
|
+
cutDistance = float(motionDistance - total);
|
|
15018
|
+
if (cutDistance) {
|
|
15019
|
+
PointHelper.getDistancePoint(tempFrom, to, cutDistance, true);
|
|
15020
|
+
path.push(command, to.x, to.y);
|
|
15021
|
+
}
|
|
14932
15022
|
return path;
|
|
14933
15023
|
}
|
|
14934
15024
|
x = toX;
|
|
@@ -14942,9 +15032,12 @@ const HighCurveHelper = {
|
|
|
14942
15032
|
toX = data[i + 5];
|
|
14943
15033
|
toY = data[i + 6];
|
|
14944
15034
|
distance = segments[index];
|
|
14945
|
-
if (total + distance
|
|
14946
|
-
|
|
14947
|
-
|
|
15035
|
+
if (total + distance > motionDistance) {
|
|
15036
|
+
cutDistance = float(motionDistance - total);
|
|
15037
|
+
if (cutDistance) {
|
|
15038
|
+
t = HighBezierHelper.getT(cutDistance, distance, x, y, x1, y1, x2, y2, toX, toY, motionPrecision);
|
|
15039
|
+
HighBezierHelper.cut(path, t, x, y, x1, y1, x2, y2, toX, toY);
|
|
15040
|
+
}
|
|
14948
15041
|
return path;
|
|
14949
15042
|
}
|
|
14950
15043
|
x = toX;
|
|
@@ -15153,6 +15246,7 @@ class Finder {
|
|
|
15153
15246
|
for (let i = 0, len = children.length; i < len; i++) {
|
|
15154
15247
|
child = children[i];
|
|
15155
15248
|
result = method(child, options);
|
|
15249
|
+
if (typeof result === "boolean") result = result ? 1 : 0;
|
|
15156
15250
|
if (result === Yes || result === YesAndSkip) {
|
|
15157
15251
|
if (list) {
|
|
15158
15252
|
list.push(child);
|
|
@@ -15217,4 +15311,4 @@ Creator.finder = function(target) {
|
|
|
15217
15311
|
return new Finder(target);
|
|
15218
15312
|
};
|
|
15219
15313
|
|
|
15220
|
-
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, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, 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, LeaferImage, 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, 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, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, 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$
|
|
15314
|
+
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, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, 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, LeaferImage, 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, 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, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, 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$4 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };
|