Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-20151-reliable-system-units

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

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -76,7 +76,8 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                 string dirPath = Path.Combine (Application.dataPath, "Objects");
 
                 for(int n = 0; n < gosToExport.Length; n++){
-                    filePaths[n] = Path.Combine (dirPath, gosToExport[n].name + ".fbx");
+                    string filename = ModelExporter.ConvertToValidFilename (gosToExport [n].name + ".fbx");
+                    filePaths[n] = Path.Combine (dirPath, filename);
                 }
 
                 string[] fbxFileNames = new string[filePaths.Length];
@@ -91,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;
                     }
 
@@ -108,7 +109,7 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                     Object unityMainAsset = AssetDatabase.LoadMainAssetAtPath (fbxFileName);
 
                     if (unityMainAsset != null) {
-                        Object unityObj = PrefabUtility.InstantiateAttachedAsset (unityMainAsset);
+                        Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);
                         GameObject unityGO = unityObj as GameObject;
                         if (unityGO != null) 
                         {

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -11,8 +11,21 @@ public class ExportSettingsEditor : UnityEditor.Editor {
         public override void OnInspectorGUI() {
             ExportSettings exportSettings = (ExportSettings)target;
 
+            // Increasing the label width so that none of the text gets cut off
+            EditorGUIUtility.labelWidth = 300;
+
             exportSettings.weldVertices = EditorGUILayout.Toggle ("Weld Vertices:", exportSettings.weldVertices);
             exportSettings.embedTextures = EditorGUILayout.Toggle ("Embed Textures:", exportSettings.embedTextures);
+            exportSettings.mayaCompatibleNames = EditorGUILayout.Toggle (
+                new GUIContent("Convert to Maya Compatible Naming:",
+                    "In Maya some symbols such as spaces and accents get replaced when importing an FBX " +
+                    "(e.g. \"foo bar\" becomes \"fooFBXASC032bar\"). " +
+                    "On export, convert the names of GameObjects so they are Maya compatible." +
+                    (exportSettings.mayaCompatibleNames? "" : 
+                        "\n\nWARNING: Disabling this feature may result in lost material connections," +
+                        " and unexpected character replacements in Maya.")
+                ),
+                exportSettings.mayaCompatibleNames);
 
             if (GUI.changed) {
                 EditorUtility.SetDirty (exportSettings);
@@ -26,6 +39,7 @@ public class ExportSettings : FbxExporters.EditorTools.ScriptableSingleton<Expor
     {
         public bool weldVertices = true;
         public bool embedTextures = false;
+        public bool mayaCompatibleNames = true;
 
         [MenuItem("Edit/Project Settings/Fbx Export", priority = 300)]
         static void ShowManager()

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -36,6 +36,14 @@ public class ModelExporter : System.IDisposable
 
             const string ProgressBarTitle = "Fbx Export";
 
+            const char MayaNamespaceSeparator = ':';
+
+            // replace invalid chars with this one
+            const char InvalidCharReplacement = '_';
+
+            const string RegexCharStart = "[";
+            const string RegexCharEnd = "]";
+
             const int UnitScaleFactor = 100;
 
             /// <summary>
@@ -241,13 +249,13 @@ 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)
+            public FbxDouble3 GetMaterialColor (Material unityMaterial, string unityPropName, float defaultValue = 1)
             {
                 if (!unityMaterial) {
-                    return new FbxDouble3 (0.5);
+                    return new FbxDouble3(defaultValue);
                 }
                 if (!unityMaterial.HasProperty (unityPropName)) {
-                    return new FbxDouble3 (0.5);
+                    return new FbxDouble3(defaultValue);
                 }
                 var unityColor = unityMaterial.GetColor (unityPropName);
                 return new FbxDouble3 (unityColor.r, unityColor.g, unityColor.b);
@@ -478,6 +486,10 @@ protected int ExportComponents (
             {
                 int numObjectsExported = exportProgress;
 
+                if (FbxExporters.EditorTools.ExportSettings.instance.mayaCompatibleNames) {
+                    unityGo.name = ConvertToMayaCompatibleName (unityGo.name);
+                }
+
                 // create an FbxNode and add it as a child of parent
                 FbxNode fbxNode = FbxNode.Create (fbxScene, unityGo.name);
                 NumNodes++;
@@ -736,7 +748,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 ();
@@ -849,6 +864,11 @@ public Material Material {
                         if (!renderer) {
                             return null;
                         }
+
+                        if (FbxExporters.EditorTools.ExportSettings.instance.mayaCompatibleNames) {
+                            renderer.sharedMaterial.name = ConvertToMayaCompatibleName (renderer.sharedMaterial.name);
+                        }
+
                         // .material instantiates a new material, which is bad
                         // most of the time.
                         return renderer.sharedMaterial;
@@ -967,13 +987,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;
@@ -1022,6 +1048,56 @@ private static void EnsureDirectory (string path)
                     Directory.CreateDirectory (fileInfo.Directory.FullName);
                 }
             }
+
+            /// <summary>
+            /// Removes the diacritics (i.e. accents) from letters.
+            /// e.g. é becomes e
+            /// </summary>
+            /// <returns>Text with accents removed.</returns>
+            /// <param name="text">Text.</param>
+            private static string RemoveDiacritics(string text) 
+            {
+                var normalizedString = text.Normalize(System.Text.NormalizationForm.FormD);
+                var stringBuilder = new System.Text.StringBuilder();
+
+                foreach (var c in normalizedString)
+                {
+                    var unicodeCategory = System.Globalization.CharUnicodeInfo.GetUnicodeCategory(c);
+                    if (unicodeCategory != System.Globalization.UnicodeCategory.NonSpacingMark)
+                    {
+                        stringBuilder.Append(c);
+                    }
+                }
+
+                return stringBuilder.ToString().Normalize(System.Text.NormalizationForm.FormC);
+            }
+
+            private static string ConvertToMayaCompatibleName(string name)
+            {
+                string newName = RemoveDiacritics (name);
+
+                if (char.IsDigit (newName [0])) {
+                    newName = newName.Insert (0, InvalidCharReplacement.ToString());
+                }
+
+                for (int i = 0; i < newName.Length; i++) {
+                    if (!char.IsLetterOrDigit (newName, i)) {
+                        if (i < newName.Length-1 && newName [i] == MayaNamespaceSeparator) {
+                            continue;
+                        }
+                        newName = newName.Replace (newName [i], InvalidCharReplacement);
+                    }
+                }
+                return newName;
+            }
+
+            public static string ConvertToValidFilename(string filename)
+            {
+                return System.Text.RegularExpressions.Regex.Replace (filename, 
+                    RegexCharStart + new string(Path.GetInvalidFileNameChars()) + RegexCharEnd,
+                    InvalidCharReplacement.ToString()
+                );
+            }
         }
     }
 }