UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-06 18:56:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

[libgdx] Fixed AnimationState not respecting MixBlend.first for rotate timelines.

Browse Source
This commit is contained in:
NathanSweet 2019-02-10 11:45:20 +01:00
parent 7ee15d0627
commit c7d71a8eb1
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -342,30 +342,38 @@ public class AnimationState {
RotateTimeline rotateTimeline = (RotateTimeline)timeline; RotateTimeline rotateTimeline = (RotateTimeline)timeline;
Bone bone = skeleton.bones.get(rotateTimeline.boneIndex); Bone bone = skeleton.bones.get(rotateTimeline.boneIndex);
float[] frames = rotateTimeline.frames; float[] frames = rotateTimeline.frames;
float r1, r2;
if (time < frames[0]) { // Time is before first frame. if (time < frames[0]) { // Time is before first frame.
if (blend == MixBlend.setup) bone.rotation = bone.data.rotation; switch (blend) {
return; case setup:
} bone.rotation = bone.data.rotation;
// Fall through.
default:
return;
case first:
r1 = bone.rotation;
r2 = bone.data.rotation;
}
} else {
r1 = blend == MixBlend.setup ? bone.data.rotation : bone.rotation;
if (time >= frames[frames.length - ENTRIES]) // Time is after last frame.
r2 = bone.data.rotation + frames[frames.length + PREV_ROTATION];
else {
// Interpolate between the previous frame and the current frame.
int frame = Animation.binarySearch(frames, time, ENTRIES);
float prevRotation = frames[frame + PREV_ROTATION];
float frameTime = frames[frame];
float percent = rotateTimeline.getCurvePercent((frame >> 1) - 1,
1 - (time - frameTime) / (frames[frame + PREV_TIME] - frameTime));
float r2; r2 = frames[frame + ROTATION] - prevRotation;
if (time >= frames[frames.length - ENTRIES]) // Time is after last frame. r2 -= (16384 - (int)(16384.499999999996 - r2 / 360)) * 360;
r2 = bone.data.rotation + frames[frames.length + PREV_ROTATION]; r2 = prevRotation + r2 * percent + bone.data.rotation;
else { r2 -= (16384 - (int)(16384.499999999996 - r2 / 360)) * 360;
// Interpolate between the previous frame and the current frame. }
int frame = Animation.binarySearch(frames, time, ENTRIES);
float prevRotation = frames[frame + PREV_ROTATION];
float frameTime = frames[frame];
float percent = rotateTimeline.getCurvePercent((frame >> 1) - 1,
1 - (time - frameTime) / (frames[frame + PREV_TIME] - frameTime));
r2 = frames[frame + ROTATION] - prevRotation;
r2 -= (16384 - (int)(16384.499999999996 - r2 / 360)) * 360;
r2 = prevRotation + r2 * percent + bone.data.rotation;
r2 -= (16384 - (int)(16384.499999999996 - r2 / 360)) * 360;
} }
// Mix between rotations using the direction of the shortest route on the first frame. // Mix between rotations using the direction of the shortest route on the first frame.
float r1 = blend == MixBlend.setup ? bone.data.rotation : bone.rotation;
float total, diff = r2 - r1; float total, diff = r2 - r1;
diff -= (16384 - (int)(16384.499999999996 - diff / 360)) * 360; diff -= (16384 - (int)(16384.499999999996 - diff / 360)) * 360;
if (diff == 0) if (diff == 0)