Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-24203-remove-version-from-integration-folder

Author: vkovec

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -98,6 +98,18 @@ public override void OnInspectorGUI() {
             );
 
             GUILayout.EndHorizontal ();
+
+            EditorGUILayout.Space ();
+            if (GUILayout.Button (new GUIContent ("Auto Review",
+                "Opens turntable review of last saved prefab."))) {
+                FbxExporters.Review.TurnTable.LastSavedModel ();
+            }
+
+            EditorGUILayout.Space ();
+            if (GUILayout.Button ("Install Maya Integration")) {
+                FbxExporters.Editor.IntegrationsUI.InstallMayaIntegration ();
+            }
+
             GUILayout.FlexibleSpace ();
             GUILayout.EndScrollView ();
 

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -185,11 +185,11 @@ private static string MAYA_COMMANDS { get {
         private const string MODULE_TEMPLATE_PATH = "Integrations/Autodesk/maya/" + MODULE_FILENAME + ".txt";
 
 #if UNITY_EDITOR_OSX
-        private const string MAYA_MODULES_PATH = "Library/Preferences/Autodesk/Maya/"+VERSION_TAG+"/modules";
+        private const string MAYA_MODULES_PATH = "Library/Preferences/Autodesk/Maya/modules";
 #elif UNITY_EDITOR_LINUX
-        private const string MAYA_MODULES_PATH = "Maya/"+VERSION_TAG+"/modules";
+        private const string MAYA_MODULES_PATH = "Maya/modules";
 #else
-        private const string MAYA_MODULES_PATH = "maya/"+VERSION_TAG+"/modules";
+        private const string MAYA_MODULES_PATH = "maya/modules";
 #endif
 
         private static string GetUserFolder()
@@ -248,17 +248,17 @@ public static string GetPackagePath()
 
         public static string GetTempSavePath()
         {
-            return System.IO.Path.Combine(Application.dataPath, FbxExporters.Review.TurnTable.TempSavePath).Replace("\\", "/");
+            return FbxExporters.Review.TurnTable.TempSavePath.Replace("\\", "/");
         }
 
         /// <summary>
         /// Gets the path to the export settings file.
-        /// Returns an absolute path with forward slashes as path separators.
+        /// Returns a relative path with forward slashes as path separators.
         /// </summary>
         /// <returns>The export settings path.</returns>
         public static string GetExportSettingsPath()
         {
-            return Application.dataPath + '/' + FBX_EXPORT_SETTINGS_PATH;
+            return FBX_EXPORT_SETTINGS_PATH;
         }
 
         public static string GetPackageVersion()
@@ -499,32 +499,26 @@ public static bool InstallMaya(MayaVersion version = null, bool verbose = false)
         }
     }
 
