Merge branch 'release/v0.3'

nicloay · Feb 14, 2014 · beedb35 · beedb35
2 parents b236f0d + cbed08e
commit beedb35
Show file tree

Hide file tree

Showing 3 changed files with 214 additions and 61 deletions.
diff --git a/Assets/UnitySpineImporter/3DParty/CurveExtension/KeyframeUtil.cs b/Assets/UnitySpineImporter/3DParty/CurveExtension/KeyframeUtil.cs
@@ -4,6 +4,7 @@
 using System;
 
 namespace CurveExtended{
+	[Flags]
 	public enum TangentMode
 	{
 		Editable = 0,
@@ -102,6 +103,14 @@ public static void SetKeyBroken(object keyframe, bool broken)
 				tangentMode &= -2;
 			field.SetValue(keyframe, tangentMode);
 		}
+
+		// UnityEditor.CurveUtility.cs (c) Unity Technologies
+		public static bool isKeyBroken(object keyframe){
+			Type t = typeof( UnityEngine.Keyframe );
+			FieldInfo field = t.GetField( "m_TangentMode", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
+			int tangentMode =  (int)field.GetValue(keyframe);
+			return (tangentMode & 1) != 0;
+		}
 
 	}
 }
diff --git a/Assets/UnitySpineImporter/Scripts/Editor/SpineImporterWizard.cs b/Assets/UnitySpineImporter/Scripts/Editor/SpineImporterWizard.cs
@@ -15,6 +15,7 @@ public class SpineImporterWizard :ScriptableWizard {
 		public int pixelsPerUnit = 100;
 		public bool buildAvatarMask = true;
 		public AnimationImportType animationImportType = AnimationImportType.MECANIM;
+		public bool updateResources = true;
 		[HideInInspector]
 		public string path;
 
@@ -33,7 +34,8 @@ public static bool validateContext(){
 
 		void OnWizardUpdate() {
 			helpString = "Be carefull, don't use small amout of pixels per unit (e.g. 1 or 10) \n" +
-				"if you are going to use result model with unity 2d physics and gravity";
+				"if you are going to use result model with unity 2d physics and gravity\n" +
+				"update resources means - instead of create new animator and new animations update them";
 			if (pixelsPerUnit <=0)
 				errorString = "PixelsPerUnit must be greater than zero";
 			else 
@@ -70,11 +72,10 @@ void OnWizardCreate(){
 					}
 
 					ModelImporterAnimationType modelImporterAnimationType = getModelImporterAnimationType();
-					SpineUtil.addAnimation(rootGO, directory, spineData, boneGOByName, attachmentGOByNameBySlot, pixelsPerUnit, modelImporterAnimationType);
+					SpineUtil.addAnimation(rootGO, directory, spineData, boneGOByName, attachmentGOByNameBySlot,
+					                       pixelsPerUnit, modelImporterAnimationType, updateResources);
 					sk.showDefaulSlots();
-
 					SpineUtil.buildPrefab(rootGO, directory, name);
-
 					GameObject.DestroyImmediate(rootGO);
 
 				} catch (SpineMultiatlasCreationException e){