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

Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2017-10-30 14:20:45 +01:00
commit 70924a9942
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,8 +562,10 @@ public class Animation {
break;
case first:
case replace:
bone.scaleX += (x - bone.scaleX * Math.signum(x)) * alpha;
bone.scaleY += (y - bone.scaleY * Math.signum(y)) * alpha;
bx = Math.abs(bone.scaleX) * Math.signum(x);
by = Math.abs(bone.scaleY) * Math.signum(y);
bone.scaleX = bx + (x - bx) * alpha;
bone.scaleY = by + (y - by) * alpha;
break;
case add:
bx = Math.signum(x);

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

@ -658,7 +658,7 @@ public class AnimationState {
for (int i = 0, n = tracks.size; i < n; i++) {
TrackEntry entry = tracks.get(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);
}
}

2
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
View File

@ -496,6 +496,8 @@ public class SkeletonViewer extends ApplicationAdapter {
alphaSlider.setValue(1);
alphaSlider.setDisabled(true);
addCheckbox.setDisabled(true);
window.setMovable(false);
window.setResizable(false);