Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-20467-zero-out-root-transform

# Conflicts:
#	Assets/FbxExporters/Editor/FbxExporter.cs

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -57,22 +57,16 @@ private static List<GameObject> OnConvertInPlace ()
 
                 GameObject [] unityActiveGOs = Selection.GetFiltered<GameObject> (SelectionMode.Editable | SelectionMode.TopLevel);
 
-                var exportSet = ModelExporter.RemoveDuplicateObjects (unityActiveGOs);
+                var exportSet = ModelExporter.RemoveRedundantObjects (unityActiveGOs);
                 GameObject[] gosToExport = new GameObject[exportSet.Count];
                 exportSet.CopyTo (gosToExport);
 
                 // find common ancestor root & filePath;
                 string[] filePaths = new string[gosToExport.Length];
                 string dirPath = Path.Combine (Application.dataPath, "Objects");
 
-                Transform[] unityCommonAncestors = new Transform[gosToExport.Length];
-                int[] siblingIndices = new int[gosToExport.Length];
-
                 for(int n = 0; n < gosToExport.Length; n++){
-                    GameObject goObj = gosToExport[n];
-                    unityCommonAncestors[n] = goObj.transform.parent;
-                    siblingIndices [n] = goObj.transform.GetSiblingIndex ();
-                    filePaths[n] = Path.Combine (dirPath, goObj.name + ".fbx");
+                    filePaths[n] = Path.Combine (dirPath, gosToExport[n].name + ".fbx");
                 }
 
                 string[] fbxFileNames = new string[filePaths.Length];
