@esotericsoftware/spine-canvas 4.2.66 → 4.2.68
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.
|
@@ -3668,15 +3668,18 @@ var spine = (() => {
|
|
|
3668
3668
|
let finished = this.updateMixingFrom(from, delta);
|
|
3669
3669
|
from.animationLast = from.nextAnimationLast;
|
|
3670
3670
|
from.trackLast = from.nextTrackLast;
|
|
3671
|
-
if (to.
|
|
3672
|
-
|
|
3673
|
-
|
|
3674
|
-
if (from.
|
|
3675
|
-
|
|
3676
|
-
|
|
3677
|
-
|
|
3671
|
+
if (to.nextTrackLast != -1) {
|
|
3672
|
+
const discard = to.mixTime == 0 && from.mixTime == 0;
|
|
3673
|
+
if (to.mixTime >= to.mixDuration || discard) {
|
|
3674
|
+
if (from.totalAlpha == 0 || to.mixDuration == 0 || discard) {
|
|
3675
|
+
to.mixingFrom = from.mixingFrom;
|
|
3676
|
+
if (from.mixingFrom != null)
|
|
3677
|
+
from.mixingFrom.mixingTo = to;
|
|
3678
|
+
to.interruptAlpha = from.interruptAlpha;
|
|
3679
|
+
this.queue.end(from);
|
|
3680
|
+
}
|
|
3681
|
+
return finished;
|
|
3678
3682
|
}
|
|
3679
|
-
return finished;
|
|
3680
3683
|
}
|
|
3681
3684
|
from.trackTime += delta * from.timeScale;
|
|
3682
3685
|
to.mixTime += delta;
|
|
@@ -7872,6 +7875,19 @@ var spine = (() => {
|
|
|
7872
7875
|
updateCache[i].update(physics);
|
|
7873
7876
|
}
|
|
7874
7877
|
updateWorldTransformWith(physics, parent) {
|
|
7878
|
+
if (!parent)
|
|
7879
|
+
throw new Error("parent cannot be null.");
|
|
7880
|
+
let bones = this.bones;
|
|
7881
|
+
for (let i = 1, n = bones.length; i < n; i++) {
|
|
7882
|
+
let bone = bones[i];
|
|
7883
|
+
bone.ax = bone.x;
|
|
7884
|
+
bone.ay = bone.y;
|
|
7885
|
+
bone.arotation = bone.rotation;
|
|
7886
|
+
bone.ascaleX = bone.scaleX;
|
|
7887
|
+
bone.ascaleY = bone.scaleY;
|
|
7888
|
+
bone.ashearX = bone.shearX;
|
|
7889
|
+
bone.ashearY = bone.shearY;
|
|
7890
|
+
}
|
|
7875
7891
|
let rootBone = this.getRootBone();
|
|
7876
7892
|
if (!rootBone)
|
|
7877
7893
|
throw new Error("Root bone must not be null.");
|