MixMode list added to SkeletonAnimator

spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs

@@ -34,22 +34,22 @@ using Spine;
 
 [CustomEditor(typeof(SkeletonAnimator))]
 public class SkeletonAnimatorInspector : SkeletonRendererInspector {
-	protected SerializedProperty animationName, loop, timeScale;
-	protected bool isPrefab;
+	protected SerializedProperty layerMixModes;
 
 	protected override void OnEnable () {
 		base.OnEnable();
-		animationName = serializedObject.FindProperty("_animationName");
-		loop = serializedObject.FindProperty("loop");
-		timeScale = serializedObject.FindProperty("timeScale");
-
-		if (PrefabUtility.GetPrefabType(this.target) == PrefabType.Prefab)
-			isPrefab = true;
+		layerMixModes = serializedObject.FindProperty("layerMixModes");
+		
 
 
 	}
 
 	protected override void gui () {
 		base.gui();
+
+
+		EditorGUILayout.PropertyField(layerMixModes, true);
+
+		serializedObject.ApplyModifiedProperties();
 	}
 }

spine-unity/Assets/spine-unity/SkeletonAnimator.cs

@@ -6,6 +6,9 @@ using Spine;
 [RequireComponent(typeof(Animator))]
 public class SkeletonAnimator : SkeletonRenderer, ISkeletonAnimation {
 
+	public enum MixMode { AlwaysMix, MixNext, SpineStyle }
+	public MixMode[] layerMixModes = new MixMode[0];
+
 	public event UpdateBonesDelegate UpdateLocal {
 		add { _UpdateLocal += value; }
 		remove { _UpdateLocal -= value; }
@@ -42,12 +45,18 @@ public class SkeletonAnimator : SkeletonRenderer, ISkeletonAnimation {
 		}
 
 		animator = GetComponent<Animator>();
+
+
 	}
 
 	void Update () {
-		if (skeleton == null)
+		if (!valid)
 			return;
 
+		if (layerMixModes.Length != animator.layerCount) {
+			System.Array.Resize<MixMode>(ref layerMixModes, animator.layerCount);
+		}
+
 		skeleton.Update(Time.deltaTime);
 
 		//apply
@@ -64,22 +73,79 @@ public class SkeletonAnimator : SkeletonRenderer, ISkeletonAnimation {
 			var nextStateInfo = animator.GetNextAnimatorStateInfo(i);
 			var nextClipInfo = animator.GetNextAnimationClipState(i);
 
-			foreach (var info in clipInfo) {
-				float weight = info.weight * layerWeight;
-				if (weight == 0)
-					continue;
-
-				float time = stateInfo.normalizedTime * info.clip.length;
-				animationTable[info.clip.name].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, null, weight);
-			}
-
-			foreach (var info in nextClipInfo) {
-				float weight = info.weight * layerWeight;
-				if (weight == 0)
-					continue;
-
-				float time = nextStateInfo.normalizedTime * info.clip.length;
-				animationTable[info.clip.name].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, null, weight);
+			MixMode mode = layerMixModes[i];
+
+			if (mode == MixMode.AlwaysMix) {
+				//always use Mix instead of Applying the first non-zero weighted clip
+				foreach (var info in clipInfo) {
+					float weight = info.weight * layerWeight;
+					if (weight == 0)
+						continue;
+
+					float time = stateInfo.normalizedTime * info.clip.length;
+					animationTable[info.clip.name].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, null, weight);
+				}
+
+				foreach (var info in nextClipInfo) {
+					float weight = info.weight * layerWeight;
+					if (weight == 0)
+						continue;
+
+					float time = nextStateInfo.normalizedTime * info.clip.length;
+					animationTable[info.clip.name].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, null, weight);
+				}
+			} else if (mode >= MixMode.MixNext) {
+				//apply first non-zero weighted clip
+				int c = 0;
+
+				for (; c < clipInfo.Length; c++) {
+					var info = clipInfo[c];
+					float weight = info.weight * layerWeight;
+					if (weight == 0)
+						continue;
+
+					float time = stateInfo.normalizedTime * info.clip.length;
+					animationTable[info.clip.name].Apply(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, null);
+					break;
+				}
+
+				//mix the rest
+				for (; c < clipInfo.Length; c++) {
+					var info = clipInfo[c];
+					float weight = info.weight * layerWeight;
+					if (weight == 0)
+						continue;
+
+					float time = stateInfo.normalizedTime * info.clip.length;
+					animationTable[info.clip.name].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, stateInfo.loop, null, weight);
+				}
+
+				c = 0;
+
+				//apply next clip directly instead of mixing (ie:  no crossfade, ignores mecanim transition weights)
+				if (mode == MixMode.SpineStyle) {
+					for (; c < nextClipInfo.Length; c++) {
+						var info = nextClipInfo[c];
+						float weight = info.weight * layerWeight;
+						if (weight == 0)
+							continue;
+
+						float time = nextStateInfo.normalizedTime * info.clip.length;
+						animationTable[info.clip.name].Apply(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, null);
+						break;
+					}
+				}
+
+				//mix the rest
+				for (; c < nextClipInfo.Length; c++) {
+					var info = nextClipInfo[c];
+					float weight = info.weight * layerWeight;
+					if (weight == 0)
+						continue;
+
+					float time = nextStateInfo.normalizedTime * info.clip.length;
+					animationTable[info.clip.name].Mix(skeleton, Mathf.Max(0, time - deltaTime), time, nextStateInfo.loop, null, weight);
+				}
 			}
 		}