Merge branch 'master' into UNI-40444-export-model-options-UI

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -39,6 +39,12 @@ public override void OnInspectorGUI() {
                 exportSettings.autoUpdaterEnabled
             );
 
+            exportSettings.exportMeshNoRenderer = EditorGUILayout.Toggle(
+                new GUIContent("Export Unrendered:",
+                    "If checked, meshes will be exported even if they don't have a Renderer component."),
+                exportSettings.exportMeshNoRenderer
+            );
+
             GUILayout.BeginHorizontal();
             EditorGUILayout.LabelField(new GUIContent(
                 "Export Path:",
@@ -411,6 +417,7 @@ public static string[] DCCVendorLocations
         public bool launchAfterInstallation = true;
         public bool HideSendToUnityMenu = true;
         public bool BakeAnimation = true;
+        public bool exportMeshNoRenderer = false;
 
         public string IntegrationSavePath;
 

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -0,0 +1,60 @@
+using UnityEngine;
+using UnityEditor;
+using NUnit.Framework;
+using FbxExporters.Editor;
+using UnityEngine.Timeline;
+using UnityEngine.Playables;
+using UnityEditor.SceneManagement;
+
+namespace FbxExporters.UnitTests
+{
+    public class ExportTimelineClipTest : ExporterTestBase
+    {
+        private static string m_testScenePath = "Scene/TestScene.unity";
+
+        [SetUp]
+        public override void Init()
+        {
+            base.Init ();
+            string testScenePath = FindPathInUnitTests (m_testScenePath);
+            Assert.That (testScenePath, Is.Not.Null);
+            EditorSceneManager.OpenScene("Assets/" + testScenePath);
+        }
+
+        [Test]
+        public void ExportSingleTimelineClipTest()
+        {
+            GameObject myCube = GameObject.Find("CubeSpecial");
+            string folderPath = GetRandomFileNamePath(extName: "");
+
+            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;
+                    // One file by animation clip
+                    foreach (TimelineClip timeLineClip in at.GetClips()) {
+                        var filePath = string.Format ("{0}/{1}@{2}", folderPath, atObject.name, "Recorded.fbx");
+                        ModelExporter.ExportSingleTimelineClip (timeLineClip, atObject, filePath);
+                        FileAssert.Exists (filePath);
+                    }
+                }
+            }
+        }
+
+        [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)
+            {
+                ModelExporter.ExportAllTimelineClips(obj, folderPath);
+                FileAssert.Exists(string.Format("{0}/{1}@{2}", folderPath, obj.name, "Recorded.fbx"));
+            }
+        }
+    }
+}

Assets/FbxExporters/Editor/UnitTests/ExportTimelineClipTest.cs

@@ -194,6 +194,9 @@ void DeleteOnNextUpdate()
         [TearDown]
         public virtual void Term ()
         {
+            // Put back the initial setting for the auto-updater toggle
+            FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;
+
             if (string.IsNullOrEmpty(_testDirectory)) {
                 return;
             }
@@ -213,7 +216,6 @@ public virtual void Init()
             FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = true;
         }
 
-
         /// <summary>
         /// Exports the Objects in selected.
         /// </summary>

Assets/FbxExporters/Editor/UnitTests/ExportTimelineClipTest.cs.meta

@@ -834,7 +834,9 @@ public void AnimOnlyExportTest(string prefabPath)
 
             // export fbx
             // get GameObject
-            string filename = ExportToFbx(originalGO, true);
+            string filename = GetRandomFbxFilePath ();
+            var exportedFilePath = ModelExporter.ExportObject (filename, originalGO, ModelExporter.AnimationExportType.componentAnimation);
+            Assert.That (exportedFilePath, Is.EqualTo (filename));
 
             GameObject fbxObj = AssetDatabase.LoadMainAssetAtPath (filename) as GameObject;
             Assert.IsTrue (fbxObj);

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

@@ -159,13 +159,11 @@ public void TestNameMapping()
             // In FbxPrefab Component of Cube, add SphereFBX/Sphere name mapping
             FbxPrefab fbxPrefabScript = cubePrefabInstance.transform.GetComponent<FbxPrefab>();
 
-
             FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
             stringpair.FBXObjectName = "SphereFBX";
             stringpair.UnityObjectName = "Sphere";
             fbxPrefabScript.NameMapping.Add(stringpair);
 
-
             FbxPrefabAutoUpdater.FbxPrefabUtility fbxPrefabUtility = new FbxPrefabAutoUpdater.FbxPrefabUtility(fbxPrefabScript);
 
             Assert.IsTrue(fbxPrefabUtility.GetUnityObjectName("SphereFBX") == stringpair.UnityObjectName);
@@ -329,7 +327,7 @@ public void RemappingTest()
 
 
         [TearDown]
-        public void stopTest()
+        public void StopTest()
         {
             // Put back the initial setting for the auto-updater toggle
             FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled = isAutoUpdaterOn;

Assets/FbxExporters/Editor/UnitTests/FbxAnimationTest.cs

@@ -468,6 +468,7 @@ public void TestComponentAttributeExport()
 
             var gameObject = new GameObject ();
             var meshFilter = gameObject.AddComponent<MeshFilter> ();
+            gameObject.AddComponent<MeshRenderer> ();
 
             meshFilter.sharedMesh = mesh;