Merge pull request #205 from Unity-Technologies/Uni-31021_allow_multiple_vendor_paths

Uni-31021 support for multiple vendor locations

Author: AustinJubrey

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -121,7 +121,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)) {
@@ -238,18 +238,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();
                 }
             }
         }
@@ -458,53 +477,73 @@ 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;
+            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)) {
-                    // UNI-29074 TODO: add Maya LT support
-                    // Reject MayaLT -- it doesn't have plugins.
-                    if (product.StartsWith ("mayalt", StringComparison.InvariantCultureIgnoreCase)) {
-                        continue;
+                    // Only accept those that start with 'maya' in either case.
+                    if (product.StartsWith("maya", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        // UNI-29074 TODO: add Maya LT support
+                        // Reject MayaLT -- it doesn't have plugins.
+                        if (product.StartsWith("mayalt", StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            continue;
+                        }
+                        string version = product.Substring("maya".Length);
+                        dccOptionPath.Add(GetMayaExePath(productDir.FullName.Replace("\\", "/")));
+                        dccOptionName.Add(GetUniqueDCCOptionName(kMayaOptionName + version));
                     }
-                    string version = product.Substring ("maya".Length);
-                    dccOptionPath.Add (GetMayaExePath (productDir.FullName.Replace ("\\", "/")));
-                    dccOptionName.Add (GetUniqueDCCOptionName(kMayaOptionName + version));
-                }
 
-                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>
@@ -563,6 +602,7 @@ public static GUIContent[] GetDCCOptions(){
             }
 
             if (instance.dccOptionPaths.Count <= 0) {
+                instance.selectedDCCApp = 0;
                 return new GUIContent[]{
                     new GUIContent("<No 3D Application found>")
                 };