Merge branch 'master' of https://github.com/abraksil/unity-spine-impo…

…rter into feature/draw_order
nicloay · Aug 22, 2014 · bd4ae7d · bd4ae7d
2 parents daaa4f7 + d05aea9
commit bd4ae7d
Showing 1 changed file with 36 additions and 27 deletions.
diff --git a/Assets/UnitySpineImporter/Scripts/Editor/Util/SpineUtil.cs b/Assets/UnitySpineImporter/Scripts/Editor/Util/SpineUtil.cs
@@ -547,42 +547,51 @@ public static void addDrawOrderAnimation( AnimationClip								clip,
 			}
 
 			foreach ( SpineDrawOrderAnimation orderAnim in orderAnimation ) {
-				string[] NewSlotOrder = new string[ BaseSlotOrder.Length ];
-				string[] BaseOrder_Copy = BaseSlotOrder.Clone( ) as string[];
-				for ( int i = 0; i != orderAnim.offsets.Length; i++ ) {
-					SpineDrawOrderAnimationSlot slot = orderAnim.offsets[ i ];
-					int newIdx = spineData.slotOrder[ slot.slot ] + slot.offset;
-					NewSlotOrder[ newIdx ] = slot.slot;
-					int base_idx = Array.IndexOf( BaseOrder_Copy, slot.slot );
-					BaseOrder_Copy[ base_idx ] = null;
-				}
+				string[] NewSlotOrder = null;
+				if ( orderAnim.offsets != null ) {
+					NewSlotOrder = new string[ BaseSlotOrder.Length ];
+					string[] BaseOrder_Copy = BaseSlotOrder.Clone( ) as string[];
+
+					for ( int i = 0; i != orderAnim.offsets.Length; i++ ) {
+						SpineDrawOrderAnimationSlot slot = orderAnim.offsets[ i ];
+						int newIdx = spineData.slotOrder[ slot.slot ] + slot.offset;
+						NewSlotOrder[ newIdx ] = slot.slot;
+						int base_idx = Array.IndexOf( BaseOrder_Copy, slot.slot );
+						BaseOrder_Copy[ base_idx ] = null;
+					}
 
-				int pos = 0;
-				for ( int i = 0; i != NewSlotOrder.Length; i++ ) {
-					if ( NewSlotOrder[ i ] == null ) {
-						bool found = false;
-						for ( ; pos != BaseOrder_Copy.Length; ) {
-							if ( BaseOrder_Copy[ pos ] != null ) {
-								found = true;
-								NewSlotOrder[ i ] = BaseOrder_Copy[ pos ];
-								pos++;
-								break;
-							} else pos++;
-						}
+					int pos = 0;
+					for ( int i = 0; i != NewSlotOrder.Length; i++ ) {
+						if ( NewSlotOrder[ i ] == null ) {
+							bool found = false;
+							for ( ; pos != BaseOrder_Copy.Length; ) {
+								if ( BaseOrder_Copy[ pos ] != null ) {
+									found = true;
+									NewSlotOrder[ i ] = BaseOrder_Copy[ pos ];
+									pos++;
+									break;
+								} else pos++;
+							}
 
-						if ( !found ) Debug.LogError( "Can't create new draw order" );
+							if ( !found ) Debug.LogError( "Can't create new draw order" );
+						}
 					}
-				}
+				} else NewSlotOrder = BaseSlotOrder;
 
 				for ( int j = 0; j != NewSlotOrder.Length; j++ ) {
 					float t = ( float )orderAnim.time;
 					float val = ( - j ) * zStep;
 					AnimationCurve curv = Curvs[ NewSlotOrder[ j ] ];
 					float priv_val = curv.Evaluate( t );
-					Keyframe keyFrameY_help = new Keyframe( t, priv_val );
-					Keyframe keyFrameY = new Keyframe( t + 0.00001f, val );
-					curv.AddKey( keyFrameY_help );
-					curv.AddKey( keyFrameY );
+					if ( t > 0.0f ) {
+						Keyframe keyFrameY_help = new Keyframe( t - 0.00001f, priv_val );
+						Keyframe keyFrameY = new Keyframe( t, val );
+						curv.AddKey( keyFrameY_help );
+						curv.AddKey( keyFrameY );
+					} else {
+						Keyframe keyFrameY = new Keyframe( t, val );
+						curv.AddKey( keyFrameY );
+					}
 				}
 			}