Merge pull request #312 from Unity-Technologies/UNI-39347-export-model-global-transform

Uni 39347 export model global transform

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -431,7 +431,7 @@ public static string[] DCCVendorLocations
 
         // Note: default values are set in LoadDefaults().
         public bool mayaCompatibleNames = true;
-        public bool centerObjects = true;
+        public bool centerObjects = false;
         public bool autoUpdaterEnabled = true;
         public bool launchAfterInstallation = true;
         public bool HideSendToUnityMenu = true;

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -2665,7 +2665,7 @@ public enum TransformExportType { Local, Global, Reset };
             ///
             /// This refreshes the asset database.
             /// </summary>
-            public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet, Dictionary<GameObject, AnimationOnlyExportData> animationExportData)
+            public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet, Dictionary<GameObject, AnimationOnlyExportData> animationExportData, TransformExportType exportType = TransformExportType.Global)
             {
                 exportCancelled = false;
 
@@ -2769,10 +2769,8 @@ public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet, Dictionary
                         }
 
                         Vector3 center = Vector3.zero;
-                        var exportType = TransformExportType.Reset;
-                        if(revisedExportSet.Count != 1){
+                        if(exportType == TransformExportType.Global){
                             center = ExportSettings.centerObjects? FindCenter(revisedExportSet) : Vector3.zero;
-                            exportType = TransformExportType.Global;
                         }
 
                         foreach (var unityGo in revisedExportSet) {
@@ -3558,7 +3556,7 @@ private static void OnExport (AnimationExportType exportType = AnimationExportTy
             /// Export a list of (Game) objects to FBX file. 
             /// Use the SaveFile panel to allow user to enter a file name.
             /// <summary>
-            public static string ExportObjects (string filePath, UnityEngine.Object[] objects = null, AnimationExportType exportType = AnimationExportType.all)
+            public static string ExportObjects (string filePath, UnityEngine.Object[] objects = null, AnimationExportType exportType = AnimationExportType.all, TransformExportType transformExportType = TransformExportType.Global)
             {
                 LastFilePath = filePath;
 
@@ -3599,7 +3597,7 @@ public static string ExportObjects (string filePath, UnityEngine.Object[] object
                             break;
                     }
 
-                    if (fbxExporter.ExportAll (objects, animationExportData) > 0) {
+                    if (fbxExporter.ExportAll (objects, animationExportData, transformExportType) > 0) {
                         string message = string.Format ("Successfully exported: {0}", filePath);
                         UnityEngine.Debug.Log (message);
 
@@ -3609,9 +3607,9 @@ public static string ExportObjects (string filePath, UnityEngine.Object[] object
                 return null;
             }
 
-            public static string ExportObject (string filePath, UnityEngine.Object root, AnimationExportType exportType = AnimationExportType.all)
+            public static string ExportObject (string filePath, UnityEngine.Object root, AnimationExportType exportType = AnimationExportType.all, TransformExportType transformExportType = TransformExportType.Reset)
             {
-                return ExportObjects(filePath, new Object[] { root }, exportType);
+                return ExportObjects(filePath, new Object[] { root }, exportType, transformExportType);
             }
 
             private static void EnsureDirectory (string path)

Assets/FbxExporters/Editor/UnitTests/DefaultSelectionTest.cs

@@ -61,29 +61,32 @@ public void TestDefaultSelection ()
             m_root = CreateHierarchy ();
             Assert.IsNotNull (m_root);
 
+            // test without centered objects
+            FbxExporters.EditorTools.ExportSettings.instance.centerObjects = false;
+
             // test Export Root
             // Expected result: everything gets exported
-            // Expected transform: root is zeroed out, all other transforms unchanged
+            // Expected transform: all transforms unchanged
             var exportedRoot = ExportSelection (new Object[]{ m_root });
             CompareHierarchies (m_root, exportedRoot, true, false);
-            CompareGlobalTransform (exportedRoot.transform);
+            CompareGlobalTransform (exportedRoot.transform, m_root.transform);
 
             // test Export Parent1, Child1
             // Expected result: Parent1, Child1, Child2
-            // Expected transform: Parent1 zeroed out, all other transforms unchanged
+            // Expected transform: all transforms unchanged
             var parent1 = m_root.transform.Find ("Parent1");
             var child1 = parent1.Find ("Child1");
             exportedRoot = ExportSelection (new Object[]{ parent1.gameObject, child1.gameObject });
             CompareHierarchies (parent1.gameObject, exportedRoot, true, false);
-            CompareGlobalTransform (exportedRoot.transform);
+            CompareGlobalTransform (exportedRoot.transform, parent1);
 
             // test Export Child2
             // Expected result: Child2
-            // Expected transform: Child2 zeroed out
+            // Expected transform: Child2 unchanged
             var child2 = parent1.Find ("Child2").gameObject;
             exportedRoot = ExportSelection (new Object[]{ child2 });
             CompareHierarchies (child2, exportedRoot, true, false);
-            CompareGlobalTransform (exportedRoot.transform);
+            CompareGlobalTransform (exportedRoot.transform, child2.transform);
 
             // test Export Child2, Parent2
             // Expected result: Parent2, Child3, Child2
@@ -127,7 +130,12 @@ public void TestDefaultSelection ()
         {
             var actualMatrix = ConstructTRSMatrix (actual);
             var expectedMatrix = expected == null ? new FbxAMatrix () : ConstructTRSMatrix (expected, false, center);
-            Assert.AreEqual (expectedMatrix, actualMatrix);
+
+            for (int i = 0; i < 4; i++) {
+                for (int j = 0; j < 4; j++) {
+                    Assert.That (actualMatrix [i] [j], Is.EqualTo (expectedMatrix [i] [j]).Within(0.0001));
+                }
+            }
         }
 
         /// <summary>