Uni-50158 Streamlining the Fbx Exporters API (#430)

* Streamlined the API
* Created a new set of API tests
* Adjusted docs

Author: lassond

Assets/com.unity.formats.fbx.meta

@@ -62,20 +62,20 @@ public void TestStaticHelpers()
 
                 // Test on an object in the scene
                 Assert.That(ConvertToModel.WillExportFbx(a));
-                var aAsset = ConvertToModelReflection.GetOrCreateFbxAsset(a, fbxFullPath: GetRandomFbxFilePath());
+                var aAsset = ConvertToModel.GetOrCreateFbxAsset(a, fbxFullPath: GetRandomFbxFilePath());
                 Assert.AreNotEqual(a, aAsset);
                 AssertSameHierarchy(a, aAsset, ignoreRootName: true);
                 Assert.AreEqual(PrefabType.ModelPrefab, PrefabUtility.GetPrefabType(aAsset));
 
                 // Test on an fbx asset
                 Assert.That(!ConvertToModel.WillExportFbx(aAsset));
-                var aAssetAsset = ConvertToModelReflection.GetOrCreateFbxAsset(aAsset, fbxFullPath: GetRandomFbxFilePath());
+                var aAssetAsset = ConvertToModel.GetOrCreateFbxAsset(aAsset, fbxFullPath: GetRandomFbxFilePath());
                 Assert.AreEqual(aAsset, aAssetAsset);
 
                 // Test on an fbx instance
                 var aAssetInstance = PrefabUtility.InstantiatePrefab(aAsset) as GameObject;
                 Assert.That(!ConvertToModel.WillExportFbx(aAssetInstance));
-                var aAssetInstanceAsset = ConvertToModelReflection.GetOrCreateFbxAsset(aAssetInstance, fbxFullPath: GetRandomFbxFilePath());
+                var aAssetInstanceAsset = ConvertToModel.GetOrCreateFbxAsset(aAssetInstance, fbxFullPath: GetRandomFbxFilePath());
                 Assert.AreEqual(aAsset, aAssetInstanceAsset);
             }
 
@@ -88,7 +88,7 @@ public void TestStaticHelpers()
                 Assert.AreEqual(a, b);
 
                 // Test on an fbx asset
-                var aFbx = ConvertToModelReflection.GetOrCreateFbxAsset(a, fbxFullPath: GetRandomFbxFilePath());
+                var aFbx = ConvertToModel.GetOrCreateFbxAsset(a, fbxFullPath: GetRandomFbxFilePath());
                 var bFbx = ConvertToModel.GetOrCreateInstance(aFbx);
                 Assert.AreNotEqual(aFbx, bFbx);
                 Assert.AreEqual(aFbx, PrefabUtility.GetCorrespondingObjectFromSource(bFbx));
