connect model/anim include option to implementation

vkovec · vkovec · commit 989cfa8346ae · 2018-03-07T15:45:32.000-05:00
- replace animation enum with bool
diff --git a/Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs b/Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs
@@ -21,7 +21,7 @@ public class ConvertToPrefabEditorWindow : ExportOptionsEditorWindow
             public static void Init (IEnumerable<GameObject> toConvert)
             {
                 ConvertToPrefabEditorWindow window = CreateWindow<ConvertToPrefabEditorWindow> ();
-                window.InitializeWindow (filename: "", singleHierarchyExport: true, exportType: ModelExporter.AnimationExportType.all);
+                window.InitializeWindow (filename: "", singleHierarchyExport: true, isTimelineAnim: false);
                 window.SetGameObjectsToConvert (toConvert);
                 window.Show ();
             }
diff --git a/Assets/FbxExporters/Editor/ExportModelEditorWindow.cs b/Assets/FbxExporters/Editor/ExportModelEditorWindow.cs
@@ -26,7 +26,7 @@ public abstract class ExportOptionsEditorWindow : EditorWindow
             protected virtual GUIContent WindowTitle { get { return new GUIContent (DefaultWindowTitle); } }
 
             protected string m_exportFileName = "";
-            protected ModelExporter.AnimationExportType m_animExportType = ModelExporter.AnimationExportType.all;
+            protected bool m_isTimelineAnim = false;
             protected bool m_singleHierarchyExport = true;
 
             protected UnityEditor.Editor m_innerEditor;
@@ -62,10 +62,10 @@ protected static T CreateWindow<T>() where T : EditorWindow {
                 return (T)EditorWindow.GetWindow <T>(DefaultWindowTitle, focus:true);
             }
 
