Merge pull request #42 from Unity-Technologies/Uni-21697-calling-converttomodel

Uni-21697 call converttomodel from script

Author: inwoods

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Copyright (c) 2017 Unity Technologies. All rights reserved.
 //
 // Licensed under the ##LICENSENAME##.
@@ -32,8 +32,10 @@ public void Dispose () { }
             [MenuItem (MenuItemName1, false)]
             public static void OnMenuItem ()
             {
-                GameObject [] unityActiveGOs = Selection.GetFiltered<GameObject> (SelectionMode.Editable | SelectionMode.TopLevel);
-                OnConvertInPlace (unityActiveGOs);
+                GameObject [] unityGameObjectsToConvert = Selection.GetFiltered<GameObject> (SelectionMode.Editable | SelectionMode.TopLevel);
+                Object[] result = CreateInstantiatedModelPrefab (unityGameObjectsToConvert);
+                if (result.Length>0)
+                    Selection.objects = result;
             }
 
             /// <summary>
@@ -60,28 +62,39 @@ static void OnContextItem (MenuCommand command)
                     Debug.LogError (string.Format("Error: {0} is not a GameObject and cannot be converted", command.context.name));
                     return;
                 }
-                OnConvertInPlace (new GameObject[]{selected});
+                GameObject[] result = CreateInstantiatedModelPrefab (new GameObject[]{selected});
+                if (result.Length>0)
+                    Selection.objects = result;
+
             }
 
-            private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
+            /// <summary>
+            /// Create an instantiated model prefab from an game object hierarchy.
+            /// </summary>
+            /// <returns>list of instanced Model Prefabs</returns>
+            /// <param name="unityGameObjectsToConvert">Unity game objects to convert to Model Prefab instances</param>
+            /// <param name="path">Path to save Model Prefab</param>
+            /// <param name="keepOriginal">If set to <c>true</c> keep original gameobject hierarchy.</param>
+            public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGameObjectsToConvert, string path = null, bool keepOriginal = true)
             {
                 List<GameObject> result = new List<GameObject> ();
 
-                var exportSet = ModelExporter.RemoveRedundantObjects (unityActiveGOs);
+                var exportSet = ModelExporter.RemoveRedundantObjects (unityGameObjectsToConvert);
                 GameObject[] gosToExport = new GameObject[exportSet.Count];
                 exportSet.CopyTo (gosToExport);
 
                 EnforceUniqueNames (gosToExport);
 
                 // find common ancestor root & filePath;
                 string[] filePaths = new string[gosToExport.Length];
-                string dirPath = FbxExporters.EditorTools.ExportSettings.instance.convertToModelSavePath;
+                if (path==null)
+                    path = FbxExporters.EditorTools.ExportSettings.instance.convertToModelSavePath;
 
                 for(int n = 0; n < gosToExport.Length; n++){
                     var filename = ModelExporter.ConvertToValidFilename (gosToExport [n].name + ".fbx");
-                    var filePath = Path.Combine (dirPath, filename);
+                    var filePath = Path.Combine (path, filename);
                     if (File.Exists (filePath)) {
-                        filePath = IncrementFileName (dirPath, filename);
+                        filePath = IncrementFileName (path, filename);
                     }
                     filePaths[n] = filePath;
                 }
@@ -93,7 +106,6 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                         new UnityEngine.Object[] {gosToExport[j]}) as string;
                 }
 
-                List<GameObject> selection = new List<GameObject> ();
                 for(int i = 0; i < fbxFileNames.Length; i++)
                 {
                     var fbxFileName = fbxFileNames [i];
@@ -121,26 +133,26 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                         {
                             SetupImportedGameObject (gosToExport [i], unityGO);
 
-                            result.Add (unityGO);
 
                             // remove (now redundant) gameobject
-#if UNI_19965
-                            Object.DestroyImmediate (unityActiveGOs [i]);
-#else
-                            // rename and put under scene root in case we need to check values
-                            gosToExport [i].name = "_safe_to_delete_" + gosToExport[i].name;
-                            gosToExport [i].SetActive (false);
-#endif
-                            // select the instanced Model Prefab
-                            selection.Add(unityGO);
+                            if (!keepOriginal) {
+                                Object.DestroyImmediate (unityGameObjectsToConvert [i]);
+                            } 
+                            else 
+                            {
+                                // rename and put under scene root in case we need to check values
+                                gosToExport [i].name = "_safe_to_delete_" + gosToExport [i].name;
+                                gosToExport [i].SetActive (false);
+                            }
+
+                            // add the instanced Model Prefab
+                            result.Add (unityGO);
                         }
                     }
 
                 }
 
-                Selection.objects = selection.ToArray ();
-
-                return result;
+                return result.ToArray ();
             }
 
             /// <summary>
@@ -298,4 +310,4 @@ private static void CopyComponents(GameObject from, GameObject to){
             }
         }
     }
-}
+}