UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts] Port of commit 8290353. Fix for hold previous on 3+ animations causing dipping. See #1738.

Browse Source
This commit is contained in:
badlogic 2020-08-13 14:34:59 +02:00
parent 0405d239ea
commit c0d8f1cece
19 changed files with 96 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spine-ts/build/spine-all.d.ts vendored
View File

@ -249,7 +249,8 @@ declare module spine {
static emptyAnimation: Animation; static emptyAnimation: Animation;
static SUBSEQUENT: number; static SUBSEQUENT: number;
static FIRST: number; static FIRST: number;
static HOLD: number; static HOLD_SUBSEQUENT: number;
static HOLD_FIRST: number;
static HOLD_MIX: number; static HOLD_MIX: number;
static SETUP: number; static SETUP: number;
static CURRENT: number; static CURRENT: number;

16
spine-ts/build/spine-all.js
View File

@ -1554,7 +1554,11 @@ var spine;
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaMix; alpha = alphaMix;
break; break;
case AnimationState.HOLD: case AnimationState.HOLD_SUBSEQUENT:
timelineBlend = blend;
alpha = alphaHold;
break;
case AnimationState.HOLD_FIRST:
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaHold; alpha = alphaHold;
break; break;
@ -1908,8 +1912,7 @@ var spine;
var propertyIDs = this.propertyIDs; var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) { if (to != null && to.holdPrevious) {
for (var i = 0; i < timelinesCount; i++) { for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId()); timelineMode[i] = propertyIDs.add(timelines[i].getPropertyId()) ? AnimationState.HOLD_FIRST : AnimationState.HOLD_SUBSEQUENT;
timelineMode[i] = AnimationState.HOLD;
} }
return; return;
} }
@ -1933,7 +1936,7 @@ var spine;
} }
break; break;
} }
timelineMode[i] = AnimationState.HOLD; timelineMode[i] = AnimationState.HOLD_FIRST;
} }
} }
}; };
@ -1961,8 +1964,9 @@ var spine;
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.HOLD = 2; AnimationState.HOLD_SUBSEQUENT = 2;
AnimationState.HOLD_MIX = 3; AnimationState.HOLD_FIRST = 3;
AnimationState.HOLD_MIX = 4;
AnimationState.SETUP = 1; AnimationState.SETUP = 1;
AnimationState.CURRENT = 2; AnimationState.CURRENT = 2;
return AnimationState; return AnimationState;

2
spine-ts/build/spine-all.js.map
View File

File diff suppressed because one or more lines are too long

3
spine-ts/build/spine-canvas.d.ts vendored
View File

@ -249,7 +249,8 @@ declare module spine {
static emptyAnimation: Animation; static emptyAnimation: Animation;
static SUBSEQUENT: number; static SUBSEQUENT: number;
static FIRST: number; static FIRST: number;
static HOLD: number; static HOLD_SUBSEQUENT: number;
static HOLD_FIRST: number;
static HOLD_MIX: number; static HOLD_MIX: number;
static SETUP: number; static SETUP: number;
static CURRENT: number; static CURRENT: number;

16
spine-ts/build/spine-canvas.js
View File

@ -1554,7 +1554,11 @@ var spine;
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaMix; alpha = alphaMix;
break; break;
case AnimationState.HOLD: case AnimationState.HOLD_SUBSEQUENT:
timelineBlend = blend;
alpha = alphaHold;
break;
case AnimationState.HOLD_FIRST:
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaHold; alpha = alphaHold;
break; break;
@ -1908,8 +1912,7 @@ var spine;
var propertyIDs = this.propertyIDs; var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) { if (to != null && to.holdPrevious) {
for (var i = 0; i < timelinesCount; i++) { for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId()); timelineMode[i] = propertyIDs.add(timelines[i].getPropertyId()) ? AnimationState.HOLD_FIRST : AnimationState.HOLD_SUBSEQUENT;
timelineMode[i] = AnimationState.HOLD;
} }
return; return;
} }
@ -1933,7 +1936,7 @@ var spine;
} }
break; break;
} }
timelineMode[i] = AnimationState.HOLD; timelineMode[i] = AnimationState.HOLD_FIRST;
} }
} }
}; };
@ -1961,8 +1964,9 @@ var spine;
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.HOLD = 2; AnimationState.HOLD_SUBSEQUENT = 2;
AnimationState.HOLD_MIX = 3; AnimationState.HOLD_FIRST = 3;
AnimationState.HOLD_MIX = 4;
AnimationState.SETUP = 1; AnimationState.SETUP = 1;
AnimationState.CURRENT = 2; AnimationState.CURRENT = 2;
return AnimationState; return AnimationState;

