From e915776665662d0b2b79d5a33cf5b4193ef3cdae Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Fri, 5 Jul 2019 19:21:40 +0200 Subject: [PATCH 1/2] [libgdx] Javadoc. --- .../src/com/esotericsoftware/spine/Animation.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java index ac1698547..283fd5908 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java @@ -1326,7 +1326,7 @@ public class Animation { } } - /** Changes an IK constraint's {@link IkConstraint#getMix()},{@link IkConstraint#getSoftness()}, + /** Changes an IK constraint's {@link IkConstraint#getMix()}, {@link IkConstraint#getSoftness()}, * {@link IkConstraint#getBendDirection()}, {@link IkConstraint#getStretch()}, and {@link IkConstraint#getCompress()}. */ static public class IkConstraintTimeline extends CurveTimeline { static public final int ENTRIES = 6; @@ -1456,7 +1456,8 @@ public class Animation { } } - /** Changes a transform constraint's mixes. */ + /** Changes a transform constraint's {@link TransformConstraint#getRotateMix()}, {@link TransformConstraint#getTranslateMix()}, + * {@link TransformConstraint#getScaleMix()}, and {@link TransformConstraint#getShearMix()}. */ static public class TransformConstraintTimeline extends CurveTimeline { static public final int ENTRIES = 5; static private final int PREV_TIME = -5, PREV_ROTATE = -4, PREV_TRANSLATE = -3, PREV_SCALE = -2, PREV_SHEAR = -1; @@ -1687,7 +1688,8 @@ public class Animation { } } - /** Changes a path constraint's mixes. */ + /** Changes a transform constraint's {@link PathConstraint#getRotateMix()} and + * {@link TransformConstraint#getTranslateMix()}. */ static public class PathConstraintMixTimeline extends CurveTimeline { static public final int ENTRIES = 3; static private final int PREV_TIME = -3, PREV_ROTATE = -2, PREV_TRANSLATE = -1; From 12fc3d2823067ae07cabd40873b1b4381e112587 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sun, 7 Jul 2019 00:16:06 +0200 Subject: [PATCH 2/2] [libgdx] Fixed Skeleton Viewer not allow deselection of animations or skins. --- .../src/com/esotericsoftware/spine/SkeletonViewer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java index 0fbfd3c2f..b12b469a3 100644 --- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java +++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java @@ -497,8 +497,6 @@ public class SkeletonViewer extends ApplicationAdapter { for (int i = 0; i < 6; i++) trackButtons.add(new TextButton(i + "", skin, "toggle")); - animationList.getSelection().setRequired(false); - premultipliedCheckbox.setChecked(true); linearCheckbox.setChecked(true); @@ -517,6 +515,12 @@ public class SkeletonViewer extends ApplicationAdapter { yScaleSlider.setValue(1); yScaleSlider.setSnapToValues(new float[] {-1.5f, -1, -0.5f, 0.5f, 1, 1.5f}, 0.12f); + skinList.getSelection().setRequired(false); + skinList.getSelection().setToggle(true); + + animationList.getSelection().setRequired(false); + animationList.getSelection().setToggle(true); + mixSlider.setValue(0.3f); mixSlider.setSnapToValues(new float[] {1, 1.5f, 2, 2.5f, 3, 3.5f}, 0.12f);