Merge branch 'master' into Uni-35304-UnitTestsForExportingTimelineClip

Author: MarcShakour

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -117,6 +117,29 @@ public static GameObject Convert (
                 string directoryFullPath = null,
                 string fbxFullPath = null)
             {
+                // Only create the prefab (no FBX export) if we have selected the root of a model prefab instance.
+                // Children of model prefab instances will also have "model prefab instance"
+                // as their prefab type, so it is important that it is the root that is selected.
+                //
+                // e.g. If I have the following hierarchy: 
+                //      Cube
+                //      -- Sphere
+                //
+                // Both the Cube and Sphere will have ModelPrefabInstance as their prefab type.
+                // However, when selecting the Sphere to convert, we don't want to connect it to the
+                // existing FBX but create a new FBX containing just the sphere.
+                PrefabType unityPrefabType = PrefabUtility.GetPrefabType(toConvert);
+                if (unityPrefabType == PrefabType.ModelPrefabInstance && toConvert.Equals(PrefabUtility.FindPrefabRoot(toConvert))) {
+                    // don't re-export fbx
+                    // create prefab out of model instance in scene, link to existing fbx
+                    var mainAsset = PrefabUtility.GetPrefabParent(toConvert) as GameObject;
+                    var mainAssetRelPath = AssetDatabase.GetAssetPath(mainAsset);
+                    var mainAssetAbsPath = Directory.GetParent(Application.dataPath) + "/" + mainAssetRelPath;
+                    SetupFbxPrefab(toConvert, mainAsset, mainAssetRelPath, mainAssetAbsPath);
+
+                    return toConvert;
+                }
+
                 if (string.IsNullOrEmpty(fbxFullPath)) {
                     // Generate a unique filename.
                     if (string.IsNullOrEmpty (directoryFullPath)) {
@@ -145,7 +168,7 @@ public static GameObject Convert (
 
                 // Export to FBX. It refreshes the database.
                 {
-                    var fbxActualPath = ModelExporter.ExportObject (fbxFullPath, toConvert);
+                    var fbxActualPath = ModelExporter.ExportObject (fbxFullPath, toConvert, lodExportType: EditorTools.ExportSettings.LODExportType.All);
                     if (fbxActualPath != fbxFullPath) {
                         throw new System.Exception ("Failed to convert " + toConvert.name);
                     }
@@ -155,12 +178,27 @@ public static GameObject Convert (
                 // relative to the project, not relative to the assets folder.
                 var unityMainAsset = AssetDatabase.LoadMainAssetAtPath (projectRelativePath) as GameObject;
                 if (!unityMainAsset) {
-                    throw new System.Exception ("Failed to convert " + toConvert.name);;
+                    throw new System.Exception ("Failed to convert " + toConvert.name);
                 }
 
                 // Copy the mesh/materials from the FBX
                 UpdateFromSourceRecursive (toConvert, unityMainAsset);
 
+                SetupFbxPrefab (toConvert, unityMainAsset, projectRelativePath, fbxFullPath);
+
+                toConvert.name = Path.GetFileNameWithoutExtension (fbxFullPath);
+                return toConvert;
+            }
+
+
+            /// <summary>
+            /// Create the prefab and connect it to the given fbx asset. 
+            /// </summary>
+            /// <param name="toConvert">Hierarchy to convert.</param>
+            /// <param name="unityMainAsset">Main asset in the FBX.</param>
+            /// <param name="projectRelativePath">Fbx project relative path.</param>
+            /// <param name="fbxFullPath">Fbx full path.</param>
+            public static void SetupFbxPrefab(GameObject toConvert, GameObject unityMainAsset, string projectRelativePath, string fbxFullPath){
                 // Set up the FbxPrefab component so it will auto-update.
                 // Make sure to delete whatever FbxPrefab history we had.
                 var fbxPrefab = toConvert.GetComponent<FbxPrefab>();
@@ -179,9 +217,6 @@ public static GameObject Convert (
                         string.Format("Failed to create prefab asset in [{0}] from fbx [{1}]",
                             prefabFileName, fbxFullPath));
                 }
-
-                toConvert.name = Path.GetFileNameWithoutExtension (fbxFullPath);
-                return toConvert;
             }
 
             /// <summary>

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -56,12 +56,23 @@ public override void OnInspectorGUI() {
                 exportSettings.autoUpdaterEnabled
             );
 
+            exportSettings.exportMeshNoRenderer = EditorGUILayout.Toggle(
+                new GUIContent("Export Meshes with no Renderers:",
+                    "If unchecked, meshes that don't have renderers won't be exported."),
+                exportSettings.exportMeshNoRenderer
+            );
+
             GUILayout.BeginHorizontal();
             EditorGUILayout.LabelField(new GUIContent("Export Format:", "Export the FBX file in the standard binary format." +
                 " Select ASCII to export the FBX file in ASCII format."), GUILayout.Width(LabelWidth - FieldOffset));
             exportSettings.ExportFormatSelection = EditorGUILayout.Popup(exportSettings.ExportFormatSelection, new string[]{"Binary", "ASCII"});
             GUILayout.EndHorizontal();
 
+            GUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField(new GUIContent("LOD Export:", "Select which LOD to export."), GUILayout.Width(LabelWidth - FieldOffset));
+            exportSettings.lodExportType = (ExportSettings.LODExportType)EditorGUILayout.Popup((int)exportSettings.lodExportType, new string[]{"All", "Highest", "Lowest"});
+            GUILayout.EndHorizontal();
+
             GUILayout.BeginHorizontal();
             EditorGUILayout.LabelField(new GUIContent(
                 "Export Path:",
@@ -289,6 +300,8 @@ public class ExportSettings : ScriptableSingleton<ExportSettings>
         public const string kMayaOptionName = "Maya ";
         public const string kMayaLtOptionName = "Maya LT";
 
+        public bool Verbose = false;
+
         private static string DefaultIntegrationSavePath {
             get{
                 return Path.GetDirectoryName(Application.dataPath);
@@ -429,17 +442,27 @@ public static string[] DCCVendorLocations
 
         // Note: default values are set in LoadDefaults().
         public bool mayaCompatibleNames = true;
-        public bool centerObjects = true;
+        public bool centerObjects = false;
         public bool autoUpdaterEnabled = true;
         public bool launchAfterInstallation = true;
         public bool HideSendToUnityMenu = true;
         public int ExportFormatSelection;
         public bool BakeAnimation = true;
+        public bool exportMeshNoRenderer = false;
 
         public string IntegrationSavePath;
 
         public int selectedDCCApp = 0;
 
+        [SerializeField]
+        public LODExportType lodExportType = LODExportType.All;
+
+        public enum LODExportType {
+            All = 0,
+            Highest = 1,
+            Lowest = 2
+        }
+
         /// <summary>
         /// The path where Convert To Model will save the new fbx and prefab.
         ///