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

When mixing scale, the sign of the last applied scale is used to avoid mixing across zero.

Browse Source 
#621
This commit is contained in:
NathanSweet 2016-08-18 16:51:50 +02:00
parent 127c0fbbf5
commit 5edeeb6035
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
View File

@ -375,21 +375,32 @@ public class Animation {
if (time < frames[0]) return; // Time is before first frame. if (time < frames[0]) return; // Time is before first frame.
Bone bone = skeleton.bones.get(boneIndex); Bone bone = skeleton.bones.get(boneIndex);
float x, y;
if (time >= frames[frames.length - ENTRIES]) { // Time is after last frame. if (time >= frames[frames.length - ENTRIES]) { // Time is after last frame.
bone.scaleX += (bone.data.scaleX * frames[frames.length + PREV_X] - bone.scaleX) * alpha; x = frames[frames.length + PREV_X];
bone.scaleY += (bone.data.scaleY * frames[frames.length + PREV_Y] - bone.scaleY) * alpha; y = frames[frames.length + PREV_Y];
return; } else {
// Interpolate between the previous frame and the current frame.
int frame = binarySearch(frames, time, ENTRIES);
float prevX = frames[frame + PREV_X];
float prevY = frames[frame + PREV_Y];
float frameTime = frames[frame];
float percent = getCurvePercent(frame / ENTRIES - 1,
1 - (time - frameTime) / (frames[frame + PREV_TIME] - frameTime));
x = prevX + (frames[frame + X] - prevX) * percent;
y = prevY + (frames[frame + Y] - prevY) * percent;
}
if (alpha == 1) {
bone.scaleX = x * bone.data.scaleX;
bone.scaleY = y * bone.data.scaleY;
} else {
x *= bone.data.scaleX;
y *= bone.data.scaleY;
float bx = Math.abs(bone.scaleX), by = Math.abs(bone.scaleY);
bone.scaleX = (bx + (Math.abs(x) - bx) * alpha) * Math.signum(x);
bone.scaleY = (by + (Math.abs(y) - by) * alpha) * Math.signum(y);
} }
// Interpolate between the previous frame and the current frame.
int frame = binarySearch(frames, time, ENTRIES);
float prevX = frames[frame + PREV_X];
float prevY = frames[frame + PREV_Y];
float frameTime = frames[frame];
float percent = getCurvePercent(frame / ENTRIES - 1, 1 - (time - frameTime) / (frames[frame + PREV_TIME] - frameTime));
bone.scaleX += (bone.data.scaleX * (prevX + (frames[frame + X] - prevX) * percent) - bone.scaleX) * alpha;
bone.scaleY += (bone.data.scaleY * (prevY + (frames[frame + Y] - prevY) * percent) - bone.scaleY) * alpha;
} }
} }