@@ -103,7 +103,7 @@ public void TestStaticHelpers()
             // Test SetupFbxPrefab
             {
                 var a = CreateHierarchy();
-                var aFbx = ConvertToModelReflection.GetOrCreateFbxAsset(a, fbxFullPath: GetRandomFbxFilePath());
+                var aFbx = ConvertToModel.GetOrCreateFbxAsset(a, fbxFullPath: GetRandomFbxFilePath());
 
                 // We don't have an FbxPrefab; after setup we do; after a second setup we still only have one.
                 Assert.AreEqual(0, a.GetComponents<FbxPrefab>().Length);
@@ -166,7 +166,7 @@ public void TestStaticHelpers()
                 Assert.IsFalse(b.GetComponent<BoxCollider>());
                 Assert.AreEqual(Vector3.zero, b.transform.localPosition);
                 Assert.AreNotEqual (a.GetComponent<MeshFilter>().sharedMesh, b.GetComponent<MeshFilter> ().sharedMesh);
-                ConvertToModelReflection.CopyComponents(b, a);
+                ConvertToModel.CopyComponents(b, a);
                 Assert.IsFalse(b.GetComponent<BoxCollider>());
                 Assert.AreEqual(Vector3.zero, b.transform.localPosition);
                 Assert.AreEqual (a.GetComponent<MeshFilter>().sharedMesh, b.GetComponent<MeshFilter> ().sharedMesh);
@@ -198,7 +198,7 @@ public void TestStaticHelpers()
                 Assert.AreEqual ("BB", b.transform.GetChild (1).name);
                 Assert.AreEqual (Vector3.zero, b1.transform.localPosition);
 
-                ConvertToModelReflection.UpdateFromSourceRecursive (b, a);
+                ConvertToModel.UpdateFromSourceRecursive (b, a);
 
                 // only the mesh + materials should change
                 Assert.AreEqual(b.GetComponent<MeshFilter>().sharedMesh, a.GetComponent<MeshFilter>().sharedMesh);
@@ -391,7 +391,7 @@ public void MapNameToSourceTest()
             quad2.transform.parent = cube2.transform;
             capsule.transform.SetSiblingIndex(1);
 
-            var dictionary = ConvertToModelReflection.MapNameToSourceRecursive(cube, cube2);
+            var dictionary = ConvertToModel.MapNameToSourceRecursive(cube, cube2);
 
             //We expect these to pass because we've given it an identical game object, as it would have after a normal export.
             Assert.AreSame(capsule2, dictionary[capsule.name]);
@@ -407,7 +407,7 @@ public void MapNameToSourceTest()
             capsule3.transform.parent = cube3.transform;
             sphere3.transform.parent = cube3.transform;
 
-            var dictionaryBroken = ConvertToModelReflection.MapNameToSourceRecursive(cube, cube3);
+            var dictionaryBroken = ConvertToModel.MapNameToSourceRecursive(cube, cube3);
 
             //the dictionary size should be equal to the amount of children + the parent
             Assert.True(dictionaryBroken.Count == 4);

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

@@ -13,7 +13,7 @@ namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
     public class DefaultSelectionTest : ExporterTestBase
     {
         protected GameObject m_root;
-        protected ExportModelSettingsSerialize m_centerObjectsSetting;
+        internal ExportModelSettingsSerialize m_centerObjectsSetting;
 
         [SetUp]
         public override void Init ()
@@ -103,7 +103,7 @@ public void TestDefaultSelection ()
 
             // test with centered objects
             m_centerObjectsSetting.SetObjectPosition(ExportSettings.ObjectPosition.LocalCentered);
-            var newCenter = ModelExporterReflection.FindCenter (goExportSet);
+            var newCenter = ModelExporter.FindCenter (goExportSet);
 
             exportedRoot = ExportSelection (exportSet, m_centerObjectsSetting);
             children = new List<GameObject> ();
@@ -142,7 +142,7 @@ public void TestDefaultSelection ()
         /// <param name="center">New center for global transform.</param>
         private FbxAMatrix ConstructTRSMatrix (Transform t, bool local = true, Vector3 center = default(Vector3))
         {
-            var translation = local ? t.localPosition : ModelExporterReflection.GetRecenteredTranslation (t, center);
+            var translation = local ? t.localPosition : ModelExporter.GetRecenteredTranslation (t, center);
             var rotation = local ? t.localEulerAngles : t.eulerAngles;
             var scale = local ? t.localScale : t.lossyScale;
             return new FbxAMatrix (

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

@@ -3,7 +3,9 @@
 using UnityEngine.Timeline;
 using UnityEngine.Playables;
 using UnityEditor.SceneManagement;
+using System;
 using System.Collections.Generic;
+using System.Reflection;
 
 namespace UnityEditor.Formats.Fbx.Exporter.UnitTests
 {
@@ -37,14 +39,22 @@ public void ExportSingleTimelineClipTest()
                         Assert.That (timeLineClip.animationClip, Is.Not.Null);
 
                         filePath = string.Format ("{0}/{1}@{2}", folderPath, atObject.name, "Recorded.fbx");
-                        exportData[atObject] = ModelExporterReflection.GetExportData(atObject, timeLineClip.animationClip);
+                        exportData[atObject] = ModelExporter.GetExportData(atObject, timeLineClip.animationClip);
                         break;
                     }
                 }
             }
             Assert.That (filePath, Is.Not.Null);
             Assert.That (exportData, Is.Not.Null);
-            ModelExporterReflection.ExportObjects(filePath, new Object[1]{myCube}, null, exportData);
+
+            // This version of ExportObjects is private. Use reflection
+            // ModelExporter.ExportObjects(filePath, new Object[1]{myCube}, null, exportData);
+            var internalMethod = typeof(ModelExporter).GetMethod(   "ExportObjects",    
+                                                                    BindingFlags.Static | BindingFlags.NonPublic,
+                                                                    null,
+                                                                    new Type[] { typeof(string), typeof(UnityEngine.Object[]), typeof(IExportOptions), typeof(Dictionary<GameObject, IExportData>) },
+                                                                    null);
+            internalMethod.Invoke(null, new object[] { filePath, new UnityEngine.Object[1]{myCube}, null, exportData });            
             FileAssert.Exists (filePath);
         }
     }