Merge remote-tracking branch 'origin/master' into uni-40523-convert-from-asset

Author: Benoit Hudson

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -113,7 +113,7 @@ public static GameObject Convert (
                 string fbxFullPath = null,
                 string prefabDirectoryFullPath = null,
                 string prefabFullPath = null, 
-                EditorTools.IExportOptions exportOptions = null)
+                EditorTools.ConvertToPrefabSettingsSerialize exportOptions = null)
             {
                 // If we selected the something that's already backed by an FBX, don't export.
                 var mainAsset = GetOrCreateFbxAsset (toConvert, fbxDirectoryFullPath, fbxFullPath, exportOptions);
@@ -166,7 +166,7 @@ public static bool WillExportFbx(GameObject go) {
             public static GameObject GetOrCreateFbxAsset(GameObject toConvert,
                     string fbxDirectoryFullPath = null,
                     string fbxFullPath = null,
-                    EditorTools.IExportOptions exportOptions = null)
+                    EditorTools.ConvertToPrefabSettingsSerialize exportOptions = null)
             {
                 var mainAsset = GetFbxAssetOrNull(toConvert);
                 if (mainAsset) {
@@ -193,7 +193,7 @@ public static GameObject GetOrCreateFbxAsset(GameObject toConvert,
                 // The import back in to Unity would do this automatically but
                 // we prefer to control it so that the Maya artist can see the
                 // same names as exist in Unity.
-                EnforceUniqueNames (new GameObject[] {toConvert});
+                EnforceUniqueNames(new GameObject[] { toConvert });
 
                 // Export to FBX. It refreshes the database.
                 {
@@ -392,23 +392,28 @@ public static string IncrementFileName(string path, string filename)
             /// <param name="exportSet">Export set.</param>
             public static void EnforceUniqueNames(IEnumerable<GameObject> exportSet)
             {
-                Dictionary<string, int> NameToIndexMap = new Dictionary<string, int> ();
+                Dictionary<string, int> NameToIndexMap = new Dictionary<string, int>();
                 string format = "{0} {1}";
 
-                Queue<GameObject> queue = new Queue<GameObject> (exportSet);
+                Queue<GameObject> queue = new Queue<GameObject>(exportSet);
 
-                while(queue.Count > 0){
-                    var go = queue.Dequeue ();
+                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;
+                    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);
+                    foreach (Transform child in go.transform)
+                    {
+                        queue.Enqueue(child.gameObject);
                     }
                 }
             }
@@ -493,6 +498,22 @@ public static Dictionary<string,GameObject> MapNameToSourceRecursive(GameObject
             /// </summary>
             public static void CopyComponents(GameObject to, GameObject from){
                 var originalComponents = new List<Component>(to.GetComponents<Component> ());
+
+                // UNI-27534: This fixes the issue where the mesh collider would not update to point to the mesh in the fbx after export
+                // Point the mesh included in the mesh collider to the mesh in the FBX file, which is the same as the one in mesh filter
+                var toMeshCollider = to.GetComponent<MeshCollider>();
+                var toMeshFilter = to.GetComponent<MeshFilter>();
+                // if the mesh collider isn't pointing to the same mesh as in the current mesh filter then don't
+                // do anything as it's probably pointing to a mesh in a different fbx
+                if (toMeshCollider && toMeshFilter && toMeshCollider.sharedMesh == toMeshFilter.sharedMesh)
+                {
+                    var fromFilter = from.GetComponent<MeshFilter>();
+                    if (fromFilter)
+                    {
+                        toMeshCollider.sharedMesh = fromFilter.sharedMesh;
+                    }
+                }
+
                 // copy over meshes, materials, and nothing else
                 foreach (var component in from.GetComponents<Component>()) {
                     // ignore missing components

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -83,6 +83,19 @@ protected override void OnEnable ()
                 m_prefabExtLabelWidth = m_fbxExtLabelStyle.CalcSize (new GUIContent (".prefab")).x;
             }
 
+            protected bool ExportSetContainsAnimation ()
+            {
+                foreach(var obj in ToExport)
+                {
+                    var go = ModelExporter.GetGameObject(obj);
+                    if(go.GetComponentInChildren<Animation>() || go.GetComponentInChildren<Animator>())
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
             protected override bool Export ()
             {
                 if (string.IsNullOrEmpty (m_exportFileName)) {
@@ -106,6 +119,29 @@ protected override bool Export ()
                     return false;
                 }
 
+                if (SettingsObject.UseMayaCompatibleNames && SettingsObject.AllowSceneModification)
+                {
+                    string warning = "Names of objects in the hierarchy may change with the Compatible Naming option turned on";
+                    if (ExportSetContainsAnimation())
+                    {
+                        warning = "Compatible Naming option turned on. Names of objects in hierarchy may change and break animations.";
+                    }
+
+                    // give a warning dialog that indicates that names in the scene may change
+                    int result = UnityEditor.EditorUtility.DisplayDialogComplex(
+                                    string.Format("{0} Warning", ModelExporter.PACKAGE_UI_NAME), warning, "OK", "Turn off and continue", "Cancel"
+                                );
+                    if (result == 1)
+                    {
+                        // turn compatible naming off
+                        SettingsObject.SetUseMayaCompatibleNames(false);
+                    }
+                    else if (result == 2)
+                    {
+                        return false;
+                    }
+                }
+
                 if (ToExport.Length == 1) {
                     var go = ModelExporter.GetGameObject (ToExport [0]);
 

Assets/FbxExporters/Editor/ConvertToPrefabSettings.cs

@@ -76,5 +76,6 @@ public class ConvertToPrefabSettingsSerialize : ExportOptionsSettingsSerializeBa
         public override ExportSettings.LODExportType LODExportType { get { return ExportSettings.LODExportType.All; } }
         public override ExportSettings.ObjectPosition ObjectPosition { get { return ExportSettings.ObjectPosition.Reset; } }
         public override bool ExportUnrendered { get { return true; } }
+        public override bool AllowSceneModification { get { return true; } }
     }
 }

Assets/FbxExporters/Editor/ExportModelSettings.cs

@@ -105,6 +105,7 @@ public interface IExportOptions {
         ExportSettings.ObjectPosition ObjectPosition { get; }
         bool AnimateSkinnedMesh { get; }
         bool UseMayaCompatibleNames { get; }
+        bool AllowSceneModification { get; }
         bool ExportUnrendered { get; }
         Transform AnimationSource { get; }
         Transform AnimationDest { get; }
@@ -145,6 +146,7 @@ public abstract class ExportOptionsSettingsSerializeBase : IExportOptions
         public abstract ExportSettings.LODExportType LODExportType { get; }
         public abstract ExportSettings.ObjectPosition ObjectPosition { get; }
         public abstract bool ExportUnrendered { get; }
+        public abstract bool AllowSceneModification { get; }
     }
 
     [System.Serializable]
@@ -163,5 +165,6 @@ public class ExportModelSettingsSerialize : ExportOptionsSettingsSerializeBase
         public void SetObjectPosition(ExportSettings.ObjectPosition objPos){ this.objectPosition = objPos; }
         public override bool ExportUnrendered { get { return exportUnrendered; } }
         public void SetExportUnredererd(bool exportUnrendered){ this.exportUnrendered = exportUnrendered; }
+        public override bool AllowSceneModification { get { return false; } }
     }
 }

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -2209,12 +2209,17 @@ protected int ExportTransformHierarchy(
             {
                 int numObjectsExported = exportProgress;
 
+                string fbxName = unityGo.name;
                 if (ExportOptions.UseMayaCompatibleNames) {
-                    unityGo.name = ConvertToMayaCompatibleName (unityGo.name);
+                    fbxName = ConvertToMayaCompatibleName (unityGo.name);
+                    if (ExportOptions.AllowSceneModification)
+                    {
+                        unityGo.name = fbxName;
+                    }
                 }
 
                 // create an FbxNode and add it as a child of parent
-                FbxNode fbxNode = FbxNode.Create (fbxScene, GetUniqueName (unityGo.name));
+                FbxNode fbxNode = FbxNode.Create (fbxScene, GetUniqueName (fbxName));
                 MapUnityObjectToFbxNode [unityGo] = fbxNode;
 
                 if (Verbose)
@@ -2481,12 +2486,13 @@ private bool ExportGameObjectAndParents(
                     return true;
                 }
 
+                string fbxName = unityGo.name;
                 if (ExportOptions.UseMayaCompatibleNames) {
-                    unityGo.name = ConvertToMayaCompatibleName (unityGo.name);
+                    fbxName = ConvertToMayaCompatibleName (unityGo.name);
                 }
 
                 // create an FbxNode and add it as a child of parent
-                fbxNode = FbxNode.Create (fbxScene, GetUniqueName (unityGo.name));
+                fbxNode = FbxNode.Create (fbxScene, GetUniqueName (fbxName));
                 MapUnityObjectToFbxNode [unityGo] = fbxNode;
 
                 exportProgress++;