Merge pull request #34 from Unity-Technologies/UNI-21369-convert-model-hierarchy-fix

UNI-21369 fix so that the hierarchies match on import

Author: inwoods

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -71,6 +71,8 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                 GameObject[] gosToExport = new GameObject[exportSet.Count];
                 exportSet.CopyTo (gosToExport);
 
+                EnforceUniqueNames (gosToExport);
+
                 // find common ancestor root & filePath;
                 string[] filePaths = new string[gosToExport.Length];
                 string dirPath = Path.Combine (Application.dataPath, "Objects");
@@ -163,6 +165,44 @@ private static string IncrementFileName(string path, string filename)
                 return file;
             } 
 
+            /// <summary>
+            /// Enforces that all object names be unique before exporting.
+            /// If an object with a duplicate name is found, then it is incremented.
+            /// e.g. Sphere becomes Sphere 1
+            /// </summary>
+            /// <param name="exportSet">Export set.</param>
+            private static void EnforceUniqueNames(GameObject[] exportSet)
+            {
+                Dictionary<string, int> NameToIndexMap = new Dictionary<string, int> ();
+                string format = "{0} {1}";
+
+                Queue<GameObject> queue = new Queue<GameObject> (exportSet);
+
+                while(queue.Count > 0){
+                    var go = queue.Dequeue ();
+                    var name = go.name;
+                    if (NameToIndexMap.ContainsKey (name)) {
+                        go.name = string.Format (format, name, NameToIndexMap [name]);
+                        NameToIndexMap [name]++;
+                    } else {
+                        NameToIndexMap [name] = 1;
+                    }
+
+                    foreach (Transform child in go.transform) {
+                        queue.Enqueue (child.gameObject);
+                    }
+                }
+            }
+
+            /// <summary>
+            /// Sets up the imported GameObject to match the original.
+            /// - Updates the name to be the same as original (i.e. remove the "(Clone)")
+            /// - Moves the imported object to the correct position in the hierarchy
+            /// - Updates the transform of the imported GameObject to match the original
+            /// - Copy over missing components and component values
+            /// </summary>
+            /// <param name="orig">Original GameObject.</param>
+            /// <param name="imported">Imported GameObject.</param>
             private static void SetupImportedGameObject(GameObject orig, GameObject imported)
             {
                 Transform importedTransform = imported.transform;
@@ -191,9 +231,25 @@ private static void SetupImportedGameObject(GameObject orig, GameObject imported
                     Debug.LogWarning (string.Format ("Warning: Exported {0} objects, but only imported {1}",
                         origTransform.hierarchyCount, importedTransform.hierarchyCount));
                 }
+                FixSiblingOrder (orig.transform, imported.transform);
                 CopyComponentsRecursive (orig, imported);
             }
 
+            private static void FixSiblingOrder(Transform orig, Transform imported){
+                foreach (Transform origChild in orig) {
+                    Transform importedChild = imported.Find (origChild.name);
+                    if (importedChild == null) {
+                        Debug.LogWarning (string.Format(
+                            "Warning: Could not find {0} in parented under {1} in import hierarchy",
+                            origChild.name, imported.name
+                        ));
+                        continue;
+                    }
+                    importedChild.SetSiblingIndex (origChild.GetSiblingIndex ());
+                    FixSiblingOrder (origChild, importedChild);
+                }
+            }
+
             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));