2
spine-ts/build/spine-canvas.js.map
View File

File diff suppressed because one or more lines are too long

3
spine-ts/build/spine-core.d.ts vendored
View File

@ -249,7 +249,8 @@ declare module spine {
static emptyAnimation: Animation; static emptyAnimation: Animation;
static SUBSEQUENT: number; static SUBSEQUENT: number;
static FIRST: number; static FIRST: number;
static HOLD: number; static HOLD_SUBSEQUENT: number;
static HOLD_FIRST: number;
static HOLD_MIX: number; static HOLD_MIX: number;
static SETUP: number; static SETUP: number;
static CURRENT: number; static CURRENT: number;

16
spine-ts/build/spine-core.js
View File

@ -1554,7 +1554,11 @@ var spine;
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaMix; alpha = alphaMix;
break; break;
case AnimationState.HOLD: case AnimationState.HOLD_SUBSEQUENT:
timelineBlend = blend;
alpha = alphaHold;
break;
case AnimationState.HOLD_FIRST:
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaHold; alpha = alphaHold;
break; break;
@ -1908,8 +1912,7 @@ var spine;
var propertyIDs = this.propertyIDs; var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) { if (to != null && to.holdPrevious) {
for (var i = 0; i < timelinesCount; i++) { for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId()); timelineMode[i] = propertyIDs.add(timelines[i].getPropertyId()) ? AnimationState.HOLD_FIRST : AnimationState.HOLD_SUBSEQUENT;
timelineMode[i] = AnimationState.HOLD;
} }
return; return;
} }
@ -1933,7 +1936,7 @@ var spine;
} }
break; break;
} }
timelineMode[i] = AnimationState.HOLD; timelineMode[i] = AnimationState.HOLD_FIRST;
} }
} }
}; };
@ -1961,8 +1964,9 @@ var spine;
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.HOLD = 2; AnimationState.HOLD_SUBSEQUENT = 2;
AnimationState.HOLD_MIX = 3; AnimationState.HOLD_FIRST = 3;
AnimationState.HOLD_MIX = 4;
AnimationState.SETUP = 1; AnimationState.SETUP = 1;
AnimationState.CURRENT = 2; AnimationState.CURRENT = 2;
return AnimationState; return AnimationState;

2
spine-ts/build/spine-core.js.map
View File

File diff suppressed because one or more lines are too long

3
spine-ts/build/spine-player.d.ts vendored
View File

@ -249,7 +249,8 @@ declare module spine {
static emptyAnimation: Animation; static emptyAnimation: Animation;
static SUBSEQUENT: number; static SUBSEQUENT: number;
static FIRST: number; static FIRST: number;
static HOLD: number; static HOLD_SUBSEQUENT: number;
static HOLD_FIRST: number;
static HOLD_MIX: number; static HOLD_MIX: number;
static SETUP: number; static SETUP: number;
static CURRENT: number; static CURRENT: number;

16
spine-ts/build/spine-player.js
View File

@ -1554,7 +1554,11 @@ var spine;
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaMix; alpha = alphaMix;
break; break;
case AnimationState.HOLD: case AnimationState.HOLD_SUBSEQUENT:
timelineBlend = blend;
alpha = alphaHold;
break;
case AnimationState.HOLD_FIRST:
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaHold; alpha = alphaHold;
break; break;
@ -1908,8 +1912,7 @@ var spine;
var propertyIDs = this.propertyIDs; var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) { if (to != null && to.holdPrevious) {
for (var i = 0; i < timelinesCount; i++) { for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId()); timelineMode[i] = propertyIDs.add(timelines[i].getPropertyId()) ? AnimationState.HOLD_FIRST : AnimationState.HOLD_SUBSEQUENT;
timelineMode[i] = AnimationState.HOLD;
} }
return; return;
} }
@ -1933,7 +1936,7 @@ var spine;
} }
break; break;
} }
timelineMode[i] = AnimationState.HOLD; timelineMode[i] = AnimationState.HOLD_FIRST;
} }
} }
}; };
@ -1961,8 +1964,9 @@ var spine;
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.HOLD = 2; AnimationState.HOLD_SUBSEQUENT = 2;
AnimationState.HOLD_MIX = 3; AnimationState.HOLD_FIRST = 3;
AnimationState.HOLD_MIX = 4;
AnimationState.SETUP = 1; AnimationState.SETUP = 1;
AnimationState.CURRENT = 2; AnimationState.CURRENT = 2;
return AnimationState; return AnimationState;