-            protected virtual void InitializeWindow(string filename = "", bool singleHierarchyExport = true, ModelExporter.AnimationExportType exportType = ModelExporter.AnimationExportType.all){
+            protected virtual void InitializeWindow(string filename = "", bool singleHierarchyExport = true, bool isTimelineAnim = false){
                 this.SetTitle ();
                 this.SetFilename (filename);
-                this.SetAnimationExportType (exportType);
+                this.SetAnimationExportType (isTimelineAnim);
                 this.SetSingleHierarchyExport (singleHierarchyExport);
             }
 
@@ -93,8 +93,8 @@ public void SetFilename(string filename){
                 m_exportFileName = filename.Remove(extIndex);
             }
 
-            public void SetAnimationExportType(ModelExporter.AnimationExportType exportType){
-                m_animExportType = exportType;
+            public void SetAnimationExportType(bool isTimelineAnim){
+                m_isTimelineAnim = isTimelineAnim;
             }
 
             public void SetSingleHierarchyExport(bool singleHierarchy){
@@ -275,14 +275,14 @@ public class ExportModelEditorWindow : ExportOptionsEditorWindow
             protected override float MinWindowHeight { get { return 260; } }
             private UnityEngine.Object[] m_toExport;
 
-            public static void Init (IEnumerable<UnityEngine.Object> toExport, string filename = "", ModelExporter.AnimationExportType exportType = ModelExporter.AnimationExportType.all)
+            public static void Init (IEnumerable<UnityEngine.Object> toExport, string filename = "", bool isTimelineAnim = false)
             {
                 ExportModelEditorWindow window = CreateWindow<ExportModelEditorWindow> ();
                 int numObjects = window.SetGameObjectsToExport (toExport);
                 if (string.IsNullOrEmpty (filename)) {
                     filename = window.GetFilenameFromObjects ();
                 }
-                window.InitializeWindow (filename, singleHierarchyExport: numObjects == 1, exportType: exportType);
+                window.InitializeWindow (filename, singleHierarchyExport: numObjects == 1, isTimelineAnim: isTimelineAnim);
                 window.Show ();
             }
 
@@ -318,7 +318,7 @@ protected override void Export(){
                     return;
                 }
 
-                if (ModelExporter.ExportObjects (filePath, m_toExport, ExportSettings.instance.exportModelSettings, animExportType: m_animExportType) != null) {
+                if (ModelExporter.ExportObjects (filePath, m_toExport, ExportSettings.instance.exportModelSettings, timelineAnim: m_isTimelineAnim) != null) {
                     // refresh the asset database so that the file appears in the
                     // asset folder view.
                     AssetDatabase.Refresh ();
diff --git a/Assets/FbxExporters/Editor/ExportModelSettings.cs b/Assets/FbxExporters/Editor/ExportModelSettings.cs
@@ -114,6 +114,9 @@ public ExportModelSettingsSerialize.ExportFormat GetExportFormat(){
         public ExportModelSettingsSerialize.Include GetModelAnimIncludeOption(){
             return info.include;
         }
+        public void SetModelAnimIncludeOption(ExportModelSettingsSerialize.Include include){
+            info.include = include;
+        }
         public ExportModelSettingsSerialize.LODExportType GetLODExportType(){
             return info.lodLevel;
         }
diff --git a/Assets/FbxExporters/Editor/FbxExporter.cs b/Assets/FbxExporters/Editor/FbxExporter.cs
@@ -2513,7 +2513,7 @@ protected Dictionary<GameObject, AnimationOnlyExportData> GetAnimationExportData
             /// Transform components have already been exported.
             /// This function exports the other components and animation.
             /// </summary>
-            protected bool ExportComponents(FbxScene fbxScene, AnimationExportType animationExportType = AnimationExportType.all)
+            protected bool ExportComponents(FbxScene fbxScene, bool exportAnim = true)
             {
                 var animationNodes = new HashSet<GameObject> ();
 
@@ -2552,7 +2552,7 @@ protected bool ExportComponents(FbxScene fbxScene, AnimationExportType animation
 
                     // check if this object contains animation, keep track of it
                     // if it does
-                    if (animationExportType != AnimationExportType.none && GameObjectHasAnimation (unityGo) ) {
+                    if (exportAnim && GameObjectHasAnimation (unityGo) ) {
                         animationNodes.Add (unityGo);
                     }
                 }
@@ -2719,8 +2719,7 @@ public enum TransformExportType { Local, Global, Reset };
             /// </summary>
             public int ExportAll (
                 IEnumerable<UnityEngine.Object> unityExportSet, 
-                Dictionary<GameObject, AnimationOnlyExportData> animationExportData,
-                AnimationExportType animationExportType = AnimationExportType.all)
+                Dictionary<GameObject, AnimationOnlyExportData> animationExportData)
             {
                 exportCancelled = false;
 
@@ -2861,7 +2860,7 @@ public int ExportAll (
                         }
 
                         if(!animOnly){
-                            if(!ExportComponents(fbxScene,animationExportType)){
+                            if(!ExportComponents(fbxScene, ExportOptions.GetModelAnimIncludeOption() != ExportModelSettingsSerialize.Include.Model)){
                                 Debug.LogWarning ("Export Cancelled");
                                 return 0;
                             }
@@ -3012,11 +3011,11 @@ public static void ExportSingleTimelineClip(TimelineClip timelineClipSelected, G
                 };
 
                 if (!string.IsNullOrEmpty (filePath)) {
-                    ExportObjects (filePath, myArray, animExportType: AnimationExportType.timelineAnimationClip);
+                    ExportObjects (filePath, myArray, timelineAnim: true);
                     return;
                 }
 
-                ExportModelEditorWindow.Init (myArray, string.Format ("{0}@{1}", animationTrackGObject.name, timelineClipSelected.displayName), AnimationExportType.timelineAnimationClip);
+                ExportModelEditorWindow.Init (myArray, string.Format ("{0}@{1}", animationTrackGObject.name, timelineClipSelected.displayName), isTimelineAnim: true);
             }
 
             /// <summary>
@@ -3025,19 +3024,6 @@ public static void ExportSingleTimelineClip(TimelineClip timelineClipSelected, G
             [MenuItem(ClipMenuItemName, false, 31)]
             public static void OnPlayableDirectorGameObjectContextClick(MenuCommand command)
             {
-                // Now that we know we have stuff to export, get the user-desired path.
-                string directory = string.IsNullOrEmpty(LastFilePath)
-                                      ? Application.dataPath
-                                      : System.IO.Path.GetDirectoryName(LastFilePath);
-
-                string title = "Select the folder in which the animation files from the timeline will be exported";
-                string folderPath = EditorUtility.SaveFolderPanel(title, directory, "");
-
-                if (string.IsNullOrEmpty(folderPath))
-                {
-                    return;
-                }
-
                 Object[] selection = null;
 
                 if (command == null || command.context == null)
@@ -3057,28 +3043,32 @@ public static void OnPlayableDirectorGameObjectContextClick(MenuCommand command)
 
                 foreach (GameObject objectWithPlayableDirector in selection)
                 {
-                    ExportAllTimelineClips(objectWithPlayableDirector,folderPath);
+                    if (ExportAllTimelineClips (objectWithPlayableDirector)) {
+                        return;
+                    }
                 }
             }
 
-            public static void ExportAllTimelineClips(GameObject objectWithPlayableDirector, string folderPath)
+            public static bool ExportAllTimelineClips(GameObject objectWithPlayableDirector, string folderPath = null)
             {
                 PlayableDirector pd = objectWithPlayableDirector.GetComponent<PlayableDirector>();
-                if (pd != null)
+                if (pd == null)
                 {
-                    foreach (PlayableBinding output in pd.playableAsset.outputs)
-                    {
-                        AnimationTrack at = output.sourceObject as AnimationTrack;
-
-                        GameObject atObject = pd.GetGenericBinding(output.sourceObject) as GameObject;
-                        // One file by animation clip
-                        foreach (TimelineClip timeLineClip in at.GetClips()) {
-                            string filePath = string.Format(AnimFbxFileFormat, folderPath, atObject.name, timeLineClip.displayName);
-                            UnityEngine.Object[] myArray = new UnityEngine.Object[] { atObject, timeLineClip.animationClip };
-                            //ExportObjects (filePath, myArray, AnimationExportType.timelineAnimationClip);
-                        }
+                    return false;
+                }
+                foreach (PlayableBinding output in pd.playableAsset.outputs)
+                {
+                    AnimationTrack at = output.sourceObject as AnimationTrack;
+
+                    GameObject atObject = pd.GetGenericBinding(output.sourceObject) as GameObject;
+                    // One file by animation clip
+                    foreach (TimelineClip timeLineClip in at.GetClips()) {
+                        string filePath = string.Format(AnimFbxFileFormat, folderPath, atObject.name, timeLineClip.displayName);
+                        UnityEngine.Object[] myArray = new UnityEngine.Object[] { atObject, timeLineClip.animationClip };
+                        ExportObjects (filePath, myArray, timelineAnim: true);
                     }
                 }
+                return true;
             }
             
             /// <summary>
@@ -3128,21 +3118,7 @@ public static bool OnValidateMenuItem ()
             {
                 return true;
             }
-
-            /// <summary>
-            /// Add a menu item "Export Model Only..." to a GameObject's context menu.
-            /// </summary>
-            /// <param name="command">Command.</param>
-            [MenuItem (ModelOnlyMenuItemName, false, 30)]
-            static void ModelOnlyOnContextItem (MenuCommand command)
-            {
-                if (Selection.objects.Length <= 0) {
-                    DisplayNoSelectionDialog ();
-                    return;
-                }
-                OnExport (AnimationExportType.none);
-            }
-
+                
             /// <summary>
             /// Validate the menu item defined by the function above.
             /// </summary>
@@ -3152,22 +3128,6 @@ public static bool ModelOnlyOnValidateMenuItem ()
                 return true;
             }
 
-
-            /// <summary>
-            /// Add a menu item "Export Animation Only" to a GameObject's context menu.
-            /// </summary>
-            /// <param name="command">Command.</param>
-            [MenuItem (AnimOnlyMenuItemName, false, 30)]
-            static void OnAnimOnlyContextItem (MenuCommand command)
-            {
-                if (Selection.objects.Length <= 0) {
-                    DisplayNoSelectionDialog ();
-                    return;
-                }
-
-                OnExport (AnimationExportType.componentAnimation);
-            }
-
             /// <summary>
             // Validate the menu item defined by the function above.
             /// </summary>
@@ -3623,15 +3583,6 @@ public void Dispose ()
 
             const string kFBXFileExtension = "fbx";
 			
-            public enum AnimationExportType{
-                timelineAnimationClip,
-                timelineAnimationTrack,
-                componentAnimation,
-                all,
-                none
-            }
-
-
             private static string MakeFileName (string basename = "test", string extension = kFBXFileExtension)
             {
                 return basename + "." + extension;
@@ -3648,12 +3599,12 @@ private static string GetExportFilePath(string filenameSuggestion = ""){
                 return EditorUtility.SaveFilePanel (title, directory, filenameSuggestion, kFBXFileExtension);
             }
 
-            private static void OnExport (AnimationExportType exportType = AnimationExportType.all)
+            private static void OnExport ()
             {
                 GameObject [] selectedGOs = Selection.GetFiltered<GameObject> (SelectionMode.TopLevel);
 
                 var toExport = ModelExporter.RemoveRedundantObjects(selectedGOs);
-                ExportModelEditorWindow.Init (System.Linq.Enumerable.Cast<UnityEngine.Object> (toExport), exportType: exportType);
+                ExportModelEditorWindow.Init (System.Linq.Enumerable.Cast<UnityEngine.Object> (toExport), isTimelineAnim: false);
             }
 
             /// <summary>
@@ -3664,7 +3615,7 @@ public static string ExportObjects (
                 string filePath,
                 UnityEngine.Object[] objects = null,
                 IExportOptions exportOptions = null,
-                AnimationExportType animExportType = AnimationExportType.all)
+                bool timelineAnim = false)
             {
                 LastFilePath = filePath;
 
@@ -3678,34 +3629,25 @@ public static string ExportObjects (
                     }
 
                     Dictionary<GameObject, AnimationOnlyExportData> animationExportData = null;
-                    switch (animExportType)
-                    {
-                       case AnimationExportType.timelineAnimationClip:
+                    if (exportOptions.GetModelAnimIncludeOption () == ExportModelSettingsSerialize.Include.Anim) {
+                        if (timelineAnim) {
                             // We expect the first argument in the list to be the GameObject, the second one is the Animation Clip/Track we are exporting from the timeline
-                            GameObject rootObject = ModelExporter.GetGameObject(objects[0]);
-                            AnimationClip timelineClip = objects[1] as AnimationClip;
-                            List<AnimationClip> clipList = new List<AnimationClip>();
-                            clipList.Add(timelineClip);
-                            animationExportData = fbxExporter.GetTimelineAnimationExportData(rootObject, clipList);
-                            break;
-                        case AnimationExportType.timelineAnimationTrack:
-                            GameObject rootObject2 = ModelExporter.GetGameObject(objects[0]);
-                            AnimationTrack timelineTrack = objects[1] as AnimationTrack;
-                            animationExportData = fbxExporter.GetAnimationExportDataFromAnimationTrack(rootObject2, timelineTrack);
-                            break;
-                        case AnimationExportType.componentAnimation:
-                            HashSet<GameObject> gos = new HashSet<GameObject>();
-                            foreach(var obj in objects)
-                            {
-                                gos.Add(ModelExporter.GetGameObject(obj));
+                            GameObject rootObject = ModelExporter.GetGameObject (objects [0]);
+                            AnimationClip timelineClip = objects [1] as AnimationClip;
+                            List<AnimationClip> clipList = new List<AnimationClip> ();
+                            clipList.Add (timelineClip);
+                            animationExportData = fbxExporter.GetTimelineAnimationExportData (rootObject, clipList);
+                        }
+                        else{
+                            HashSet<GameObject> gos = new HashSet<GameObject> ();
+                            foreach (var obj in objects) {
+                                gos.Add (ModelExporter.GetGameObject (obj));
                             }
-                            animationExportData = fbxExporter.GetAnimationExportData(gos);
-                            break;
-                        default:
-                            break;
+                            animationExportData = fbxExporter.GetAnimationExportData (gos);
+                        }
                     }
 
-                    if (fbxExporter.ExportAll (objects, animationExportData, animExportType) > 0) {
+                    if (fbxExporter.ExportAll (objects, animationExportData) > 0) {
                         string message = string.Format ("Successfully exported: {0}", filePath);
                         UnityEngine.Debug.Log (message);
 
@@ -3718,9 +3660,9 @@ public static string ExportObjects (
             public static string ExportObject (
                 string filePath, UnityEngine.Object root,
                 IExportOptions exportOptions = null,
-                AnimationExportType exportType = AnimationExportType.all)
+                bool isTimelineAnim = false)
             {
-                return ExportObjects(filePath, new Object[] { root }, exportOptions, animExportType: exportType);
+                return ExportObjects(filePath, new Object[] { root }, exportOptions, isTimelineAnim);
             }
 
             private static void EnsureDirectory (string path)
diff --git a/Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs b/Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs
@@ -270,9 +270,11 @@ protected string ExportToFbx (
             string filename = GetRandomFbxFilePath ();
             var exportOptions = ScriptableObject.CreateInstance <EditorTools.ExportModelSettings> () as EditorTools.ExportModelSettings;
             exportOptions.SetLODExportType (lodExportType);
+            if (animOnly) {
+                exportOptions.SetModelAnimIncludeOption (FbxExporters.EditorTools.ExportModelSettingsSerialize.Include.Anim);
+            }
             var exportedFilePath = FbxExporters.Editor.ModelExporter.ExportObject (
-                filename, hierarchy, exportOptions,
-                animOnly? FbxExporters.Editor.ModelExporter.AnimationExportType.componentAnimation : FbxExporters.Editor.ModelExporter.AnimationExportType.all
+                filename, hierarchy, exportOptions
             );
             Assert.That (exportedFilePath, Is.EqualTo (filename));
             return filename;
diff --git a/Assets/FbxExporters/Editor/UnitTests/FbxAnimationTest.cs b/Assets/FbxExporters/Editor/UnitTests/FbxAnimationTest.cs

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class ConvertToPrefabEditorWindow : ExportOptionsEditorWindow`
`21`	`21`	`public static void Init (IEnumerable<GameObject> toConvert)`
`22`	`22`	`{`
`23`	`23`	`ConvertToPrefabEditorWindow window = CreateWindow<ConvertToPrefabEditorWindow> ();`
`24`		`- window.InitializeWindow (filename: "", singleHierarchyExport: true, exportType: ModelExporter.AnimationExportType.all);`
	`24`	`+ window.InitializeWindow (filename: "", singleHierarchyExport: true, isTimelineAnim: false);`
`25`	`25`	`window.SetGameObjectsToConvert (toConvert);`
`26`	`26`	`window.Show ();`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,9 @@ public ExportModelSettingsSerialize.ExportFormat GetExportFormat(){`
`114`	`114`	`public ExportModelSettingsSerialize.Include GetModelAnimIncludeOption(){`
`115`	`115`	`return info.include;`
`116`	`116`	`}`
	`117`	`+ public void SetModelAnimIncludeOption(ExportModelSettingsSerialize.Include include){`
	`118`	`+ info.include = include;`
	`119`	`+ }`
`117`	`120`	`public ExportModelSettingsSerialize.LODExportType GetLODExportType(){`
`118`	`121`	`return info.lodLevel;`
`119`	`122`	`}`