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

[ts] Disallow additive on track 0, fix scale timeline.

Browse Source
This commit is contained in:
badlogic 2017-10-30 14:23:09 +01:00
parent 70924a9942
commit ee7411f2ec
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-ts/core/src/Animation.ts
View File

@ -428,8 +428,10 @@ module spine {
break;
case MixBlend.first:
case MixBlend.replace:
bone.scaleX += (x - bone.scaleX * MathUtils.signum(x)) * alpha;
bone.scaleY += (y - bone.scaleY * MathUtils.signum(y)) * alpha;
bx = Math.abs(bone.scaleX) * MathUtils.signum(x);
by = Math.abs(bone.scaleY) * MathUtils.signum(y);
bone.scaleX = bx + (x - bx) * alpha;
bone.scaleY = by + (y - by) * alpha;
break;
case MixBlend.add:
bx = MathUtils.signum(x);

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

@ -550,7 +550,7 @@ module spine {
for (var i = 0, n = this.tracks.length; i < n; i++) {
let entry = this.tracks[i];
if (entry != null && entry.mixBlend != MixBlend.add) entry.setTimelineData(null, mixingTo, propertyIDs);
if (entry != null && (i == 0 || entry.mixBlend != MixBlend.add)) entry.setTimelineData(null, mixingTo, propertyIDs);
}
}