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

[ts] Fixed AnimationState not respecting MixBlend.first for rotate timelines. See #1274.

Browse Source
This commit is contained in:
badlogic 2019-02-12 13:59:28 +01:00
parent 1935d4a488
commit 19e5edc94b
13 changed files with 170 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1532,25 +1532,33 @@ var spine;
var rotateTimeline = timeline; var rotateTimeline = timeline;
var frames = rotateTimeline.frames; var frames = rotateTimeline.frames;
var bone = skeleton.bones[rotateTimeline.boneIndex]; var bone = skeleton.bones[rotateTimeline.boneIndex];
var r1 = 0, r2 = 0;
if (time < frames[0]) { if (time < frames[0]) {
if (blend == spine.MixBlend.setup) switch (blend) {
bone.rotation = bone.data.rotation; case spine.MixBlend.setup:
return; bone.rotation = bone.data.rotation;
default:
return;
case spine.MixBlend.first:
r1 = bone.rotation;
r2 = bone.data.rotation;
}
} }
var r2 = 0;
if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
else { else {
var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES); r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION]; if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
var frameTime = frames[frame]; r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime)); else {
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation; var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES);
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION];
r2 = prevRotation + r2 * percent + bone.data.rotation; var frameTime = frames[frame];
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime));
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
r2 = prevRotation + r2 * percent + bone.data.rotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
}
} }
var r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var total = 0, diff = r2 - r1; var total = 0, diff = r2 - r1;
diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360; diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360;
if (diff == 0) { if (diff == 0) {

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

File diff suppressed because one or more lines are too long

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

@ -1532,25 +1532,33 @@ var spine;
var rotateTimeline = timeline; var rotateTimeline = timeline;
var frames = rotateTimeline.frames; var frames = rotateTimeline.frames;
var bone = skeleton.bones[rotateTimeline.boneIndex]; var bone = skeleton.bones[rotateTimeline.boneIndex];
var r1 = 0, r2 = 0;
if (time < frames[0]) { if (time < frames[0]) {
if (blend == spine.MixBlend.setup) switch (blend) {
bone.rotation = bone.data.rotation; case spine.MixBlend.setup:
return; bone.rotation = bone.data.rotation;
default:
return;
case spine.MixBlend.first:
r1 = bone.rotation;
r2 = bone.data.rotation;
}
} }
var r2 = 0;
if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
else { else {
var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES); r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION]; if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
var frameTime = frames[frame]; r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime)); else {
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation; var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES);
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION];
r2 = prevRotation + r2 * percent + bone.data.rotation; var frameTime = frames[frame];
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime));
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
r2 = prevRotation + r2 * percent + bone.data.rotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
}
} }
var r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var total = 0, diff = r2 - r1; var total = 0, diff = r2 - r1;
diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360; diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360;
if (diff == 0) { if (diff == 0) {

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

File diff suppressed because one or more lines are too long

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

@ -1532,25 +1532,33 @@ var spine;
var rotateTimeline = timeline; var rotateTimeline = timeline;
var frames = rotateTimeline.frames; var frames = rotateTimeline.frames;
var bone = skeleton.bones[rotateTimeline.boneIndex]; var bone = skeleton.bones[rotateTimeline.boneIndex];
var r1 = 0, r2 = 0;
if (time < frames[0]) { if (time < frames[0]) {
if (blend == spine.MixBlend.setup) switch (blend) {
bone.rotation = bone.data.rotation; case spine.MixBlend.setup:
return; bone.rotation = bone.data.rotation;
default:
return;
case spine.MixBlend.first:
r1 = bone.rotation;
r2 = bone.data.rotation;
}
} }
var r2 = 0;
if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
else { else {
var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES); r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION]; if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
var frameTime = frames[frame]; r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime)); else {
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation; var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES);
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION];
r2 = prevRotation + r2 * percent + bone.data.rotation; var frameTime = frames[frame];
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime));
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
r2 = prevRotation + r2 * percent + bone.data.rotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
}
} }
var r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var total = 0, diff = r2 - r1; var total = 0, diff = r2 - r1;
diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360; diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360;
if (diff == 0) { if (diff == 0) {

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

File diff suppressed because one or more lines are too long

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

@ -1532,25 +1532,33 @@ var spine;
var rotateTimeline = timeline; var rotateTimeline = timeline;
var frames = rotateTimeline.frames; var frames = rotateTimeline.frames;
var bone = skeleton.bones[rotateTimeline.boneIndex]; var bone = skeleton.bones[rotateTimeline.boneIndex];
var r1 = 0, r2 = 0;
if (time < frames[0]) { if (time < frames[0]) {
if (blend == spine.MixBlend.setup) switch (blend) {
bone.rotation = bone.data.rotation; case spine.MixBlend.setup:
return; bone.rotation = bone.data.rotation;
default:
return;
case spine.MixBlend.first:
r1 = bone.rotation;
r2 = bone.data.rotation;
}
} }
var r2 = 0;
if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
else { else {
var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES); r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION]; if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
var frameTime = frames[frame]; r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime)); else {
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation; var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES);
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION];
r2 = prevRotation + r2 * percent + bone.data.rotation; var frameTime = frames[frame];
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime));
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
r2 = prevRotation + r2 * percent + bone.data.rotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
}
} }
var r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var total = 0, diff = r2 - r1; var total = 0, diff = r2 - r1;
diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360; diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360;
if (diff == 0) { if (diff == 0) {

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

File diff suppressed because one or more lines are too long

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

@ -1532,25 +1532,33 @@ var spine;
var rotateTimeline = timeline; var rotateTimeline = timeline;
var frames = rotateTimeline.frames; var frames = rotateTimeline.frames;
var bone = skeleton.bones[rotateTimeline.boneIndex]; var bone = skeleton.bones[rotateTimeline.boneIndex];
var r1 = 0, r2 = 0;
if (time < frames[0]) { if (time < frames[0]) {
if (blend == spine.MixBlend.setup) switch (blend) {
bone.rotation = bone.data.rotation; case spine.MixBlend.setup:
return; bone.rotation = bone.data.rotation;
default:
return;
case spine.MixBlend.first:
r1 = bone.rotation;
r2 = bone.data.rotation;
}
} }
var r2 = 0;
if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
else { else {
var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES); r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION]; if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
var frameTime = frames[frame]; r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime)); else {
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation; var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES);
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION];
r2 = prevRotation + r2 * percent + bone.data.rotation; var frameTime = frames[frame];
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime));
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
r2 = prevRotation + r2 * percent + bone.data.rotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
}
} }
var r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var total = 0, diff = r2 - r1; var total = 0, diff = r2 - r1;
diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360; diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360;
if (diff == 0) { if (diff == 0) {

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

File diff suppressed because one or more lines are too long

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

@ -1532,25 +1532,33 @@ var spine;
var rotateTimeline = timeline; var rotateTimeline = timeline;
var frames = rotateTimeline.frames; var frames = rotateTimeline.frames;
var bone = skeleton.bones[rotateTimeline.boneIndex]; var bone = skeleton.bones[rotateTimeline.boneIndex];
var r1 = 0, r2 = 0;
if (time < frames[0]) { if (time < frames[0]) {
if (blend == spine.MixBlend.setup) switch (blend) {
bone.rotation = bone.data.rotation; case spine.MixBlend.setup:
return; bone.rotation = bone.data.rotation;
default:
return;
case spine.MixBlend.first:
r1 = bone.rotation;
r2 = bone.data.rotation;
}
} }
var r2 = 0;
if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
else { else {
var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES); r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION]; if (time >= frames[frames.length - spine.RotateTimeline.ENTRIES])
var frameTime = frames[frame]; r2 = bone.data.rotation + frames[frames.length + spine.RotateTimeline.PREV_ROTATION];
var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime)); else {
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation; var frame = spine.Animation.binarySearch(frames, time, spine.RotateTimeline.ENTRIES);
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var prevRotation = frames[frame + spine.RotateTimeline.PREV_ROTATION];
r2 = prevRotation + r2 * percent + bone.data.rotation; var frameTime = frames[frame];
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360; var percent = rotateTimeline.getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + spine.RotateTimeline.PREV_TIME] - frameTime));
r2 = frames[frame + spine.RotateTimeline.ROTATION] - prevRotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
r2 = prevRotation + r2 * percent + bone.data.rotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
}
} }
var r1 = blend == spine.MixBlend.setup ? bone.data.rotation : bone.rotation;
var total = 0, diff = r2 - r1; var total = 0, diff = r2 - r1;
diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360; diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360;
if (diff == 0) { if (diff == 0) {

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

File diff suppressed because one or more lines are too long

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

@ -288,30 +288,37 @@ module spine {
let rotateTimeline = timeline as RotateTimeline; let rotateTimeline = timeline as RotateTimeline;
let frames = rotateTimeline.frames; let frames = rotateTimeline.frames;
let bone = skeleton.bones[rotateTimeline.boneIndex]; let bone = skeleton.bones[rotateTimeline.boneIndex];
let r1 = 0, r2 = 0;
if (time < frames[0]) { if (time < frames[0]) {
if (blend == MixBlend.setup) bone.rotation = bone.data.rotation; switch (blend) {
return; case MixBlend.setup:
} bone.rotation = bone.data.rotation;
default:
return;
case MixBlend.first:
r1 = bone.rotation;
r2 = bone.data.rotation;
}
} else {
r1 = blend == MixBlend.setup ? bone.data.rotation : bone.rotation;
if (time >= frames[frames.length - RotateTimeline.ENTRIES]) // Time is after last frame.
r2 = bone.data.rotation + frames[frames.length + RotateTimeline.PREV_ROTATION];
else {
// Interpolate between the previous frame and the current frame.
let frame = Animation.binarySearch(frames, time, RotateTimeline.ENTRIES);
let prevRotation = frames[frame + RotateTimeline.PREV_ROTATION];
let frameTime = frames[frame];
let percent = rotateTimeline.getCurvePercent((frame >> 1) - 1,
1 - (time - frameTime) / (frames[frame + RotateTimeline.PREV_TIME] - frameTime));
let r2 = 0; r2 = frames[frame + RotateTimeline.ROTATION] - prevRotation;
if (time >= frames[frames.length - RotateTimeline.ENTRIES]) // Time is after last frame. r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
r2 = bone.data.rotation + frames[frames.length + RotateTimeline.PREV_ROTATION]; r2 = prevRotation + r2 * percent + bone.data.rotation;
else { r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
// Interpolate between the previous frame and the current frame. }
let frame = Animation.binarySearch(frames, time, RotateTimeline.ENTRIES);
let prevRotation = frames[frame + RotateTimeline.PREV_ROTATION];
let frameTime = frames[frame];
let percent = rotateTimeline.getCurvePercent((frame >> 1) - 1,
1 - (time - frameTime) / (frames[frame + RotateTimeline.PREV_TIME] - frameTime));
r2 = frames[frame + RotateTimeline.ROTATION] - prevRotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
r2 = prevRotation + r2 * percent + bone.data.rotation;
r2 -= (16384 - ((16384.499999999996 - r2 / 360) | 0)) * 360;
} }
// Mix between rotations using the direction of the shortest route on the first frame while detecting crosses. // Mix between rotations using the direction of the shortest route on the first frame while detecting crosses.
let r1 = blend == MixBlend.setup ? bone.data.rotation : bone.rotation;
let total = 0, diff = r2 - r1; let total = 0, diff = r2 - r1;
diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360; diff -= (16384 - ((16384.499999999996 - diff / 360) | 0)) * 360;
if (diff == 0) { if (diff == 0) {