Merge pull request #27 from Unity-Technologies/UNI-20986-default-filename-is-root-object

UNI-20986 Set the default filename to be the root gameobject

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -21,9 +21,6 @@ public class ConvertToModel : System.IDisposable
             const string MenuItemName1 = "Assets/Convert To Model";
             const string MenuItemName2 = "GameObject/Convert To Model";
 
-            const string RegexCharStart = "[";
-            const string RegexCharEnd = "]";
-
             /// <summary>
             /// Clean up this class on garbage collection
             /// </summary>
@@ -79,7 +76,7 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                 string dirPath = Path.Combine (Application.dataPath, "Objects");
 
                 for(int n = 0; n < gosToExport.Length; n++){
-                    string filename = ConvertToValidFilename (gosToExport [n].name + ".fbx");
+                    string filename = ModelExporter.ConvertToValidFilename (gosToExport [n].name + ".fbx");
                     filePaths[n] = Path.Combine (dirPath, filename);
                 }
 
@@ -95,7 +92,7 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                 {
                     var fbxFileName = fbxFileNames [i];
                     if (fbxFileName == null) {
-                        Debug.Log (string.Format ("Warning: Export failed for GameObject {0}", gosToExport [i].name));
+                        Debug.LogWarning (string.Format ("Warning: Export failed for GameObject {0}", gosToExport [i].name));
                         continue;
                     }
 
@@ -140,12 +137,6 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                 return result;
             }
 
-            private static string ConvertToValidFilename(string filename)
-            {
-                return System.Text.RegularExpressions.Regex.Replace (filename, 
-                    RegexCharStart + new string(Path.GetInvalidFileNameChars()) + RegexCharEnd, "_");
-            }
-
             private static void SetupImportedGameObject(GameObject orig, GameObject imported)
             {
                 Transform importedTransform = imported.transform;

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -36,9 +36,13 @@ public class ModelExporter : System.IDisposable
 
             const string ProgressBarTitle = "Fbx Export";
 
+            const char MayaNamespaceSeparator = ':';
+
+            // replace invalid chars with this one
             const char InvalidCharReplacement = '_';
 
-            const char MayaNamespaceSeparator = ':';
+            const string RegexCharStart = "[";
+            const string RegexCharEnd = "]";
 
             /// <summary>
             /// Create instance of example
@@ -243,7 +247,7 @@ public void ExportTexture (Material unityMaterial, string unityPropName,
             /// <summary>
             /// Get the color of a material, or grey if we can't find it.
             /// </summary>
-            public FbxDouble3? GetMaterialColor (Material unityMaterial, string unityPropName, float defaultValue = 1)
+            public FbxDouble3 GetMaterialColor (Material unityMaterial, string unityPropName, float defaultValue = 1)
             {
                 if (!unityMaterial) {
                     return new FbxDouble3(defaultValue);
@@ -733,7 +737,10 @@ public static bool OnValidateMenuItem ()
             }
 
             // Add a menu item called "Export Model..." to a GameObject's context menu.
-            [MenuItem ("GameObject/Export Model... %e", false, 30)]
+            // NOTE: The ellipsis at the end of the Menu Item name prevents the context
+            //       from being passed to command, thus resulting in OnContextItem()
+            //       being called only once regardless of what is selected.
+            [MenuItem ("GameObject/Export Model...", false, 30)]
             static void OnContextItem (MenuCommand command)
             {
                 OnExport ();
@@ -969,13 +976,19 @@ private static void OnExport ()
                 					  ? Application.dataPath
                 					  : System.IO.Path.GetDirectoryName (LastFilePath);
 
-                var filename = string.IsNullOrEmpty (LastFilePath)
-                					 ? MakeFileName (basename: FileBaseName, extension: Extension)
-                					 : System.IO.Path.GetFileName (LastFilePath);
+                GameObject [] selectedGOs = Selection.GetFiltered<GameObject> (SelectionMode.TopLevel);
+                string filename = null;
+                if (selectedGOs.Length == 1) {
+                    filename = ConvertToValidFilename (selectedGOs [0].name + ".fbx");
+                } else {
+                    filename = string.IsNullOrEmpty (LastFilePath)
+                        ? MakeFileName (basename: FileBaseName, extension: Extension)
+                        : System.IO.Path.GetFileName (LastFilePath);
+                }
 
                 var title = string.Format ("Export Model FBX ({0})", FileBaseName);
 
-                var filePath = EditorUtility.SaveFilePanel (title, directory, filename, "");
+                var filePath = EditorUtility.SaveFilePanel (title, directory, filename, "fbx");
 
                 if (string.IsNullOrEmpty (filePath)) {
                     return;
@@ -1066,6 +1079,14 @@ private static string ConvertToMayaCompatibleName(string name)
                 }
                 return newName;
             }
+
+            public static string ConvertToValidFilename(string filename)
+            {
+                return System.Text.RegularExpressions.Regex.Replace (filename, 
+                    RegexCharStart + new string(Path.GetInvalidFileNameChars()) + RegexCharEnd,
+                    InvalidCharReplacement.ToString()
+                );
+            }
         }
     }
 }