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

Shear timeline additive, clean up.

Browse Source
This commit is contained in:
Nathan Sweet 2017-10-28 18:11:56 +02:00
parent ecedff1ffa
commit 5a4da17e7d
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,17 +535,18 @@ public class Animation {
bone.scaleX = bx + (Math.abs(x) * Math.signum(bx) - bx) * alpha; bone.scaleX = bx + (Math.abs(x) * Math.signum(bx) - bx) * alpha;
bone.scaleY = by + (Math.abs(y) * Math.signum(by) - by) * alpha; bone.scaleY = by + (Math.abs(y) * Math.signum(by) - by) * alpha;
break; break;
case first:
case replace:
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;
break;
case add: case add:
bx = bone.scaleX; bx = bone.scaleX;
by = bone.scaleY; by = bone.scaleY;
bone.scaleX = bx + (Math.abs(x) * Math.signum(bx) - bone.data.scaleX) * alpha; 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; 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 {
switch (blend) { switch (blend) {
@ -555,15 +556,16 @@ public class Animation {
bone.scaleX = bx + (x - bx) * alpha; bone.scaleX = bx + (x - bx) * alpha;
bone.scaleY = by + (y - by) * alpha; bone.scaleY = by + (y - by) * alpha;
break; break;
case first:
case replace:
bone.scaleX += (x - bone.scaleX * Math.signum(x)) * alpha;
bone.scaleY += (y - bone.scaleY * Math.signum(y)) * alpha;
break;
case add: case add:
bx = Math.signum(x); bx = Math.signum(x);
by = Math.signum(y); by = Math.signum(y);
bone.scaleX = Math.abs(bone.scaleX) * bx + (x - Math.abs(bone.data.scaleX) * bx) * alpha; 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; 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;
} }
} }
} }
@ -614,12 +616,19 @@ public class Animation {
x = x + (frames[frame + X] - x) * percent; x = x + (frames[frame + X] - x) * percent;
y = y + (frames[frame + Y] - y) * percent; y = y + (frames[frame + Y] - y) * percent;
} }
if (blend == setup) { switch (blend) {
case setup:
bone.shearX = bone.data.shearX + x * alpha; bone.shearX = bone.data.shearX + x * alpha;
bone.shearY = bone.data.shearY + y * alpha; bone.shearY = bone.data.shearY + y * alpha;
} else { break;
case first:
case replace:
bone.shearX += (bone.data.shearX + x - bone.shearX) * alpha; bone.shearX += (bone.data.shearX + x - bone.shearX) * alpha;
bone.shearY += (bone.data.shearY + y - bone.shearY) * alpha; bone.shearY += (bone.data.shearY + y - bone.shearY) * alpha;
break;
case add:
bone.shearX += x * alpha;
bone.shearY += y * alpha;
} }
} }
} }