@@ -86,6 +80,10 @@ private static List<GameObject> OnConvertInPlace ()
                 for(int i = 0; i < fbxFileNames.Length; i++)
                 {
                     var fbxFileName = fbxFileNames [i];
+                    if (fbxFileName == null) {
+                        Debug.Log (string.Format ("Warning: Export failed for GameObject {0}", gosToExport [i].name));
+                        continue;
+                    }
 
                     // make filepath relative to project folder
                     if (fbxFileName.StartsWith (Application.dataPath, System.StringComparison.CurrentCulture)) 
@@ -105,18 +103,24 @@ private static List<GameObject> OnConvertInPlace ()
                         if (unityObj != null) 
                         {
                             GameObject unityGO = unityObj as GameObject;
+                            Transform unityGOTransform = unityGO.transform;
+                            Transform origGOTransform = gosToExport [i].transform;
 
-                            // configure name
-                            const string cloneSuffix = "(Clone)";
-
-                            if (unityGO.name.EndsWith (cloneSuffix, System.StringComparison.CurrentCulture)) {
-                                unityGO.name = unityGO.name.Remove (cloneSuffix.Length - 1);
-                            }
+                            // Set the name to be the name of the instantiated asset.
+                            // This will get rid of the "(Clone)" if it's added
+                            unityGO.name = unityMainAsset.name;
 
                             // configure transform and maintain local pose
-                            unityGO.transform.SetParent (unityCommonAncestors[i], false);
+                            unityGOTransform.SetParent (origGOTransform.parent, false);
 
-                            unityGO.transform.SetSiblingIndex (siblingIndices[i]);
+                            unityGOTransform.SetSiblingIndex (origGOTransform.GetSiblingIndex());
+
+                            // copy the components over, assuming that the hierarchy order is unchanged
+                            if (origGOTransform.hierarchyCount != unityGOTransform.hierarchyCount) {
+                                Debug.LogWarning (string.Format ("Warning: Exported {0} objects, but only imported {1}",
+                                    origGOTransform.hierarchyCount, unityGOTransform.hierarchyCount));
+                            }
+                            CopyComponentsRecursive (gosToExport[i], unityGO);
 
                             result.Add (unityObj as GameObject);
 
@@ -139,6 +143,36 @@ private static List<GameObject> OnConvertInPlace ()
 
                 return result;
             }
+
+            private static void CopyComponentsRecursive(GameObject from, GameObject to){
+                if (!to.name.StartsWith(from.name) || from.transform.childCount != to.transform.childCount) {
+                    Debug.LogError (string.Format("Error: hierarchies don't match (From: {0}, To: {1})", from.name, to.name));
+                    return;
+                }
+
+                CopyComponents (from, to);
+                for (int i = 0; i < from.transform.childCount; i++) {
+                    CopyComponentsRecursive(from.transform.GetChild(i).gameObject, to.transform.GetChild(i).gameObject);
+                }
+            }
+
+            private static void CopyComponents(GameObject from, GameObject to){
+                var components = from.GetComponents<Component> ();
+                for(int i = 0; i < components.Length; i++){
+                    // if to already has this component, then skip it
+                    if(components[i] == null || to.GetComponent(components[i].GetType()) != null){
+                        continue;
+                    }
+                    bool success = UnityEditorInternal.ComponentUtility.CopyComponent (components[i]);
+                    if (success) {
+                        success = UnityEditorInternal.ComponentUtility.PasteComponentAsNew (to);
+                    }
+                    if (!success) {
+                        Debug.LogWarning (string.Format ("Warning: Failed to copy component {0} from {1} to {2}",
+                            components[i].GetType().Name, from.name, to.name));
+                    }
+                }
+            }
         }
     }
 }

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -503,13 +503,19 @@ protected int ExportComponents (
             /// A count of how many GameObjects we are exporting, to have a rough
             /// idea of how long creating the scene will take.
             /// </summary>
-            /// <returns>The object count.</returns>
+            /// <returns>The hierarchy count.</returns>
             /// <param name="exportSet">Export set.</param>
-            public int GetGameObjectCount (HashSet<GameObject> exportSet)
+            public int GetHierarchyCount (HashSet<GameObject> exportSet)
             {
                 int count = 0;
-                foreach (var obj in exportSet) {
-                    count += obj.transform.hierarchyCount;
+                Queue<GameObject> queue = new Queue<GameObject> (exportSet);
+                while (queue.Count > 0) {
+                    var obj = queue.Dequeue ();
+                    var objTransform = obj.transform;
+                    foreach (Transform child in objTransform) {
+                        queue.Enqueue (child.gameObject);
+                    }
+                    count++;
                 }
                 return count;
             }
@@ -521,7 +527,7 @@ public int GetGameObjectCount (HashSet<GameObject> exportSet)
             /// </summary>
             /// <returns>The revised export set</returns>
             /// <param name="unityExportSet">Unity export set.</param>
-            public static HashSet<GameObject> RemoveDuplicateObjects(IEnumerable<UnityEngine.Object> unityExportSet)
+            public static HashSet<GameObject> RemoveRedundantObjects(IEnumerable<UnityEngine.Object> unityExportSet)
             {
                 // basically just remove the descendents from the unity export set
                 HashSet<GameObject> toExport = new HashSet<GameObject> ();
@@ -616,8 +622,8 @@ public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet)
                         // export set of object
                         FbxNode fbxRootNode = fbxScene.GetRootNode ();
                         int i = 0;
-                        var revisedExportSet = RemoveDuplicateObjects(unityExportSet);
-                        int count = GetGameObjectCount (revisedExportSet);
+                        var revisedExportSet = RemoveRedundantObjects(unityExportSet);
+                        int count = GetHierarchyCount (revisedExportSet);
 
                         if(revisedExportSet.Count == 1){
                             foreach(var unityGo in revisedExportSet){

Assets/FbxExporters/LICENSE.md renamed to Assets/FbxExporters/LICENSE.txt

@@ -19,7 +19,22 @@ Packaging
 export PROJECT_PATH=~/Development/FbxExporters
 export UNITY3D_PATH=/Applications/Unity\ 5.6.1f1/Unity.app/Contents/MacOS/Unity
 export PACKAGE_NAME=FbxExporters
-export PACKAGE_VERSION=0.0.3a
+export PACKAGE_VERSION=0.0.4a
+export FBXSDK_PACKAGE_PATH=~/Development/FbxSharp/FbxSdk_0.0.4a.unitypackage
 
-"${UNITY3D_PATH}" -batchmode -projectPath "${PROJECT_PATH}" -exportPackage Assets/FbxExporters ${PROJECT_PATH}/${PACKAGE_NAME}_${PACKAGE_VERSION}.unitypackage -quit
+"${UNITY3D_PATH}" -projectPath "${PROJECT_PATH}" -importPackage ${FBXSDK_PACKAGE_PATH} -quit
+"${UNITY3D_PATH}" -batchmode -projectPath "${PROJECT_PATH}" -exportPackage Assets/FbxExporters Assets/FbxSdk  ${PROJECT_PATH}/${PACKAGE_NAME}_${PACKAGE_VERSION}.unitypackage -quit
+```
+
+**On Windows**
+
+```
+set PROJECT_PATH=/path/to/FbxExporters
+set UNITY3D_PATH="C:/Program Files/Unity/Editor/Unity.exe"
+set PACKAGE_NAME=FbxExporters
+set PACKAGE_VERSION=0.0.3a
+set FBXSDK_PACKAGE_PATH=/path/to/FbxSdk.unitypackage
+
+%UNITY3D_PATH% -projectPath "%PROJECT_PATH%" -importPackage %FBXSDK_PACKAGE_PATH% -quit
+%UNITY3D_PATH% -batchmode -projectPath "%PROJECT_PATH%" -exportPackage Assets/FbxExporters Assets/FbxSdk %PROJECT_PATH%/%PACKAGE_NAME%_%PACKAGE_VERSION%.unitypackage -quit
 ```