targetj 1.0.260 → 1.1.1
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/Export.js +3 -0
- package/build/AnimationManager.js +221 -153
- package/build/AnimationUtil.js +0 -1
- package/build/App.js +82 -34
- package/build/BaseModel.js +51 -15
- package/build/Bracket.js +7 -1
- package/build/Easing.js +5 -0
- package/build/EventListener.js +37 -8
- package/build/HtmlToCanvas.js +411 -0
- package/build/LocationManager.js +167 -46
- package/build/PageManager.js +67 -115
- package/build/ParticleChild.js +576 -0
- package/build/ParticleExplode.js +360 -0
- package/build/ParticleRenderer.js +821 -159
- package/build/ParticleRuntime.js +1529 -381
- package/build/ParticleTModel.js +864 -293
- package/build/ParticleUtil.js +120 -172
- package/build/RunScheduler.js +23 -11
- package/build/StateManager.js +206 -57
- package/build/StateUtil.js +141 -82
- package/build/TModel.js +172 -73
- package/build/TModelManager.js +155 -132
- package/build/TModelUtil.js +232 -142
- package/build/TUtil.js +55 -50
- package/build/TargetData.js +26 -12
- package/build/TargetExecutor.js +48 -17
- package/build/TargetManager.js +47 -39
- package/build/TargetParser.js +57 -4
- package/build/TargetUtil.js +211 -129
- package/build/VisibilityUtil.js +4 -2
- package/build/index.js +1 -0
- package/dist/targetjs.js +1 -1
- package/dist/targetjs.js.gz +0 -0
- package/package.json +1 -1
|
@@ -221,7 +221,7 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
221
221
|
anim.cancel();
|
|
222
222
|
} catch (_unused) {}
|
|
223
223
|
}
|
|
224
|
-
getRunScheduler().schedule(
|
|
224
|
+
getRunScheduler().schedule(50, 'finalizeAnimation');
|
|
225
225
|
}
|
|
226
226
|
}, {
|
|
227
227
|
key: "startProgressPoller",
|
|
@@ -341,7 +341,7 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
341
341
|
if (targetValue) {
|
|
342
342
|
var _targetValue$valueLis;
|
|
343
343
|
targetValue.step = tmodel.getTargetSteps(originalKey);
|
|
344
|
-
targetValue.valuePointer = (_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length ? targetValue.valueList.length
|
|
344
|
+
targetValue.valuePointer = (_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length ? targetValue.valueList.length : 0;
|
|
345
345
|
tmodel.setActual(originalKey, value);
|
|
346
346
|
if (tmodel.isTargetImperative(originalKey)) {
|
|
347
347
|
targetValue.cycle = targetValue.cycles;
|
|
@@ -504,9 +504,9 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
504
504
|
_step8;
|
|
505
505
|
try {
|
|
506
506
|
for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
|
|
507
|
-
var
|
|
508
|
-
if (
|
|
509
|
-
records.push(
|
|
507
|
+
var _record2 = _step8.value;
|
|
508
|
+
if (_record2.tmodel === tmodel) {
|
|
509
|
+
records.push(_record2);
|
|
510
510
|
}
|
|
511
511
|
}
|
|
512
512
|
} catch (err) {
|
|
@@ -525,6 +525,11 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
525
525
|
animations.add(record.anim);
|
|
526
526
|
}
|
|
527
527
|
TModelUtil.commitAnimatedStyles(tmodel, keys);
|
|
528
|
+
for (var _i5 = 0, _records2 = records; _i5 < _records2.length; _i5++) {
|
|
529
|
+
var _record = _records2[_i5];
|
|
530
|
+
_record.status = 'detached';
|
|
531
|
+
this.recordMap.delete(_record.recId);
|
|
532
|
+
}
|
|
528
533
|
var _iterator9 = _createForOfIteratorHelper(animations),
|
|
529
534
|
_step9;
|
|
530
535
|
try {
|
|
@@ -559,60 +564,123 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
559
564
|
key: "deleteAll",
|
|
560
565
|
value: function () {
|
|
561
566
|
var _deleteAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
562
|
-
var
|
|
567
|
+
var _ref2,
|
|
568
|
+
_ref2$discardState,
|
|
569
|
+
discardState,
|
|
570
|
+
_animations,
|
|
571
|
+
_iterator10,
|
|
572
|
+
_step10,
|
|
573
|
+
record,
|
|
574
|
+
_iterator11,
|
|
575
|
+
_step11,
|
|
576
|
+
animation,
|
|
577
|
+
animations,
|
|
578
|
+
keysByTModel,
|
|
579
|
+
_iterator12,
|
|
580
|
+
_step12,
|
|
581
|
+
_record3,
|
|
582
|
+
keys,
|
|
583
|
+
_iterator13,
|
|
584
|
+
_step13,
|
|
585
|
+
_step13$value,
|
|
586
|
+
tmodel,
|
|
587
|
+
_keys2,
|
|
588
|
+
_iterator14,
|
|
589
|
+
_step14,
|
|
590
|
+
_record4,
|
|
591
|
+
_iterator15,
|
|
592
|
+
_step15,
|
|
593
|
+
_animation,
|
|
594
|
+
_args = arguments;
|
|
563
595
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
564
596
|
while (1) switch (_context.prev = _context.next) {
|
|
565
597
|
case 0:
|
|
598
|
+
_ref2 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, _ref2$discardState = _ref2.discardState, discardState = _ref2$discardState === void 0 ? false : _ref2$discardState;
|
|
566
599
|
this.isShuttingDown = true;
|
|
567
600
|
if (this.waapiPoller.rafId) {
|
|
568
601
|
cancelAnimationFrame(this.waapiPoller.rafId);
|
|
569
602
|
this.waapiPoller.rafId = 0;
|
|
570
|
-
this.waapiPoller.alive = false;
|
|
571
603
|
}
|
|
604
|
+
this.waapiPoller.alive = false;
|
|
605
|
+
if (!discardState) {
|
|
606
|
+
_context.next = 12;
|
|
607
|
+
break;
|
|
608
|
+
}
|
|
609
|
+
_animations = new Set();
|
|
610
|
+
_iterator10 = _createForOfIteratorHelper(this.recordMap.values());
|
|
611
|
+
try {
|
|
612
|
+
for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
|
|
613
|
+
record = _step10.value;
|
|
614
|
+
record.status = "detached";
|
|
615
|
+
if (record.anim) {
|
|
616
|
+
_animations.add(record.anim);
|
|
617
|
+
}
|
|
618
|
+
}
|
|
619
|
+
} catch (err) {
|
|
620
|
+
_iterator10.e(err);
|
|
621
|
+
} finally {
|
|
622
|
+
_iterator10.f();
|
|
623
|
+
}
|
|
624
|
+
this.recordMap.clear();
|
|
625
|
+
_iterator11 = _createForOfIteratorHelper(_animations);
|
|
626
|
+
try {
|
|
627
|
+
for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
|
|
628
|
+
animation = _step11.value;
|
|
629
|
+
try {
|
|
630
|
+
animation.cancel();
|
|
631
|
+
} catch (_unused3) {}
|
|
632
|
+
}
|
|
633
|
+
} catch (err) {
|
|
634
|
+
_iterator11.e(err);
|
|
635
|
+
} finally {
|
|
636
|
+
_iterator11.f();
|
|
637
|
+
}
|
|
638
|
+
return _context.abrupt("return");
|
|
639
|
+
case 12:
|
|
572
640
|
animations = new Set();
|
|
573
641
|
keysByTModel = new Map();
|
|
574
|
-
|
|
575
|
-
_context.prev =
|
|
576
|
-
|
|
577
|
-
case
|
|
578
|
-
if ((
|
|
579
|
-
_context.next =
|
|
642
|
+
_iterator12 = _createForOfIteratorHelper(this.recordMap.values());
|
|
643
|
+
_context.prev = 15;
|
|
644
|
+
_iterator12.s();
|
|
645
|
+
case 17:
|
|
646
|
+
if ((_step12 = _iterator12.n()).done) {
|
|
647
|
+
_context.next = 28;
|
|
580
648
|
break;
|
|
581
649
|
}
|
|
582
|
-
|
|
583
|
-
if (!(
|
|
584
|
-
_context.next =
|
|
650
|
+
_record3 = _step12.value;
|
|
651
|
+
if (!(_record3.status === "canceled" || _record3.status === "detached")) {
|
|
652
|
+
_context.next = 21;
|
|
585
653
|
break;
|
|
586
654
|
}
|
|
587
|
-
return _context.abrupt("continue",
|
|
588
|
-
case
|
|
589
|
-
AnimationUtil.updateTModelFromRecord(
|
|
590
|
-
animations.add(
|
|
591
|
-
keys = keysByTModel.get(
|
|
655
|
+
return _context.abrupt("continue", 26);
|
|
656
|
+
case 21:
|
|
657
|
+
AnimationUtil.updateTModelFromRecord(_record3);
|
|
658
|
+
animations.add(_record3.anim);
|
|
659
|
+
keys = keysByTModel.get(_record3.tmodel);
|
|
592
660
|
if (!keys) {
|
|
593
661
|
keys = new Set();
|
|
594
|
-
keysByTModel.set(
|
|
662
|
+
keysByTModel.set(_record3.tmodel, keys);
|
|
595
663
|
}
|
|
596
|
-
keys.add(
|
|
597
|
-
case
|
|
598
|
-
_context.next =
|
|
664
|
+
keys.add(_record3.originalKey);
|
|
665
|
+
case 26:
|
|
666
|
+
_context.next = 17;
|
|
599
667
|
break;
|
|
600
|
-
case
|
|
601
|
-
_context.next =
|
|
668
|
+
case 28:
|
|
669
|
+
_context.next = 33;
|
|
602
670
|
break;
|
|
603
|
-
case
|
|
604
|
-
_context.prev =
|
|
605
|
-
_context.t0 = _context["catch"](
|
|
606
|
-
|
|
607
|
-
case
|
|
608
|
-
_context.prev =
|
|
609
|
-
|
|
610
|
-
return _context.finish(
|
|
611
|
-
case
|
|
612
|
-
|
|
671
|
+
case 30:
|
|
672
|
+
_context.prev = 30;
|
|
673
|
+
_context.t0 = _context["catch"](15);
|
|
674
|
+
_iterator12.e(_context.t0);
|
|
675
|
+
case 33:
|
|
676
|
+
_context.prev = 33;
|
|
677
|
+
_iterator12.f();
|
|
678
|
+
return _context.finish(33);
|
|
679
|
+
case 36:
|
|
680
|
+
_iterator13 = _createForOfIteratorHelper(keysByTModel);
|
|
613
681
|
try {
|
|
614
|
-
for (
|
|
615
|
-
|
|
682
|
+
for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
|
|
683
|
+
_step13$value = _slicedToArray(_step13.value, 2), tmodel = _step13$value[0], _keys2 = _step13$value[1];
|
|
616
684
|
TModelUtil.commitAnimatedStyles(tmodel, _keys2);
|
|
617
685
|
AnimationUtil.addToUpdatingTargets(tmodel, _keys2);
|
|
618
686
|
tmodel.lastBatch = undefined;
|
|
@@ -621,40 +689,40 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
621
689
|
tmodel.finalRawFrame = undefined;
|
|
622
690
|
}
|
|
623
691
|
} catch (err) {
|
|
624
|
-
|
|
692
|
+
_iterator13.e(err);
|
|
625
693
|
} finally {
|
|
626
|
-
|
|
694
|
+
_iterator13.f();
|
|
627
695
|
}
|
|
628
|
-
|
|
696
|
+
_iterator14 = _createForOfIteratorHelper(this.recordMap.values());
|
|
629
697
|
try {
|
|
630
|
-
for (
|
|
631
|
-
|
|
632
|
-
|
|
698
|
+
for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
|
|
699
|
+
_record4 = _step14.value;
|
|
700
|
+
_record4.status = "detached";
|
|
633
701
|
}
|
|
634
702
|
} catch (err) {
|
|
635
|
-
|
|
703
|
+
_iterator14.e(err);
|
|
636
704
|
} finally {
|
|
637
|
-
|
|
705
|
+
_iterator14.f();
|
|
638
706
|
}
|
|
639
|
-
|
|
707
|
+
_iterator15 = _createForOfIteratorHelper(animations);
|
|
640
708
|
try {
|
|
641
|
-
for (
|
|
642
|
-
|
|
709
|
+
for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
|
|
710
|
+
_animation = _step15.value;
|
|
643
711
|
try {
|
|
644
|
-
|
|
645
|
-
} catch (
|
|
712
|
+
_animation.cancel();
|
|
713
|
+
} catch (_unused4) {}
|
|
646
714
|
}
|
|
647
715
|
} catch (err) {
|
|
648
|
-
|
|
716
|
+
_iterator15.e(err);
|
|
649
717
|
} finally {
|
|
650
|
-
|
|
718
|
+
_iterator15.f();
|
|
651
719
|
}
|
|
652
720
|
this.recordMap.clear();
|
|
653
|
-
case
|
|
721
|
+
case 43:
|
|
654
722
|
case "end":
|
|
655
723
|
return _context.stop();
|
|
656
724
|
}
|
|
657
|
-
}, _callee, this, [[
|
|
725
|
+
}, _callee, this, [[15, 30, 33, 36]]);
|
|
658
726
|
}));
|
|
659
727
|
function deleteAll() {
|
|
660
728
|
return _deleteAll.apply(this, arguments);
|
|
@@ -686,33 +754,33 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
686
754
|
}, {
|
|
687
755
|
key: "cancelTModelAnimation",
|
|
688
756
|
value: function cancelTModelAnimation(tmodel) {
|
|
689
|
-
var
|
|
690
|
-
|
|
691
|
-
mode =
|
|
692
|
-
|
|
693
|
-
commitStyle =
|
|
757
|
+
var _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
|
|
758
|
+
_ref3$mode = _ref3.mode,
|
|
759
|
+
mode = _ref3$mode === void 0 ? "resume" : _ref3$mode,
|
|
760
|
+
_ref3$commitStyle = _ref3.commitStyle,
|
|
761
|
+
commitStyle = _ref3$commitStyle === void 0 ? true : _ref3$commitStyle;
|
|
694
762
|
var records = [];
|
|
695
|
-
var
|
|
696
|
-
|
|
763
|
+
var _iterator16 = _createForOfIteratorHelper(this.recordMap.values()),
|
|
764
|
+
_step16;
|
|
697
765
|
try {
|
|
698
|
-
for (
|
|
699
|
-
var
|
|
700
|
-
if (
|
|
701
|
-
records.push(
|
|
766
|
+
for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
|
|
767
|
+
var _record6 = _step16.value;
|
|
768
|
+
if (_record6.tmodel === tmodel) {
|
|
769
|
+
records.push(_record6);
|
|
702
770
|
}
|
|
703
771
|
}
|
|
704
772
|
} catch (err) {
|
|
705
|
-
|
|
773
|
+
_iterator16.e(err);
|
|
706
774
|
} finally {
|
|
707
|
-
|
|
775
|
+
_iterator16.f();
|
|
708
776
|
}
|
|
709
777
|
if (!records.length) {
|
|
710
778
|
return false;
|
|
711
779
|
}
|
|
712
780
|
var keys = new Set();
|
|
713
781
|
var animations = new Set();
|
|
714
|
-
for (var
|
|
715
|
-
var record =
|
|
782
|
+
for (var _i6 = 0, _records3 = records; _i6 < _records3.length; _i6++) {
|
|
783
|
+
var record = _records3[_i6];
|
|
716
784
|
if (record.status !== "canceled" && record.status !== "detached") {
|
|
717
785
|
AnimationUtil.updateTModelFromRecord(record);
|
|
718
786
|
}
|
|
@@ -722,24 +790,24 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
722
790
|
if (commitStyle) {
|
|
723
791
|
TModelUtil.commitAnimatedStyles(tmodel, keys);
|
|
724
792
|
}
|
|
725
|
-
for (var
|
|
726
|
-
var
|
|
727
|
-
|
|
728
|
-
this.recordMap.delete(
|
|
793
|
+
for (var _i7 = 0, _records4 = records; _i7 < _records4.length; _i7++) {
|
|
794
|
+
var _record5 = _records4[_i7];
|
|
795
|
+
_record5.status = "detached";
|
|
796
|
+
this.recordMap.delete(_record5.recId);
|
|
729
797
|
}
|
|
730
|
-
var
|
|
731
|
-
|
|
798
|
+
var _iterator17 = _createForOfIteratorHelper(animations),
|
|
799
|
+
_step17;
|
|
732
800
|
try {
|
|
733
|
-
for (
|
|
734
|
-
var animation =
|
|
801
|
+
for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
|
|
802
|
+
var animation = _step17.value;
|
|
735
803
|
try {
|
|
736
804
|
animation.cancel();
|
|
737
|
-
} catch (
|
|
805
|
+
} catch (_unused5) {}
|
|
738
806
|
}
|
|
739
807
|
} catch (err) {
|
|
740
|
-
|
|
808
|
+
_iterator17.e(err);
|
|
741
809
|
} finally {
|
|
742
|
-
|
|
810
|
+
_iterator17.f();
|
|
743
811
|
}
|
|
744
812
|
tmodel.clearAnimatingMap();
|
|
745
813
|
this.applyCanceledTargetMode(tmodel, keys, mode);
|
|
@@ -752,11 +820,11 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
752
820
|
}, {
|
|
753
821
|
key: "applyCanceledTargetMode",
|
|
754
822
|
value: function applyCanceledTargetMode(tmodel, keys, mode) {
|
|
755
|
-
var
|
|
756
|
-
|
|
823
|
+
var _iterator18 = _createForOfIteratorHelper(keys),
|
|
824
|
+
_step18;
|
|
757
825
|
try {
|
|
758
|
-
for (
|
|
759
|
-
var key =
|
|
826
|
+
for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
|
|
827
|
+
var key = _step18.value;
|
|
760
828
|
var targetValue = tmodel.targetValues[key];
|
|
761
829
|
if (!targetValue) {
|
|
762
830
|
continue;
|
|
@@ -771,9 +839,9 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
771
839
|
}
|
|
772
840
|
}
|
|
773
841
|
} catch (err) {
|
|
774
|
-
|
|
842
|
+
_iterator18.e(err);
|
|
775
843
|
} finally {
|
|
776
|
-
|
|
844
|
+
_iterator18.f();
|
|
777
845
|
}
|
|
778
846
|
}
|
|
779
847
|
}, {
|
|
@@ -791,13 +859,13 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
791
859
|
key: "fillCutFrameFromRecords",
|
|
792
860
|
value: function fillCutFrameFromRecords(tmodel, cutFrame, cutTime, totalDuration) {
|
|
793
861
|
var progress = totalDuration > 0 ? TUtil.limit(cutTime / totalDuration, 0, 1) : 1;
|
|
794
|
-
var
|
|
795
|
-
|
|
862
|
+
var _iterator19 = _createForOfIteratorHelper(this.recordMap),
|
|
863
|
+
_step19;
|
|
796
864
|
try {
|
|
797
|
-
for (
|
|
798
|
-
var
|
|
799
|
-
var
|
|
800
|
-
record =
|
|
865
|
+
for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
|
|
866
|
+
var _ref4, _ref5, _result$remainingStep, _ref6, _result$steps, _targetValue$interval, _result$step;
|
|
867
|
+
var _step19$value = _slicedToArray(_step19.value, 2),
|
|
868
|
+
record = _step19$value[1];
|
|
801
869
|
if (record.tmodel !== tmodel) {
|
|
802
870
|
continue;
|
|
803
871
|
}
|
|
@@ -813,8 +881,8 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
813
881
|
var targetValue = tmodel.targetValues[originalKey];
|
|
814
882
|
this.setAt(cutFrame, cleanKey, result.value);
|
|
815
883
|
cutFrame.keyMeta.set(cleanKey, {
|
|
816
|
-
steps: (
|
|
817
|
-
segmentSteps: (
|
|
884
|
+
steps: (_ref4 = (_ref5 = (_result$remainingStep = result.remainingSteps) !== null && _result$remainingStep !== void 0 ? _result$remainingStep : result.steps) !== null && _ref5 !== void 0 ? _ref5 : targetValue === null || targetValue === void 0 ? void 0 : targetValue.steps) !== null && _ref4 !== void 0 ? _ref4 : 0,
|
|
885
|
+
segmentSteps: (_ref6 = (_result$steps = result.steps) !== null && _result$steps !== void 0 ? _result$steps : targetValue === null || targetValue === void 0 ? void 0 : targetValue.steps) !== null && _ref6 !== void 0 ? _ref6 : 0,
|
|
818
886
|
interval: (_targetValue$interval = targetValue === null || targetValue === void 0 ? void 0 : targetValue.interval) !== null && _targetValue$interval !== void 0 ? _targetValue$interval : 8,
|
|
819
887
|
stepOffset: (_result$step = result.step) !== null && _result$step !== void 0 ? _result$step : 0,
|
|
820
888
|
valuePointer: result.valuePointer,
|
|
@@ -823,9 +891,9 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
823
891
|
});
|
|
824
892
|
}
|
|
825
893
|
} catch (err) {
|
|
826
|
-
|
|
894
|
+
_iterator19.e(err);
|
|
827
895
|
} finally {
|
|
828
|
-
|
|
896
|
+
_iterator19.f();
|
|
829
897
|
}
|
|
830
898
|
}
|
|
831
899
|
}, {
|
|
@@ -849,17 +917,17 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
849
917
|
var originalKeys = _toConsumableArray(new Set(Object.values(batch.keyMap).flatMap(function (set) {
|
|
850
918
|
return _toConsumableArray(set);
|
|
851
919
|
})));
|
|
852
|
-
var
|
|
853
|
-
|
|
920
|
+
var _iterator20 = _createForOfIteratorHelper(originalKeys),
|
|
921
|
+
_step20;
|
|
854
922
|
try {
|
|
855
|
-
for (
|
|
856
|
-
var originalKey =
|
|
923
|
+
for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
|
|
924
|
+
var originalKey = _step20.value;
|
|
857
925
|
this.backfillKeyAcrossFramesUsingMorph(tmodel, originalKey, batch.frames);
|
|
858
926
|
}
|
|
859
927
|
} catch (err) {
|
|
860
|
-
|
|
928
|
+
_iterator20.e(err);
|
|
861
929
|
} finally {
|
|
862
|
-
|
|
930
|
+
_iterator20.f();
|
|
863
931
|
}
|
|
864
932
|
batch.frames = batch.frames.slice(i);
|
|
865
933
|
}
|
|
@@ -874,8 +942,8 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
874
942
|
value: function callFireOnEndOnConflict(tmodel, lastBatch, newBatch) {
|
|
875
943
|
var oldMap = lastBatch.keyMap; // cleanKey -> Set
|
|
876
944
|
var newMap = newBatch.keyMap;
|
|
877
|
-
for (var
|
|
878
|
-
var cleanKey = _Object$keys2[
|
|
945
|
+
for (var _i8 = 0, _Object$keys2 = Object.keys(newMap); _i8 < _Object$keys2.length; _i8++) {
|
|
946
|
+
var cleanKey = _Object$keys2[_i8];
|
|
879
947
|
var oldSet = oldMap[cleanKey];
|
|
880
948
|
var newSet = newMap[cleanKey];
|
|
881
949
|
if (!oldSet || !newSet) {
|
|
@@ -883,11 +951,11 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
883
951
|
}
|
|
884
952
|
|
|
885
953
|
// Any old originalKey that’s not present anymore should be completed/canceled.
|
|
886
|
-
var
|
|
887
|
-
|
|
954
|
+
var _iterator21 = _createForOfIteratorHelper(oldSet),
|
|
955
|
+
_step21;
|
|
888
956
|
try {
|
|
889
|
-
for (
|
|
890
|
-
var oldOriginal =
|
|
957
|
+
for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
|
|
958
|
+
var oldOriginal = _step21.value;
|
|
891
959
|
if (newSet.has(oldOriginal)) {
|
|
892
960
|
continue;
|
|
893
961
|
}
|
|
@@ -896,15 +964,15 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
896
964
|
if (oldRec) {
|
|
897
965
|
this.completeRecord(tmodel, oldRec, cleanKey, oldOriginal);
|
|
898
966
|
oldRec.status = 'complete';
|
|
899
|
-
oldRec.hooks.fireOnEnd(oldRec.tmodel, oldOriginal);
|
|
900
967
|
oldRec.tmodel.removeFromAnimatingMap(oldOriginal);
|
|
901
968
|
this.recordMap.delete(recId);
|
|
969
|
+
oldRec.hooks.fireOnEnd(oldRec.tmodel, oldOriginal);
|
|
902
970
|
}
|
|
903
971
|
}
|
|
904
972
|
} catch (err) {
|
|
905
|
-
|
|
973
|
+
_iterator21.e(err);
|
|
906
974
|
} finally {
|
|
907
|
-
|
|
975
|
+
_iterator21.f();
|
|
908
976
|
}
|
|
909
977
|
}
|
|
910
978
|
}
|
|
@@ -913,8 +981,8 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
913
981
|
value: function mergeBatches(lastBatch, newBatch) {
|
|
914
982
|
var newCleanKeys = new Set(Object.keys(newBatch.keyMap));
|
|
915
983
|
var oldKeyMap = {};
|
|
916
|
-
for (var
|
|
917
|
-
var _Object$entries$_i = _slicedToArray(_Object$entries[
|
|
984
|
+
for (var _i9 = 0, _Object$entries = Object.entries(lastBatch.keyMap); _i9 < _Object$entries.length; _i9++) {
|
|
985
|
+
var _Object$entries$_i = _slicedToArray(_Object$entries[_i9], 2),
|
|
918
986
|
key = _Object$entries$_i[0],
|
|
919
987
|
originalKeys = _Object$entries$_i[1];
|
|
920
988
|
if (!newCleanKeys.has(key)) {
|
|
@@ -924,23 +992,23 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
924
992
|
var oldCleanKeys = Object.keys(oldKeyMap);
|
|
925
993
|
var oldFrames = [];
|
|
926
994
|
if (oldCleanKeys.length) {
|
|
927
|
-
var
|
|
928
|
-
|
|
995
|
+
var _iterator22 = _createForOfIteratorHelper(lastBatch.frames),
|
|
996
|
+
_step22;
|
|
929
997
|
try {
|
|
930
|
-
for (
|
|
931
|
-
var frame =
|
|
998
|
+
for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
|
|
999
|
+
var frame = _step22.value;
|
|
932
1000
|
var oldFrame = {
|
|
933
1001
|
keyTime: frame.keyTime,
|
|
934
1002
|
tfMap: {},
|
|
935
1003
|
styleMap: {},
|
|
936
1004
|
keyMeta: new Map()
|
|
937
1005
|
};
|
|
938
|
-
var
|
|
939
|
-
|
|
1006
|
+
var _iterator23 = _createForOfIteratorHelper(oldCleanKeys),
|
|
1007
|
+
_step23;
|
|
940
1008
|
try {
|
|
941
|
-
for (
|
|
1009
|
+
for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
|
|
942
1010
|
var _frame$keyMeta;
|
|
943
|
-
var _key =
|
|
1011
|
+
var _key = _step23.value;
|
|
944
1012
|
if (TUtil.isDefined(frame.tfMap[_key])) {
|
|
945
1013
|
oldFrame.tfMap[_key] = frame.tfMap[_key];
|
|
946
1014
|
}
|
|
@@ -953,18 +1021,18 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
953
1021
|
}
|
|
954
1022
|
}
|
|
955
1023
|
} catch (err) {
|
|
956
|
-
|
|
1024
|
+
_iterator23.e(err);
|
|
957
1025
|
} finally {
|
|
958
|
-
|
|
1026
|
+
_iterator23.f();
|
|
959
1027
|
}
|
|
960
1028
|
if (Object.keys(oldFrame.tfMap).length || Object.keys(oldFrame.styleMap).length) {
|
|
961
1029
|
oldFrames.push(oldFrame);
|
|
962
1030
|
}
|
|
963
1031
|
}
|
|
964
1032
|
} catch (err) {
|
|
965
|
-
|
|
1033
|
+
_iterator22.e(err);
|
|
966
1034
|
} finally {
|
|
967
|
-
|
|
1035
|
+
_iterator22.f();
|
|
968
1036
|
}
|
|
969
1037
|
}
|
|
970
1038
|
var frames = [].concat(oldFrames, _toConsumableArray(newBatch.frames));
|
|
@@ -972,37 +1040,37 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
972
1040
|
return a.keyTime - b.keyTime;
|
|
973
1041
|
});
|
|
974
1042
|
var merged = [];
|
|
975
|
-
var
|
|
976
|
-
|
|
1043
|
+
var _iterator24 = _createForOfIteratorHelper(frames),
|
|
1044
|
+
_step24;
|
|
977
1045
|
try {
|
|
978
|
-
for (
|
|
979
|
-
var _frame2 =
|
|
1046
|
+
for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
|
|
1047
|
+
var _frame2 = _step24.value;
|
|
980
1048
|
var last = merged[merged.length - 1];
|
|
981
1049
|
if (last && Math.abs(last.keyTime - _frame2.keyTime) < 0.0001) {
|
|
982
1050
|
Object.assign(last.styleMap, _frame2.styleMap);
|
|
983
1051
|
Object.assign(last.tfMap, _frame2.tfMap);
|
|
984
|
-
var
|
|
985
|
-
|
|
1052
|
+
var _iterator25 = _createForOfIteratorHelper(_frame2.keyMeta),
|
|
1053
|
+
_step25;
|
|
986
1054
|
try {
|
|
987
|
-
for (
|
|
988
|
-
var
|
|
989
|
-
_key2 =
|
|
990
|
-
_meta =
|
|
1055
|
+
for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
|
|
1056
|
+
var _step25$value = _slicedToArray(_step25.value, 2),
|
|
1057
|
+
_key2 = _step25$value[0],
|
|
1058
|
+
_meta = _step25$value[1];
|
|
991
1059
|
last.keyMeta.set(_key2, _meta);
|
|
992
1060
|
}
|
|
993
1061
|
} catch (err) {
|
|
994
|
-
|
|
1062
|
+
_iterator25.e(err);
|
|
995
1063
|
} finally {
|
|
996
|
-
|
|
1064
|
+
_iterator25.f();
|
|
997
1065
|
}
|
|
998
1066
|
} else {
|
|
999
1067
|
merged.push(_frame2);
|
|
1000
1068
|
}
|
|
1001
1069
|
}
|
|
1002
1070
|
} catch (err) {
|
|
1003
|
-
|
|
1071
|
+
_iterator24.e(err);
|
|
1004
1072
|
} finally {
|
|
1005
|
-
|
|
1073
|
+
_iterator24.f();
|
|
1006
1074
|
}
|
|
1007
1075
|
newBatch.frames = merged;
|
|
1008
1076
|
newBatch.keyMap = _objectSpread(_objectSpread({}, oldKeyMap), newBatch.keyMap);
|
|
@@ -1018,8 +1086,8 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
1018
1086
|
if (keysA.length !== keysB.length) {
|
|
1019
1087
|
return false;
|
|
1020
1088
|
}
|
|
1021
|
-
for (var
|
|
1022
|
-
var k = _keysA[
|
|
1089
|
+
for (var _i10 = 0, _keysA = keysA; _i10 < _keysA.length; _i10++) {
|
|
1090
|
+
var k = _keysA[_i10];
|
|
1023
1091
|
if (k === 'offset') {
|
|
1024
1092
|
continue;
|
|
1025
1093
|
}
|
|
@@ -1055,25 +1123,25 @@ var AnimationManager = /*#__PURE__*/function () {
|
|
|
1055
1123
|
var cutTime = Math.min(TUtil.now() - tmodel.lastBatch.startTime, tmodel.lastBatch.totalDuration);
|
|
1056
1124
|
var batch = this.cutLastBatch(tmodel, tmodel.lastBatch, cutTime);
|
|
1057
1125
|
AnimationUtil.rebaseCutBatchMeta(tmodel, batch);
|
|
1058
|
-
var
|
|
1059
|
-
|
|
1126
|
+
var _iterator26 = _createForOfIteratorHelper(batch.frames),
|
|
1127
|
+
_step26;
|
|
1060
1128
|
try {
|
|
1061
|
-
for (
|
|
1062
|
-
var frame =
|
|
1063
|
-
for (var
|
|
1064
|
-
var _Object$entries3$_i = _slicedToArray(_Object$entries3[
|
|
1129
|
+
for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
|
|
1130
|
+
var frame = _step26.value;
|
|
1131
|
+
for (var _i12 = 0, _Object$entries3 = Object.entries(tfUpdates); _i12 < _Object$entries3.length; _i12++) {
|
|
1132
|
+
var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i12], 2),
|
|
1065
1133
|
_key3 = _Object$entries3$_i[0],
|
|
1066
1134
|
_value = _Object$entries3$_i[1];
|
|
1067
1135
|
frame.tfMap[_key3] = _value;
|
|
1068
1136
|
}
|
|
1069
1137
|
}
|
|
1070
1138
|
} catch (err) {
|
|
1071
|
-
|
|
1139
|
+
_iterator26.e(err);
|
|
1072
1140
|
} finally {
|
|
1073
|
-
|
|
1141
|
+
_iterator26.f();
|
|
1074
1142
|
}
|
|
1075
|
-
for (var
|
|
1076
|
-
var _Object$entries2$_i = _slicedToArray(_Object$entries2[
|
|
1143
|
+
for (var _i11 = 0, _Object$entries2 = Object.entries(tfUpdates); _i11 < _Object$entries2.length; _i11++) {
|
|
1144
|
+
var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i11], 2),
|
|
1077
1145
|
key = _Object$entries2$_i[0],
|
|
1078
1146
|
value = _Object$entries2$_i[1];
|
|
1079
1147
|
tmodel.tfMap[key] = value;
|
package/build/AnimationUtil.js
CHANGED