[as3] Ported dipping problem fix, see #867

spine-as3/spine-as3/src/spine/animation/AnimationState.as

@@ -27,7 +27,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
-
 package spine.animation {
 	import spine.MathUtils;
 	import spine.Bone;
@@ -52,6 +51,7 @@ package spine.animation {
 		internal var queue : EventQueue;
 		internal var propertyIDs : Dictionary = new Dictionary();
 		internal var animationsChanged : Boolean;
+		public var multipleMixing : Boolean = false;
 		public var timeScale : Number = 1;
 		internal var trackEntryPool : Pool;
 
@@ -198,7 +198,9 @@ package spine.animation {
 			var timelineCount : int = from.animation.timelines.length;
 			var timelines : Vector.<Timeline> = from.animation.timelines;
 			var timelinesFirst : Vector.<Boolean> = from.timelinesFirst;
-			var alpha : Number = from.alpha * entry.mixAlpha * (1 - mix);
+			var timelinesLast : Vector.<Boolean> = multipleMixing ? null : from.timelinesLast;
+			var alphaBase : Number = from.alpha * entry.mixAlpha;
+			var alphaMix : Number = alphaBase * (1 - mix);
 
 			var firstFrame : Boolean = from.timelinesRotation.length == 0;
 			if (firstFrame) from.timelinesRotation.length = timelineCount << 1;
@@ -207,6 +209,7 @@ package spine.animation {
 			for (var i : int = 0; i < timelineCount; i++) {
 				var timeline : Timeline = timelines[i];
 				var setupPose : Boolean = timelinesFirst[i];
+				var alpha : Number = timelinesLast != null && setupPose && !timelinesLast[i] ? alphaBase : alphaMix;
 				if (timeline is RotateTimeline)
 					applyRotateTimeline(timeline, skeleton, animationTime, alpha, setupPose, timelinesRotation, i << 1, firstFrame);
 				else {
@@ -360,10 +363,30 @@ package spine.animation {
 				current.mixingFrom = from;
 				current.mixTime = 0;
 
-				from.timelinesRotation.length = 0;
+				var mixingFrom : TrackEntry = from.mixingFrom;
+				if (mixingFrom != null && from.mixDuration > 0) {
+					// A mix was interrupted, mix from the closest animation.
+					if (!multipleMixing && from.mixTime / from.mixDuration < 0.5 && mixingFrom.animation != AnimationState.emptyAnimation) {
+						current.mixingFrom = mixingFrom;
+						mixingFrom.mixingFrom = from;
+						mixingFrom.mixTime = from.mixDuration - from.mixTime;
+						mixingFrom.mixDuration = from.mixDuration;
+						from.mixingFrom = null;
+						from = mixingFrom;
+					}
+	
+					// The interrupted mix will mix out from its current percentage to zero.
+					current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
+	
+					// End the other animation after it is applied one last time.
+					if (!multipleMixing) {
+						from.mixAlpha = 0;
+						from.mixTime = 0;
+						from.mixDuration = 0;
+					}
+				}
 
-				// If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero.
+				from.timelinesRotation.length = 0;
-				if (from.mixingFrom != null && from.mixDuration > 0) current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
 			}
 
 			queue.start(current);
@@ -524,6 +547,36 @@ package spine.animation {
 				entry = tracks[i];
 				if (entry != null) checkTimelinesFirst(entry);
 			}
+			
+			if (multipleMixing) return;
+
+			// Set timelinesLast for mixingFrom entries, from highest track to lowest that has mixingFrom.
+			for (var key2 : String in propertyIDs) {
+				delete propertyIDs[key2];
+			}
+			var lowestMixingFrom : int = n;
+			for (i = 0; i < n; i++) { // Find lowest track with a mixingFrom entry.
+				entry = tracks[i];
+				if (entry == null || entry.mixingFrom == null) continue;
+				lowestMixingFrom = i;
+				break;
+			}
+			for (i = n - 1; i >= lowestMixingFrom; i--) { // Find first non-null entry.
+				entry = tracks[i];
+				if (entry == null) continue;
+	
+				// Store properties for non-mixingFrom entry but don't set timelinesLast, which is only used for mixingFrom entries.
+				var timelines : Vector.<Timeline> = entry.animation.timelines;
+				for (var ii : int = 0, nn : int = entry.animation.timelines.length; ii < nn; ii++)
+					var id : String = timelines[ii].getPropertyId().toString();
+					propertyIDs[id] = id;
+	
+				entry = entry.mixingFrom;
+				while (entry != null) {
+					checkTimelinesUsage(entry, entry.timelinesLast);
+					entry = entry.mixingFrom;
+				}
+			}
 		}
 
 		private function setTimelinesFirst(entry : TrackEntry) : void {

spine-as3/spine-as3/src/spine/animation/TrackEntry.as

@@ -47,6 +47,7 @@ package spine.animation {
 		public var delay : Number, trackTime : Number, trackLast : Number, nextTrackLast : Number, trackEnd : Number, timeScale : Number;
 		public var alpha : Number, mixTime : Number, mixDuration : Number, mixAlpha : Number;
 		public var timelinesFirst : Vector.<Boolean> = new Vector.<Boolean>();
+		public var timelinesLast : Vector.<Boolean> = new Vector.<Boolean>();
 		public var timelinesRotation : Vector.<Number> = new Vector.<Number>();
 
 		public function TrackEntry() {
@@ -72,6 +73,7 @@ package spine.animation {
 			onComplete.listeners.length = 0;
 			onEvent.listeners.length = 0;
 			timelinesFirst.length = 0;
+			timelinesLast.length = 0;
 			timelinesRotation.length = 0;
 		}
 

spine-starling/spine-starling-example/src/spine/examples/Main.as

@@ -45,7 +45,7 @@ package spine.examples {
 			// example = TankExample;
 			// example = VineExample;
 			// example = StretchymanExample;
-			example = TwoColorExample;
+			// example = TwoColorExample;
 
 			_starling = new Starling(example, stage);
 			_starling.enableErrorChecking = true;