Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-29074-mayalt-plugin

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

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -1,10 +1,3 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
 using System.IO;
 using System.Collections.Generic;
 using UnityEngine;

Assets/FbxExporters/Editor/EditorRotate.cs

@@ -1,12 +1,4 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
-
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -52,6 +52,16 @@ public override void OnInspectorGUI() {
                 exportSettings.centerObjects
             );
 
+            EditorGUILayout.Space();
+
+            GUILayout.BeginHorizontal();
+            GUILayout.Label(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 - 3));
+            exportSettings.ExportFormatSelection = EditorGUILayout.Popup(exportSettings.ExportFormatSelection, new string[]{"Binary", "ASCII"});
+            GUILayout.EndHorizontal();
+
+            EditorGUILayout.Space();
+
             GUILayout.BeginHorizontal ();
             GUILayout.Label (new GUIContent (
                 "Export Path:",
@@ -118,7 +128,7 @@ public override void OnInspectorGUI() {
                     throw new System.NotImplementedException ();
                 }
 
-                string dccPath = EditorUtility.OpenFilePanel ("Select Digital Content Creation Application", ExportSettings.kDefaultAdskRoot, ext);
+                string dccPath = EditorUtility.OpenFilePanel ("Select Digital Content Creation Application", ExportSettings.GetFirstValidVendorLocation(), ext);
 
                 // check that the path is valid and references the maya executable
                 if (!string.IsNullOrEmpty (dccPath)) {
@@ -139,7 +149,9 @@ public override void OnInspectorGUI() {
             }
             GUILayout.EndHorizontal ();
 
-			var installIntegrationContent = new GUIContent(
+            EditorGUILayout.Space();
+
+            var installIntegrationContent = new GUIContent(
                     "Install Unity Integration",
                     "Install and configure the Unity integration for the selected 3D application so that you can import and export directly with this project.");
             if (GUILayout.Button (installIntegrationContent)) {
@@ -219,18 +231,37 @@ public class ExportSettings : ScriptableSingleton<ExportSettings>
         public const string kBlenderOptionName = "Blender ";
 
         /// <summary>
-        /// The path where all the different versions of Maya are installed
+        /// The paths where all the different versions of Maya are installed
         /// by default. Depends on the platform.
         /// </summary>
-        public static string kDefaultAdskRoot {
+        public static string[] DCCVendorLocations {
             get{
-                switch (Application.platform) {
-                case RuntimePlatform.WindowsEditor:
-                    return "C:/Program Files/Autodesk";
-                case RuntimePlatform.OSXEditor:
-                    return "/Applications/Autodesk";
-                default:
-                    throw new NotImplementedException ();
+                var environmentVariable = Environment.GetEnvironmentVariable("UNITY_FBX_3DAPP_VENDOR_LOCATIONS");
+                if (environmentVariable != null)
+                {
+                    string[] locations = environmentVariable.Split(';');
+                    List<string> locationsList = new List<string>();
+                    for (int i = 0; i < locations.Length; i++)
+                    {
+                        if (Directory.Exists(locations[i]))
+                        {
+                            locationsList.Add(locations[i]);
+                        }
+                    }
+                    if (locationsList.Count > 0)
+                    {
+                        return locationsList.ToArray();
+                    }
+                }
+
+                switch (Application.platform)
+                {
+                    case RuntimePlatform.WindowsEditor:
+                        return new string[] { "C:/Program Files/Autodesk", "D:/Program Files/Autodesk" };
+                    case RuntimePlatform.OSXEditor:
+                        return new string[] { "/Applications/Autodesk" };
+                    default:
+                        throw new NotImplementedException();
                 }
             }
         }
@@ -239,6 +270,7 @@ public static string kDefaultAdskRoot {
         public bool mayaCompatibleNames;
         public bool centerObjects;
         public bool launchAfterInstallation;
+        public int ExportFormatSelection;
 
         public int selectedDCCApp = 0;
 
@@ -267,6 +299,7 @@ protected override void LoadDefaults()
             mayaCompatibleNames = true;
             centerObjects = true;
             launchAfterInstallation = true;
+            ExportFormatSelection = 0;
             convertToModelSavePath = kDefaultSavePath;
             dccOptionPaths = null;
             dccOptionNames = null;
@@ -437,48 +470,67 @@ private static void FindDCCInstalls() {
             var dccOptionName = instance.dccOptionNames;
             var dccOptionPath = instance.dccOptionPaths;
 
-            // If the location is given by the environment, use it.
-            var location = System.Environment.GetEnvironmentVariable ("MAYA_LOCATION");
-            if (!string.IsNullOrEmpty(location)) {
-                location = location.TrimEnd('/');
-                dccOptionPath.Add (GetMayaExePath (location.Replace ("\\", "/")));
-                dccOptionName.Add ("MAYA_LOCATION");
-            }
-
-            if (!Directory.Exists (kDefaultAdskRoot)) {
-                // no autodesk products installed
-                return;
-            }
-            // List that directory and find the right version:
-            // either the newest version, or the exact version we wanted.
-            var adskRoot = new System.IO.DirectoryInfo(kDefaultAdskRoot);
-            foreach(var productDir in adskRoot.GetDirectories()) {
-                var product = productDir.Name;
-
-                // Only accept those that start with 'maya' in either case.
-                if (product.StartsWith ("maya", StringComparison.InvariantCultureIgnoreCase)) {
-                    string version = product.Substring ("maya".Length);
-                    dccOptionPath.Add (GetMayaExePath (productDir.FullName.Replace ("\\", "/")));
-                    dccOptionName.Add (GetUniqueDCCOptionName(kMayaOptionName + version));
+            for (int i = 0; i < DCCVendorLocations.Length; i++)
+            {
+                if (!Directory.Exists(DCCVendorLocations[i]))
+                {
+                    // no autodesk products installed
+                    continue;
                 }
+                // List that directory and find the right version:
+                // either the newest version, or the exact version we wanted.
+                var adskRoot = new System.IO.DirectoryInfo(DCCVendorLocations[i]);
+                foreach (var productDir in adskRoot.GetDirectories())
+                {
+                    var product = productDir.Name;
+
+                    // Only accept those that start with 'maya' in either case.
+                    if (product.StartsWith ("maya", StringComparison.InvariantCultureIgnoreCase)) {
+                        string version = product.Substring ("maya".Length);
+                        dccOptionPath.Add (GetMayaExePath (productDir.FullName.Replace ("\\", "/")));
+                        dccOptionName.Add (GetUniqueDCCOptionName(kMayaOptionName + version));
+                        continue;
+                    }
 
-                if (product.StartsWith ("3ds max", StringComparison.InvariantCultureIgnoreCase)) {
-                    var exePath = string.Format ("{0}/{1}", productDir.FullName.Replace ("\\", "/"), "3dsmax.exe");
+                    if (product.StartsWith("3ds max", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        var exePath = string.Format("{0}/{1}", productDir.FullName.Replace("\\", "/"), "3dsmax.exe");
 
-                    string version = product.Substring("3ds max ".Length);
-                    var maxOptionName = GetUniqueDCCOptionName(kMaxOptionName + version);
+                        string version = product.Substring("3ds max ".Length);
+                        var maxOptionName = GetUniqueDCCOptionName(kMaxOptionName + version);
 
-                    if (IsEarlierThanMax2017 (maxOptionName)) {
-                        continue;
+                        if (IsEarlierThanMax2017(maxOptionName))
+                        {
+                            continue;
+                        }
+
+                        dccOptionPath.Add(exePath);
+                        dccOptionName.Add(maxOptionName);
                     }
-                    
-                    dccOptionPath.Add (exePath);
-                    dccOptionName.Add (maxOptionName);
                 }
             }
             instance.selectedDCCApp = instance.GetPreferredDCCApp();
         }
 
+        /// <summary>
+        /// Returns the first valid folder in our list of vendor locations
+        /// </summary>
+        /// <returns>The first valid vendor location</returns>
+        public static string GetFirstValidVendorLocation()
+        {
+            string[] locations = DCCVendorLocations;
+            for (int i = 0; i < locations.Length; i++)
+            {
+                //Look through the list of locations we have and take the first valid one
+                if (Directory.Exists(locations[i]))
+                {
+                    return locations[i];
+                }
+            }
+            //if no valid locations exist, just take us to the project folder
+            return Directory.GetCurrentDirectory();
+        }
+
         /// <summary>
         /// Gets the maya exe at Maya install location.
         /// </summary>
@@ -537,6 +589,7 @@ public static GUIContent[] GetDCCOptions(){
             }
 
             if (instance.dccOptionPaths.Count <= 0) {
+                instance.selectedDCCApp = 0;
                 return new GUIContent[]{
                     new GUIContent("<No 3D Application found>")
                 };

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1,10 +1,3 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
 using System.IO;
 using System.Collections.Generic;
 using UnityEngine;
@@ -54,6 +47,12 @@ public class ModelExporter : System.IDisposable
 
             public const string PACKAGE_UI_NAME = "FBX Exporter";
 
+            public enum ExportFormat
+            {
+                Binary = 0,
+                ASCII = 1
+            }
+
             /// <summary>
             /// Create instance of exporter.
             /// </summary>
@@ -981,7 +980,11 @@ public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet)
 
                         // Initialize the exporter.
                         // fileFormat must be binary if we are embedding textures
-                        int fileFormat = fbxManager.GetIOPluginRegistry ().FindWriterIDByDescription ("FBX ascii (*.fbx)");
+                        int fileFormat = -1;
+                        if (EditorTools.ExportSettings.instance.ExportFormatSelection == (int)ExportFormat.ASCII)
+                        {
+                            fileFormat = fbxManager.GetIOPluginRegistry().FindWriterIDByDescription("FBX ascii (*.fbx)");
+                        }                        
 
                         status = fbxExporter.Initialize (m_tempFilePath, fileFormat, fbxManager.GetIOSettings ());
                         // Check that initialization of the fbxExporter was successful

Assets/FbxExporters/Editor/FbxPrefabInspector.cs

@@ -18,7 +18,7 @@ public override void OnInspectorGUI() {
 
             var fbxPrefabUtility = new FbxPrefabAutoUpdater.FbxPrefabUtility (fbxPrefab);
             var oldFbxAsset = fbxPrefabUtility.GetFbxAsset();
-            var newFbxAsset = EditorGUILayout.ObjectField("Source Fbx Asset", oldFbxAsset,
+            var newFbxAsset = EditorGUILayout.ObjectField(new GUIContent("Source Fbx Asset", "The FBX file that is linked to this Prefab"), oldFbxAsset,
                     typeof(GameObject), allowSceneObjects: false) as GameObject;
             if (newFbxAsset && !AssetDatabase.GetAssetPath(newFbxAsset).EndsWith(".fbx")) {
                 Debug.LogError("FbxPrefab must point to an Fbx asset (or none).");

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -1,10 +1,3 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
 using UnityEngine;
 
 namespace FbxExporters

Assets/FbxExporters/Editor/UnitTests/DefaultSelectionTest.cs

@@ -1,11 +1,4 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using UnityEngine.TestTools;
 using NUnit.Framework;

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

@@ -1,11 +1,4 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using UnityEngine.TestTools;
 using NUnit.Framework;

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -1,10 +1,3 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
 using UnityEngine;
 using UnityEditor;
 using NUnit.Framework;

Assets/FbxExporters/Editor/UnitTests/ModelExporterTest.cs

@@ -1,11 +1,4 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using UnityEngine.TestTools;
 using NUnit.Framework;