[CHANGED] path selection is now absolute and not relative

[CHANGED] integration path does not need to be in assets folder

Author: AJubrey

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -92,16 +92,15 @@ public override void OnInspectorGUI() {
                 "Integrations Path:",
                 "Relative path for saving 3D application integrations."), GUILayout.Width(LabelWidth - 3));
 
-            var IntegrationsPathLabel = ExportSettings.GetRelativeSavePath();
-            if (IntegrationsPathLabel == ".") { IntegrationsPathLabel = "(Assets root)"; }
+            var IntegrationsPathLabel = ExportSettings.GetIntegrationSavePath();
             EditorGUILayout.SelectableLabel(IntegrationsPathLabel,
                 EditorStyles.textField,
                 GUILayout.MinWidth(SelectableLabelMinWidth),
                 GUILayout.Height(EditorGUIUtility.singleLineHeight));
 
-            if (GUILayout.Button(new GUIContent("...", "Browse to a new location for saving model prefabs"), EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth)))
+            if (GUILayout.Button(new GUIContent("...", "Browse to a new location for saving 3D application integrations"), EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth)))
             {
-                string initialPath = ExportSettings.GetAbsoluteSavePath();
+                string initialPath = ExportSettings.GetIntegrationSavePath();
 
                 // if the directory doesn't exist, set it to the default save path
                 // so we don't open somewhere unexpected
@@ -111,26 +110,18 @@ public override void OnInspectorGUI() {
                 }
 
                 string fullPath = EditorUtility.OpenFolderPanel(
-                        "Select Model Prefabs Path", initialPath, null
+                        "Select Integrations Path", initialPath, null
                         );
 
                 // Unless the user canceled, make sure they chose something in the Assets folder.
                 if (!string.IsNullOrEmpty(fullPath))
                 {
-                    var relativePath = ExportSettings.ConvertToAssetRelativePath(fullPath);
-                    if (string.IsNullOrEmpty(relativePath))
-                    {
-                        Debug.LogWarning("Please select a location in the Assets folder");
-                    }
-                    else
-                    {
-                        ExportSettings.SetRelativeSavePath(relativePath);
+                    ExportSettings.SetIntegrationSavePath(fullPath);
 
-                        // Make sure focus is removed from the selectable label
-                        // otherwise it won't update
-                        GUIUtility.hotControl = 0;
-                        GUIUtility.keyboardControl = 0;
-                    }
+                    // Make sure focus is removed from the selectable label
+                    // otherwise it won't update
+                    GUIUtility.hotControl = 0;
+                    GUIUtility.keyboardControl = 0;                    
                 }
             }
 
@@ -296,6 +287,8 @@ public static string kDefaultAdskRoot {
         public bool centerObjects;
         public bool launchAfterInstallation;
 
+        public string IntegrationSavePath;
+
         public int selectedDCCApp = 0;
 
         /// <summary>
@@ -324,6 +317,7 @@ protected override void LoadDefaults()
             centerObjects = true;
             launchAfterInstallation = true;
             convertToModelSavePath = kDefaultSavePath;
+            IntegrationSavePath = Directory.GetCurrentDirectory().ToString();
             dccOptionPaths = null;
             dccOptionNames = null;
         }
@@ -736,6 +730,16 @@ public static void SetRelativeSavePath(string newPath) {
             instance.convertToModelSavePath = NormalizePath(newPath, isRelative: true);
         }
 
+        public static string GetIntegrationSavePath()
+        {
+            return instance.IntegrationSavePath;
+        }
+
+        public static void SetIntegrationSavePath(string newPath)
+        {
+            instance.IntegrationSavePath = newPath;
+        }
+
         /// <summary>
         /// Convert an absolute path into a relative path like what you would
         /// get from GetRelativeSavePath.

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -643,8 +643,6 @@ private static string DefaultIntegrationSavePath
             }
         }
 
-        private static string LastIntegrationSavePath = DefaultIntegrationSavePath;
-
         public static void InstallDCCIntegration ()
         {
             var dccExe = GetDCCExe ();
@@ -683,24 +681,7 @@ private static bool GetIntegrationFolder(DCCIntegration dcc){
         private static bool DecompressIntegrationZipFile(string zipPath, DCCIntegration dcc)
         {
             string unzipFolder;
-            switch (Application.platform)
-            {
-                case RuntimePlatform.OSXEditor:
-                    unzipFolder = "/Applications/Autodesk";
-                    break;
-                case RuntimePlatform.WindowsEditor:
-                    unzipFolder = "C:/Program Files/Autodesk";
-                    break;
-                default:
-                    throw new System.NotImplementedException();
-            }
-
-            // prompt user to enter location to unzip file IF THEY WANT TO BE PROMPTED/////
-            unzipFolder = EditorUtility.OpenFolderPanel(string.Format("Select Location to Save {0} Integration", dcc.DccDisplayName),LastIntegrationSavePath,"");
-            if (string.IsNullOrEmpty (unzipFolder)) {
-                // user has cancelled, do nothing
-                return false;
-            }
+            unzipFolder = EditorTools.ExportSettings.GetIntegrationSavePath();
 
             // check that this is a valid location to unzip the file
             if (!DirectoryHasWritePermission (unzipFolder)) {
@@ -718,8 +699,6 @@ private static bool DecompressIntegrationZipFile(string zipPath, DCCIntegration
                 }
             }
 
-            LastIntegrationSavePath = unzipFolder;
-
             // if file already unzipped in this location, then prompt user
             // if they would like to continue unzipping or use what is there
             if (dcc.FolderAlreadyUnzippedAtPath (unzipFolder)) {