-    namespace Editors
+    class IntegrationsUI
     {
-        class IntegrationsUI
+        public static void InstallMayaIntegration ()
         {
-            const string MenuItemName1 = "FbxExporters/Install Maya Integration";
-
-            [MenuItem (MenuItemName1, false, 0)]
-            public static void OnMenuItem1 ()
-            {
-                var mayaVersion = new Integrations.MayaVersion();
-                if (!Integrations.InstallMaya(mayaVersion, verbose: true)) {
-                    return;
-                }
+            var mayaVersion = new Integrations.MayaVersion();
+            if (!Integrations.InstallMaya(mayaVersion, verbose: true)) {
+                return;
+            }
 
-                int exitCode = Integrations.ConfigureMaya (mayaVersion);
+            int exitCode = Integrations.ConfigureMaya (mayaVersion);
 
-                string title, message;
-                if (exitCode != 0) {
-                    title = string.Format("Failed to install Maya {0} Integration.", mayaVersion.Version);
-                    message = string.Format("Failed to configure Maya, please check logs (exitcode={0}).", exitCode);
-                } else {
-                    title = string.Format("Completed installation of Maya {0} Integration.", mayaVersion.Version);
-                    message = string.Format("Enjoy the new \"Unity\" menu in Maya {0}.", mayaVersion.Version);
-                }
-                UnityEditor.EditorUtility.DisplayDialog (title, message, "Ok");
+            string title, message;
+            if (exitCode != 0) {
+                title = string.Format("Failed to install Maya {0} Integration.", mayaVersion.Version);
+                message = string.Format("Failed to configure Maya, please check logs (exitcode={0}).", exitCode);
+            } else {
+                title = string.Format("Completed installation of Maya {0} Integration.", mayaVersion.Version);
+                message = string.Format("Enjoy the new \"Unity\" menu in Maya {0}.", mayaVersion.Version);
             }
+            UnityEditor.EditorUtility.DisplayDialog (title, message, "Ok");
         }
     }
 }

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -14,8 +14,6 @@ namespace Review
         [UnityEditor.InitializeOnLoad]
         public class TurnTable
         {
-            const string MenuItemName = "FbxExporters/Turntable Review/Autoload Last Saved Prefab";
-
             const string DefaultScenesPath = "Assets";
             const string DefaultSceneName = "FbxExporters_TurnTableReview";
 
@@ -26,12 +24,6 @@ public class TurnTable
             static string LastFilePath = null;
             static Object LastModel = null;
 
-            [UnityEditor.MenuItem (MenuItemName, false, 10)]
-            public static void OnMenu ()
-            {
-                LastSavedModel ();
-            }
-
             private static System.IO.FileInfo GetLastSavedFile (string directoryPath, string ext = ".fbx")
             {
                 System.IO.DirectoryInfo directoryInfo = new System.IO.DirectoryInfo (directoryPath);
@@ -59,9 +51,14 @@ private static string GetSceneFilePath ()
                 return System.IO.Path.Combine (DefaultScenesPath, DefaultSceneName + ".unity");
             }
 
+            /// <summary>
+            /// Gets the last saved file path as a Unity-style (only forward slashes)
+            /// absolute path.
+            /// </summary>
+            /// <returns>The last saved file path.</returns>
             private static string GetLastSavedFilePath ()
             {
-                string modelPath = FbxExporters.Editor.Integrations.GetTempSavePath ();
+                string modelPath = Application.dataPath + "/" + TempSavePath;
                 System.IO.FileInfo fileInfo = GetLastSavedFile (modelPath);
 
                 return (fileInfo != null) ? fileInfo.FullName : null;

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -165,7 +165,7 @@ public void TestGetSetFields()
                     Path.DirectorySeparatorChar);
 
             var defaultAbsolutePath = ExportSettings.GetAbsoluteSavePath();
-            var dataPath = Path.Combine(appDataPath, ExportSettings.kDefaultSavePath);
+            var dataPath = Path.GetFullPath(Path.Combine(appDataPath, ExportSettings.kDefaultSavePath));
             Assert.AreEqual(dataPath, defaultAbsolutePath);
 
             // set; check that the saved value is platform-independent,

Assets/Integrations/Autodesk/maya/scripts/unityOneClick/commands.py

@@ -58,13 +58,25 @@ def loadPlugin(self, plugin):
         return True
 
     def loadDependencies(self):
-        return self.loadPlugin('GamePipeline.mll') and self.loadPlugin('fbxmaya.mll')
+        # GamePipeline plugin 'SendToUnitySelection' command used in Publish
+        pluginsToLoad = ['GamePipeline', 'fbxmaya']
+        
+        ext = "mll"
+        if maya.cmds.about(macOS=True):
+            ext = "bundle"
+            
+        # iterate over all the plugins, loading them with extenstion ext, and combining the results
+        # to return if any of the loads failed
+        return reduce((lambda result, plugin: result and self.loadPlugin("{0}.{1}".format(plugin, ext))),
+                        pluginsToLoad,
+                        True)
 
     def loadUnityFbxExportSettings(self):
         """
         Load the Export Settings from file
         """
-        fileName = maya.cmds.optionVar(q="UnityFbxExportSettings")
+        projectPath = maya.cmds.optionVar(q="UnityProject")
+        fileName = os.path.join(projectPath,"Assets", maya.cmds.optionVar(q="UnityFbxExportSettings"))
         if not os.path.isfile(fileName):
             maya.cmds.error("Failed to find Unity Fbx Export Settings at: {0}".format(fileName))
             return False
@@ -135,9 +147,6 @@ def beforeImport(self, retCode, file, clientData):
         if not self.setExists(self._exportSet):
             # couldn't find export set so create it
             maya.cmds.sets(name=self._exportSet)
-        else:    
-            # remove all items from set
-            maya.cmds.sets(clear=self._exportSet)
 
         # reset attribute values, in case import fails
         self.storeAttribute(self._exportSet, self._unityFbxFilePathAttr, "")
@@ -149,19 +158,41 @@ def beforeImport(self, retCode, file, clientData):
     def afterImport(self, *args, **kwargs):
         if self._tempPath:
             self.storeAttribute(self._exportSet, self._unityFbxFilePathAttr, self._tempPath)
+            
+            # Change Unity project if fbx is from a different Unity project.
+            # Get the project based on the folder structure (i.e. folder above Assets)
+            head,tail = os.path.split(self._tempPath)
+            # Check that we are not at the root directory.
+            # os.path.dirname(head) returns the last directory name in the path, 
+            # or head if head is the root directory.
+            while head and os.path.dirname(head) != head:
+                if tail == "Assets":
+                    # this is a valid Unity project, so set it
+                    maya.cmds.optionVar(sv=('UnityProject', head))
+                    break
+                head,tail = os.path.split(head)
+                
         if self._tempName:
             self.storeAttribute(self._exportSet, self._unityFbxFileNameAttr, self._tempName)
 
         if self.setExists(self._exportSet):
             # figure out what has been added after import
             itemsInScene = maya.cmds.ls(tr=True, o=True, r=True)
+
             newItems = list(set(itemsInScene) - set(self._origItemsInScene))
 
             # add newly imported items to set
-            maya.cmds.sets(newItems, add=self._exportSet)
+            if len(newItems) > 0:
+                maya.cmds.sets(newItems, include=self._exportSet)
 
     def doIt(self, args):
         self.loadDependencies()
+        
+        # set Unity project as the current workspace
+        currWorkspace = maya.cmds.workspace(o=True, q=True)
+        unityProject = maya.cmds.optionVar(q='UnityProject')
+        if unityProject:
+            maya.cmds.workspace(unityProject, o=True)
 
         self._tempPath = None
         self._tempName = None
@@ -176,6 +207,9 @@ def doIt(self, args):
 
         OpenMaya.MMessage.removeCallback(callbackId)
         OpenMaya.MMessage.removeCallback(callbackId2)
+        
+        if currWorkspace:
+            maya.cmds.workspace(currWorkspace, o=True)
 
     @classmethod
     def invoke(cls):
@@ -218,7 +252,7 @@ def doIt(self, args):
 
         unityAppPath = maya.cmds.optionVar(q='UnityApp')
         unityProjectPath = maya.cmds.optionVar(q='UnityProject')
-        unityTempSavePath = maya.cmds.optionVar(q='UnityTempSavePath')
+        unityTempSavePath = os.path.join(unityProjectPath, "Assets", maya.cmds.optionVar(q='UnityTempSavePath'))
         unityCommand = "FbxExporters.Review.TurnTable.LastSavedModel"
 
         if not self.loadUnityFbxExportSettings():
@@ -236,8 +270,10 @@ def doIt(self, args):
         # save fbx to Assets/_safe_to_delete/
         savePath = unityTempSavePath
         maya.cmds.sysFile(savePath, makeDir=True)
-        savePath = savePath + "/TurnTableModel.fbx"
-        maya.mel.eval(r'file -force -options "" -typ "FBX export" -pr -es "{0}"'.format(savePath));
+        savePath = os.path.join(savePath, "TurnTableModel.fbx")
+        savePath = os.path.abspath(savePath)
+        
+        maya.cmds.file(savePath, force=True, options="", typ="FBX export", pr=True, es=True)
 
         if maya.cmds.about(macOS=True):
             # Use 'open -a' to bring app to front if it has already been started.

Assets/Integrations/Autodesk/maya/scripts/unityOneClick/ui.py

@@ -59,7 +59,6 @@ def installMenu():
     maya.cmds.menuItem(parent=kMainWndMenuName, label=commands.importCmd.kShortLabel, command=commands.importCmd.kScriptCommand)        # @UndefinedVariable
     maya.cmds.menuItem(parent=kMainWndMenuName, label=commands.reviewCmd.kShortLabel, command=commands.reviewCmd.kScriptCommand)    # @UndefinedVariable
     maya.cmds.menuItem(parent=kMainWndMenuName, label=commands.publishCmd.kShortLabel, command=commands.publishCmd.kScriptCommand)    # @UndefinedVariable
-    maya.cmds.menuItem(parent=kMainWndMenuName, label=commands.configureCmd.kShortLabel, command=commands.configureCmd.kScriptCommand)        # @UndefinedVariable
 
 def uninstallMenu():
     """