remove isTimeLine from ExportObjects

Author: inwoods

Assets/com.unity.formats.fbx.tests/ExportTimelineClipTest.cs

@@ -5,6 +5,7 @@
 using UnityEngine.Timeline;
 using UnityEngine.Playables;
 using UnityEditor.SceneManagement;
+using System.Collections.Generic;
 
 namespace FbxExporters.UnitTests
 {
@@ -22,35 +23,31 @@ public void ExportSingleTimelineClipTest()
         {
             GameObject myCube = GameObject.Find("CubeSpecial");
             string folderPath = GetRandomFileNamePath(extName: "");
+            string filePath = null;
+            var exportData = new Dictionary<GameObject, ModelExporter.IExportData>();
 
             PlayableDirector pd = myCube.GetComponent<PlayableDirector> ();
             if (pd != null) {
                 foreach (PlayableBinding output in pd.playableAsset.outputs) {
                     AnimationTrack at = output.sourceObject as AnimationTrack;
 
                     GameObject atObject = pd.GetGenericBinding (output.sourceObject) as GameObject;
+                    Assert.That (atObject, Is.Not.Null);
+
                     // One file by animation clip
                     foreach (TimelineClip timeLineClip in at.GetClips()) {
-                        var filePath = string.Format ("{0}/{1}@{2}", folderPath, atObject.name, "Recorded.fbx");
-                        ModelExporterReflection.ExportSingleTimelineClip (timeLineClip, atObject, filePath);
-                        FileAssert.Exists (filePath);
+                        Assert.That (timeLineClip.animationClip, Is.Not.Null);
+
+                        filePath = string.Format ("{0}/{1}@{2}", folderPath, atObject.name, "Recorded.fbx");
+                        exportData[atObject] = ModelExporter.GetExportData(atObject, timeLineClip.animationClip);
+                        break;
                     }
                 }
             }
-        }
-
-        [Test]
-        public void ExportAllTimelineClipTest()
-        {
-            GameObject myCube = GameObject.Find("CubeSpecial");
-            Selection.objects = new UnityEngine.GameObject[] { myCube };
-            string folderPath = GetRandomFileNamePath(extName: "");
-
-            foreach(GameObject obj in Selection.objects)
-            {
-                ModelExporterReflection.ExportAllTimelineClips(obj, folderPath);
-                FileAssert.Exists(string.Format("{0}/{1}@{2}", folderPath, obj.name, "Recorded.fbx"));
-            }
+            Assert.That (filePath, Is.Not.Null);
+            Assert.That (exportData, Is.Not.Null);
+            ModelExporter.ExportObjects(filePath, new Object[1]{myCube}, null, exportData);
+            FileAssert.Exists (filePath);
         }
     }
 }

Packages/com.unity.formats.fbx/Editor/Scripts/ExportModelEditorWindow.cs

@@ -396,15 +396,15 @@ public class ExportModelEditorWindow : ExportOptionsEditorWindow
             protected override float MinWindowHeight { get { return 310; } } // determined by trial and error
             protected override bool DisableNameSelection {
                 get {
-                    return IsPlayableDirector;
+                    return false;
                 }
             }
             protected override bool DisableTransferAnim {
                 get {
                     // don't transfer animation if we are exporting more than one hierarchy, the timeline clips from
                     // a playable director, or if only the model is being exported
                     // if we are on the timeline then export length can be more than 1
-                    return ToExport == null || ToExport.Length == 0 || (!IsTimelineAnim && ToExport.Length > 1) || IsPlayableDirector || SettingsObject.ModelAnimIncludeOption == ExportSettings.Include.Model;
+                    return ToExport == null || ToExport.Length == 0 || (!IsTimelineAnim && ToExport.Length > 1) || SettingsObject.ModelAnimIncludeOption == ExportSettings.Include.Model;
                 }
             }
 
@@ -441,14 +441,6 @@ protected bool SingleHierarchyExport {
                 }
             }
 
-            private bool m_isPlayableDirector = false;
-            protected bool IsPlayableDirector { 
-                get { return m_isPlayableDirector; } 
-                set {
-                    m_isPlayableDirector = value;
-                }
-            }
-
             protected override ExportOptionsSettingsSerializeBase SettingsObject
             {
                 get { return ExportSettings.instance.exportModelSettings.info; }
@@ -460,7 +452,6 @@ public static void Init (IEnumerable<UnityEngine.Object> toExport, string filena
             {
                 ExportModelEditorWindow window = CreateWindow<ExportModelEditorWindow> ();
                 window.IsTimelineAnim = isTimelineAnim;
-                window.IsPlayableDirector = isPlayableDirector;
 
                 int numObjects = window.SetGameObjectsToExport (toExport);
                 if (string.IsNullOrEmpty (filename)) {
@@ -543,20 +534,6 @@ protected override bool Export(){
                     return false;
                 }
 
-                if (IsPlayableDirector) {
-                    foreach (var obj in ToExport) {
-                        var go = ModelExporter.GetGameObject (obj);
-                        if (!go) {
-                            continue;
-                        }
-                        ModelExporter.ExportAllTimelineClips (go, folderPath, SettingsObject);
-                    }
-                    // refresh the asset database so that the file appears in the
-                    // asset folder view.
-                    AssetDatabase.Refresh ();
-                    return true;
-                }
-
                 if (ModelExporter.ExportObjects (filePath, ToExport, SettingsObject) != null) {
                     // refresh the asset database so that the file appears in the
                     // asset folder view.