2
spine-ts/build/spine-player.js.map
View File

File diff suppressed because one or more lines are too long

3
spine-ts/build/spine-threejs.d.ts vendored
View File

@ -249,7 +249,8 @@ declare module spine {
static emptyAnimation: Animation; static emptyAnimation: Animation;
static SUBSEQUENT: number; static SUBSEQUENT: number;
static FIRST: number; static FIRST: number;
static HOLD: number; static HOLD_SUBSEQUENT: number;
static HOLD_FIRST: number;
static HOLD_MIX: number; static HOLD_MIX: number;
static SETUP: number; static SETUP: number;
static CURRENT: number; static CURRENT: number;

16
spine-ts/build/spine-threejs.js
View File

@ -1554,7 +1554,11 @@ var spine;
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaMix; alpha = alphaMix;
break; break;
case AnimationState.HOLD: case AnimationState.HOLD_SUBSEQUENT:
timelineBlend = blend;
alpha = alphaHold;
break;
case AnimationState.HOLD_FIRST:
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaHold; alpha = alphaHold;
break; break;
@ -1908,8 +1912,7 @@ var spine;
var propertyIDs = this.propertyIDs; var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) { if (to != null && to.holdPrevious) {
for (var i = 0; i < timelinesCount; i++) { for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId()); timelineMode[i] = propertyIDs.add(timelines[i].getPropertyId()) ? AnimationState.HOLD_FIRST : AnimationState.HOLD_SUBSEQUENT;
timelineMode[i] = AnimationState.HOLD;
} }
return; return;
} }
@ -1933,7 +1936,7 @@ var spine;
} }
break; break;
} }
timelineMode[i] = AnimationState.HOLD; timelineMode[i] = AnimationState.HOLD_FIRST;
} }
} }
}; };
@ -1961,8 +1964,9 @@ var spine;
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.HOLD = 2; AnimationState.HOLD_SUBSEQUENT = 2;
AnimationState.HOLD_MIX = 3; AnimationState.HOLD_FIRST = 3;
AnimationState.HOLD_MIX = 4;
AnimationState.SETUP = 1; AnimationState.SETUP = 1;
AnimationState.CURRENT = 2; AnimationState.CURRENT = 2;
return AnimationState; return AnimationState;

2
spine-ts/build/spine-threejs.js.map
View File

File diff suppressed because one or more lines are too long

3
spine-ts/build/spine-webgl.d.ts vendored
View File

@ -249,7 +249,8 @@ declare module spine {
static emptyAnimation: Animation; static emptyAnimation: Animation;
static SUBSEQUENT: number; static SUBSEQUENT: number;
static FIRST: number; static FIRST: number;
static HOLD: number; static HOLD_SUBSEQUENT: number;
static HOLD_FIRST: number;
static HOLD_MIX: number; static HOLD_MIX: number;
static SETUP: number; static SETUP: number;
static CURRENT: number; static CURRENT: number;

16
spine-ts/build/spine-webgl.js
View File

@ -1554,7 +1554,11 @@ var spine;
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaMix; alpha = alphaMix;
break; break;
case AnimationState.HOLD: case AnimationState.HOLD_SUBSEQUENT:
timelineBlend = blend;
alpha = alphaHold;
break;
case AnimationState.HOLD_FIRST:
timelineBlend = spine.MixBlend.setup; timelineBlend = spine.MixBlend.setup;
alpha = alphaHold; alpha = alphaHold;
break; break;
@ -1908,8 +1912,7 @@ var spine;
var propertyIDs = this.propertyIDs; var propertyIDs = this.propertyIDs;
if (to != null && to.holdPrevious) { if (to != null && to.holdPrevious) {
for (var i = 0; i < timelinesCount; i++) { for (var i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId()); timelineMode[i] = propertyIDs.add(timelines[i].getPropertyId()) ? AnimationState.HOLD_FIRST : AnimationState.HOLD_SUBSEQUENT;
timelineMode[i] = AnimationState.HOLD;
} }
return; return;
} }
@ -1933,7 +1936,7 @@ var spine;
} }
break; break;
} }
timelineMode[i] = AnimationState.HOLD; timelineMode[i] = AnimationState.HOLD_FIRST;
} }
} }
}; };
@ -1961,8 +1964,9 @@ var spine;
AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0); AnimationState.emptyAnimation = new spine.Animation("<empty>", [], 0);
AnimationState.SUBSEQUENT = 0; AnimationState.SUBSEQUENT = 0;
AnimationState.FIRST = 1; AnimationState.FIRST = 1;
AnimationState.HOLD = 2; AnimationState.HOLD_SUBSEQUENT = 2;
AnimationState.HOLD_MIX = 3; AnimationState.HOLD_FIRST = 3;
AnimationState.HOLD_MIX = 4;
AnimationState.SETUP = 1; AnimationState.SETUP = 1;
AnimationState.CURRENT = 2; AnimationState.CURRENT = 2;
return AnimationState; return AnimationState;

