UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-02 05:39:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts][csharp] Fix for #1352, the last subsequent attachment timeline always mixes out to the setup pose.

Browse Source
This commit is contained in:
badlogic 2019-05-15 13:52:31 +02:00
parent 603c9e2366
commit 6341fbbd9d
14 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-csharp/src/AnimationState.cs
View File

@ -299,7 +299,10 @@ namespace Spine {
float alpha; float alpha;
switch (timelineMode[i] & AnimationState.NotLast - 1) { switch (timelineMode[i] & AnimationState.NotLast - 1) {
case AnimationState.Subsequent: case AnimationState.Subsequent:
if (!attachments && timeline is AttachmentTimeline) continue; if (!attachments && timeline is AttachmentTimeline) {
if ((timelineMode[i] & AnimationState.NotLast) == AnimationState.NotLast) continue;
blend = MixBlend.setup;
}
if (!drawOrder && timeline is DrawOrderTimeline) continue; if (!drawOrder && timeline is DrawOrderTimeline) continue;
timelineBlend = blend; timelineBlend = blend;
alpha = alphaMix; alpha = alphaMix;

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

@ -1475,8 +1475,11 @@ var spine;
var alpha = 0; var alpha = 0;
switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) { switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
case AnimationState.SUBSEQUENT: case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof spine.AttachmentTimeline) if (!attachments && timeline instanceof spine.AttachmentTimeline) {
continue; if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
continue;
blend = spine.MixBlend.setup;
}
if (!drawOrder && timeline instanceof spine.DrawOrderTimeline) if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
continue; continue;
timelineBlend = blend; timelineBlend = blend;

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

File diff suppressed because one or more lines are too long

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

@ -1475,8 +1475,11 @@ var spine;
var alpha = 0; var alpha = 0;
switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) { switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
case AnimationState.SUBSEQUENT: case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof spine.AttachmentTimeline) if (!attachments && timeline instanceof spine.AttachmentTimeline) {
continue; if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
continue;
blend = spine.MixBlend.setup;
}
if (!drawOrder && timeline instanceof spine.DrawOrderTimeline) if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
continue; continue;
timelineBlend = blend; timelineBlend = blend;

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

File diff suppressed because one or more lines are too long

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

@ -1475,8 +1475,11 @@ var spine;
var alpha = 0; var alpha = 0;
switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) { switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
case AnimationState.SUBSEQUENT: case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof spine.AttachmentTimeline) if (!attachments && timeline instanceof spine.AttachmentTimeline) {
continue; if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
continue;
blend = spine.MixBlend.setup;
}
if (!drawOrder && timeline instanceof spine.DrawOrderTimeline) if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
continue; continue;
timelineBlend = blend; timelineBlend = blend;

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

File diff suppressed because one or more lines are too long

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

@ -1475,8 +1475,11 @@ var spine;
var alpha = 0; var alpha = 0;
switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) { switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
case AnimationState.SUBSEQUENT: case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof spine.AttachmentTimeline) if (!attachments && timeline instanceof spine.AttachmentTimeline) {
continue; if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
continue;
blend = spine.MixBlend.setup;
}
if (!drawOrder && timeline instanceof spine.DrawOrderTimeline) if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
continue; continue;
timelineBlend = blend; timelineBlend = blend;

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

File diff suppressed because one or more lines are too long

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

@ -1475,8 +1475,11 @@ var spine;
var alpha = 0; var alpha = 0;
switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) { switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
case AnimationState.SUBSEQUENT: case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof spine.AttachmentTimeline) if (!attachments && timeline instanceof spine.AttachmentTimeline) {
continue; if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
continue;
blend = spine.MixBlend.setup;
}
if (!drawOrder && timeline instanceof spine.DrawOrderTimeline) if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
continue; continue;
timelineBlend = blend; timelineBlend = blend;

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

File diff suppressed because one or more lines are too long

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

@ -1475,8 +1475,11 @@ var spine;
var alpha = 0; var alpha = 0;
switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) { switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
case AnimationState.SUBSEQUENT: case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof spine.AttachmentTimeline) if (!attachments && timeline instanceof spine.AttachmentTimeline) {
continue; if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
continue;
blend = spine.MixBlend.setup;
}
if (!drawOrder && timeline instanceof spine.DrawOrderTimeline) if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
continue; continue;
timelineBlend = blend; timelineBlend = blend;

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

File diff suppressed because one or more lines are too long

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

@ -230,7 +230,10 @@ module spine {
let alpha = 0; let alpha = 0;
switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) { switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
case AnimationState.SUBSEQUENT: case AnimationState.SUBSEQUENT:
if (!attachments && timeline instanceof AttachmentTimeline) continue; if (!attachments && timeline instanceof AttachmentTimeline) {
if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST) continue;
blend = MixBlend.setup;
}
if (!drawOrder && timeline instanceof DrawOrderTimeline) continue; if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
timelineBlend = blend; timelineBlend = blend;
alpha = alphaMix; alpha = alphaMix;