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

Additive for translate and scale timelines

Browse Source
This commit is contained in:
Nathan Sweet 2017-10-28 15:33:19 +02:00
parent 0414803ee1
commit eb44a67240
1 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,8 +336,7 @@ public class Animation {
return; return;
case first: case first:
float r = bone.data.rotation - bone.rotation; float r = bone.data.rotation - bone.rotation;
r -= (16384 - (int)(16384.499999999996 - r / 360)) * 360; bone.rotation += (r - (16384 - (int)(16384.499999999996 - r / 360)) * 360) * alpha;
bone.rotation += r * alpha;
} }
return; return;
} }
@ -351,7 +350,7 @@ public class Animation {
case first: case first:
case replace: case replace:
r += bone.data.rotation - bone.rotation; r += bone.data.rotation - bone.rotation;
r -= (16384 - (int)(16384.499999999996 - r / 360)) * 360; // Wrap within -180 and 180. r -= (16384 - (int)(16384.499999999996 - r / 360)) * 360;
// Fall through. // Fall through.
case add: case add:
bone.rotation += r * alpha; bone.rotation += r * alpha;
@ -366,20 +365,17 @@ public class Animation {
float percent = getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + PREV_TIME] - frameTime)); float percent = getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + PREV_TIME] - frameTime));
float r = frames[frame + ROTATION] - prevRotation; float r = frames[frame + ROTATION] - prevRotation;
r -= (16384 - (int)(16384.499999999996 - r / 360)) * 360; r = prevRotation + (r - (16384 - (int)(16384.499999999996 - r / 360)) * 360) * percent;
r = prevRotation + r * percent;
switch (blend) { switch (blend) {
case setup: case setup:
r -= (16384 - (int)(16384.499999999996 - r / 360)) * 360; bone.rotation = bone.data.rotation + (r - (16384 - (int)(16384.499999999996 - r / 360)) * 360) * alpha;
bone.rotation = bone.data.rotation + r * alpha;
break; break;
case first: case first:
case replace: case replace:
r += bone.data.rotation - bone.rotation; r += bone.data.rotation - bone.rotation;
// Fall through. // Fall through.
case add: case add:
r -= (16384 - (int)(16384.499999999996 - r / 360)) * 360; bone.rotation += (r - (16384 - (int)(16384.499999999996 - r / 360)) * 360) * alpha;
bone.rotation += r * alpha;
} }
} }
} }
@ -459,12 +455,19 @@ public class Animation {
x += (frames[frame + X] - x) * percent; x += (frames[frame + X] - x) * percent;
y += (frames[frame + Y] - y) * percent; y += (frames[frame + Y] - y) * percent;
} }
if (blend == setup) { switch (blend) {
case setup:
bone.x = bone.data.x + x * alpha; bone.x = bone.data.x + x * alpha;
bone.y = bone.data.y + y * alpha; bone.y = bone.data.y + y * alpha;
} else { break;
case first:
case replace:
bone.x += (bone.data.x + x - bone.x) * alpha; bone.x += (bone.data.x + x - bone.x) * alpha;
bone.y += (bone.data.y + y - bone.y) * alpha; bone.y += (bone.data.y + y - bone.y) * alpha;
break;
case add:
bone.x += x * alpha;
bone.y += y * alpha;
} }
} }
} }
@ -514,27 +517,55 @@ public class Animation {
y = (y + (frames[frame + Y] - y) * percent) * bone.data.scaleY; y = (y + (frames[frame + Y] - y) * percent) * bone.data.scaleY;
} }
if (alpha == 1) { if (alpha == 1) {
bone.scaleX = x; if (blend == add) {
bone.scaleY = y; bone.scaleX += x - bone.data.scaleX;
bone.scaleY += y - bone.data.scaleY;
} else {
bone.scaleX = x;
bone.scaleY = y;
}
} else { } else {
float bx, by;
if (blend == setup) {
bx = bone.data.scaleX;
by = bone.data.scaleY;
} else {
bx = bone.scaleX;
by = bone.scaleY;
}
// Mixing out uses sign of setup or current pose, else use sign of key. // Mixing out uses sign of setup or current pose, else use sign of key.
float bx, by;
if (direction == out) { if (direction == out) {
x = Math.abs(x) * Math.signum(bx); switch (blend) {
y = Math.abs(y) * Math.signum(by); case setup:
bx = bone.data.scaleX;
by = bone.data.scaleY;
bone.scaleX = bx + (Math.abs(x) * Math.signum(bx) - bx) * alpha;
bone.scaleY = by + (Math.abs(y) * Math.signum(by) - by) * alpha;
break;
case add:
bx = bone.scaleX;
by = bone.scaleY;
bone.scaleX = bx + (Math.abs(x) * Math.signum(bx) - bone.data.scaleX) * alpha;
bone.scaleY = by + (Math.abs(y) * Math.signum(by) - bone.data.scaleY) * alpha;
break;
default:
bx = bone.scaleX;
by = bone.scaleY;
bone.scaleX = bx + (Math.abs(x) * Math.signum(bx) - bx) * alpha;
bone.scaleY = by + (Math.abs(y) * Math.signum(by) - by) * alpha;
}
} else { } else {
bx = Math.abs(bx) * Math.signum(x); switch (blend) {
by = Math.abs(by) * Math.signum(y); case setup:
bx = Math.abs(bone.data.scaleX) * Math.signum(x);
by = Math.abs(bone.data.scaleY) * Math.signum(y);
bone.scaleX = bx + (x - bx) * alpha;
bone.scaleY = by + (y - by) * alpha;
break;
case add:
bx = Math.signum(x);
by = Math.signum(y);
bone.scaleX = Math.abs(bone.scaleX) * bx + (x - Math.abs(bone.data.scaleX) * bx) * alpha;
bone.scaleY = Math.abs(bone.scaleY) * by + (y - Math.abs(bone.data.scaleY) * by) * alpha;
break;
default:
bone.scaleX += (x - bone.scaleX * Math.signum(x)) * alpha;
bone.scaleY += (y - bone.scaleY * Math.signum(y)) * alpha;
}
} }
bone.scaleX = bx + (x - bx) * alpha;
bone.scaleY = by + (y - by) * alpha;
} }
} }
} }