2
spine-ts/build/spine-webgl.js.map
View File

File diff suppressed because one or more lines are too long

28
spine-ts/core/src/AnimationState.ts
View File

@ -45,13 +45,18 @@ module spine {
* *
* Result: Mix from the setup pose to the timeline pose. */ * Result: Mix from the setup pose to the timeline pose. */
static FIRST = 1; static FIRST = 1;
/** 1. This is the first timeline to set this property. /** 1) A previously applied timeline has set this property.<br>
* 2. The next track entry to be applied does have a timeline to set this property. * 2) The next track entry to be applied does have a timeline to set this property.<br>
* 3. The next track entry after that one does not have a timeline to set this property. * 3) The next track entry after that one does not have a timeline to set this property.<br>
* * Result: Mix from the current pose to the timeline pose, but do not mix out. This avoids "dipping" when crossfading
* animations that key the same property. A subsequent timeline will set this property using a mix. */
static HOLD_SUBSEQUENT = 2;
/** 1) This is the first timeline to set this property.<br>
* 2) The next track entry to be applied does have a timeline to set this property.<br>
* 3) The next track entry after that one does not have a timeline to set this property.<br>
* Result: Mix from the setup pose to the timeline pose, but do not mix out. This avoids "dipping" when crossfading animations * Result: Mix from the setup pose to the timeline pose, but do not mix out. This avoids "dipping" when crossfading animations
* that key the same property. A subsequent timeline will set this property using a mix. */ * that key the same property. A subsequent timeline will set this property using a mix. */
static HOLD = 2; static HOLD_FIRST = 3;
/** 1. This is the first timeline to set this property. /** 1. This is the first timeline to set this property.
* 2. The next track entry to be applied does have a timeline to set this property. * 2. The next track entry to be applied does have a timeline to set this property.
* 3. The next track entry after that one does have a timeline to set this property. * 3. The next track entry after that one does have a timeline to set this property.
@ -64,7 +69,7 @@ module spine {
* "dipping" A is not mixed out, however D (the first entry that doesn't set the property) mixing in is used to mix out A * "dipping" A is not mixed out, however D (the first entry that doesn't set the property) mixing in is used to mix out A
* (which affects B and C). Without using D to mix out, A would be applied fully until mixing completes, then snap into * (which affects B and C). Without using D to mix out, A would be applied fully until mixing completes, then snap into
* place. */ * place. */
static HOLD_MIX = 3; static HOLD_MIX = 4;
static SETUP = 1; static SETUP = 1;
static CURRENT = 2; static CURRENT = 2;
@ -311,7 +316,11 @@ module spine {
timelineBlend = MixBlend.setup; timelineBlend = MixBlend.setup;
alpha = alphaMix; alpha = alphaMix;
break; break;
case AnimationState.HOLD: case AnimationState.HOLD_SUBSEQUENT:
timelineBlend = blend;
alpha = alphaHold;
break;
case AnimationState.HOLD_FIRST:
timelineBlend = MixBlend.setup; timelineBlend = MixBlend.setup;
alpha = alphaHold; alpha = alphaHold;
break; break;
@ -758,8 +767,7 @@ module spine {
if (to != null && to.holdPrevious) { if (to != null && to.holdPrevious) {
for (let i = 0; i < timelinesCount; i++) { for (let i = 0; i < timelinesCount; i++) {
propertyIDs.add(timelines[i].getPropertyId()); timelineMode[i] = propertyIDs.add(timelines[i].getPropertyId()) ? AnimationState.HOLD_FIRST : AnimationState.HOLD_SUBSEQUENT;
timelineMode[i] = AnimationState.HOLD;
} }
return; return;
} }
@ -783,7 +791,7 @@ module spine {
} }
break; break;
} }
timelineMode[i] = AnimationState.HOLD; timelineMode[i] = AnimationState.HOLD_FIRST;
} }
} }
} }