Browse Source

Merge branch '3.8-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.8-beta

badlogic 6 years ago
parent
commit
abc33713d8

+ 5 - 3
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;

+ 6 - 2
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);