Merge pull request #136 from Unity-Technologies/UNI-23997-review-with-unity-open

Uni 23997 review with unity open

Author: vkovec

.gitignore

@@ -1,6 +1,7 @@
 ## Executable + Temp files ##
 *.exe
 *.exe.*
+!BringToFront.exe
 *.o
 *.pdb
 *.mdb

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -16,6 +16,8 @@ class Integrations
 
         private const string FBX_EXPORT_SETTINGS_PATH = "Integrations/Autodesk/maya/scripts/unityFbxExportSettings.mel";
 
+        private const string MAYA_INSTRUCTION_FILENAME = "_safe_to_delete/_temp.txt";
+
         public class MayaException : System.Exception {
             public MayaException() { }
             public MayaException(string message) : base(message) { }
@@ -177,8 +179,9 @@ static string AskVersion(string exePath) {
 #endif
 
         private static string MAYA_COMMANDS { get {
-                return string.Format("configureUnityOneClick {0}{1}{0} {0}{2}{0} {0}{3}{0} {0}{4}{0} {5}; scriptJob -idleEvent quit;",
-                    ESCAPED_QUOTE, GetProjectPath(), GetAppPath(), GetTempSavePath(), GetExportSettingsPath(), (IsHeadlessInstall()?1:0));
+                return string.Format("configureUnityOneClick {0}{1}{0} {0}{2}{0} {0}{3}{0} {0}{4}{0} {0}{5}{0} {6}; scriptJob -idleEvent quit;",
+                    ESCAPED_QUOTE, GetProjectPath(), GetAppPath(), GetTempSavePath(),
+                    GetExportSettingsPath(), GetMayaInstructionPath(), (IsHeadlessInstall()?1:0));
         }}
         private static Char[] FIELD_SEPARATORS = new Char[] {':'};
 
@@ -251,6 +254,25 @@ public static string GetTempSavePath()
             return FbxExporters.Review.TurnTable.TempSavePath.Replace("\\", "/");
         }
 
+        /// <summary>
+        /// Gets the maya instruction path relative to the Assets folder.
+        /// Assets folder is not included in the path.
+        /// </summary>
+        /// <returns>The relative maya instruction path.</returns>
+        public static string GetMayaInstructionPath()
+        {
+            return MAYA_INSTRUCTION_FILENAME;
+        }
+
+        /// <summary>
+        /// Gets the full maya instruction path as an absolute Unity path.
+        /// </summary>
+        /// <returns>The full maya instruction path.</returns>
+        public static string GetFullMayaInstructionPath()
+        {
+            return Application.dataPath + "/" + FbxExporters.Editor.Integrations.GetMayaInstructionPath ();
+        }
+
         /// <summary>
         /// Gets the path to the export settings file.
         /// Returns a relative path with forward slashes as path separators.

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -12,7 +12,7 @@ namespace FbxExporters
     namespace Review
     {
         [UnityEditor.InitializeOnLoad]
-        public class TurnTable
+        public class TurnTable : UnityEditor.AssetPostprocessor
         {
             const string DefaultScenesPath = "Assets";
             const string DefaultSceneName = "FbxExporters_TurnTableReview";
@@ -24,6 +24,25 @@ public class TurnTable
             static string LastFilePath = null;
             static Object LastModel = null;
 
+            static void OnPostprocessAllAssets(
+                string[] importedAssets, string[] deletedAssets, 
+                string[] movedAssets, string[] movedFromAssetPaths)
+            {
+                // check if a turntable model was potentially imported
+                var tempSavePath = "Assets/" + TempSavePath;
+                foreach (var assetPath in importedAssets) {
+                    if (assetPath.StartsWith(tempSavePath) && assetPath.EndsWith(".fbx")) {
+                        // if the instruction file exists, then run the turntable and delete the file
+                        string instructionFile = FbxExporters.Editor.Integrations.GetFullMayaInstructionPath ();
+                        if(System.IO.File.Exists(instructionFile)){
+                            LastSavedModel ();
+                            System.IO.File.Delete (instructionFile);
+                            break;
+                        }
+                    }
+                }
+            }
+
             private static System.IO.FileInfo GetLastSavedFile (string directoryPath, string ext = ".fbx")
             {
                 System.IO.DirectoryInfo directoryInfo = new System.IO.DirectoryInfo (directoryPath);
@@ -98,14 +117,9 @@ private static Object LoadModel (string fbxFileName)
                         turntableGO = new GameObject ("TurnTableBase");
                         turntableGO.AddComponent<FbxTurnTableBase> ();
                     }
-
                     modelGO.transform.parent = turntableGO.transform;
-
-                    UnityEditor.Selection.objects = new GameObject[]{ turntableGO };
                 }
 
-                FrameCameraOnModel (modelGO);
-
                 return modelGO as Object;
             }
 
@@ -124,6 +138,10 @@ private static Bounds GetRendererBounds(GameObject modelGO)
 
             private static void FrameCameraOnModel(GameObject modelGO)
             {
+                if (!modelGO) {
+                    return;
+                }
+
                 // Set so camera frames model
                 // Note: this code assumes the model is at 0,0,0
                 Vector3 boundsSize = GetRendererBounds(modelGO).size;
@@ -155,6 +173,19 @@ private static void LoadLastSavedModel ()
                         Debug.LogWarning (string.Format ("failed to load model : {0}", fbxFileName));
                     }
                 }
+
+                // focus onto model
+                if (LastModel) {
+                    var model = LastModel as GameObject;
+                    if (model) {
+                        var turntable = model.transform.parent;
+                        if (turntable) {
+                            var turntableGO = turntable.gameObject;
+                            UnityEditor.Selection.objects = new GameObject[]{ turntableGO };
+                            FrameCameraOnModel (turntableGO);
+                        }
+                    }
+                }
             }
 
             public static void LastSavedModel ()

Assets/FbxExporters/Editor/UnitTests/IntegrationsTest.cs

@@ -49,6 +49,8 @@ public void BasicTest() {
             LogNonEmptyString("package version", Editor.Integrations.GetPackageVersion());
             LogNonEmptyString("temp path", Editor.Integrations.GetTempSavePath());
             LogNonEmptyString("export settings path", Editor.Integrations.GetExportSettingsPath ());
+            LogNonEmptyString ("instruction path", Editor.Integrations.GetMayaInstructionPath ());
+            LogNonEmptyString ("full instruction path", Editor.Integrations.GetFullMayaInstructionPath ());
 
             // test that the paths don't contain backslashes
             Assert.IsFalse(Editor.Integrations.GetAppPath().Contains("\\"));

Assets/Integrations/Autodesk/maya/scripts/configureUnityOneClick.mel

@@ -1,12 +1,14 @@
 global proc configureUnityOneClick(
     string $unityProject, string $unityApp,
-    string $unityTempSavePath, string $unityFbxExportSettings, int $headless)
+    string $unityTempSavePath, string $unityFbxExportSettings,
+    string $mayaInstructionPath, int $headless)
 {
     // configure plugin settings
     optionVar -stringValue "UnityApp" $unityApp;
     optionVar -stringValue "UnityProject" $unityProject;
     optionVar -stringValue "UnityTempSavePath" $unityTempSavePath;
     optionVar -stringValue "UnityFbxExportSettings" $unityFbxExportSettings;
+    optionVar -stringValue "UnityInstructionPath" $mayaInstructionPath;
     optionVar -intValue "UnityOneClick_Headless" $headless;
 
     // configure auto load of plugin

Assets/Integrations/Autodesk/maya/scripts/install_maya_plugin.sh

@@ -58,10 +58,11 @@ else
     # Configure Maya Integration
     TEMP_SAVE_PATH="_safe_to_delete"
     EXPORT_SETTINGS_PATH="Integrations/Autodesk/maya/scripts/unityFbxExportSettings.mel"
+    MAYA_INSTRUCTION_PATH="_safe_to_delete/_temp.txt"
     HEADLESS=1
 
     # NOTE: we need start Maya in UI mode so that we can correctly configure the auto-load of the plugin.
-    "${MAYA_PATH}" -command "configureUnityOneClick \"${PROJECT_PATH}\" \"${UNITY_EDITOR_PATH}\" \"${TEMP_SAVE_PATH}\" \"${EXPORT_SETTINGS_PATH}\" ${HEADLESS}; scriptJob -idleEvent quit;"
+    "${MAYA_PATH}" -command "configureUnityOneClick \"${PROJECT_PATH}\" \"${UNITY_EDITOR_PATH}\" \"${TEMP_SAVE_PATH}\" \"${EXPORT_SETTINGS_PATH}\" \"${MAYA_INSTRUCTION_PATH}\" ${HEADLESS}; scriptJob -idleEvent quit;"
 fi
 
 exit 0

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

@@ -270,6 +270,11 @@ def doIt(self, args):
         unityProjectPath = maya.cmds.optionVar(q='UnityProject')
         unityTempSavePath = os.path.join(unityProjectPath, "Assets", maya.cmds.optionVar(q='UnityTempSavePath'))
         unityCommand = "FbxExporters.Review.TurnTable.LastSavedModel"
+        if maya.cmds.optionVar(exists='UnityInstructionPath'):
+            instructionFile = os.path.join(unityProjectPath, "Assets", maya.cmds.optionVar(q='UnityInstructionPath'))
+        else:
+            self.displayError("Missing Unity instruction file path, please re-install integration.")
+            return
 
         if not self.loadUnityFbxExportSettings():
             return
@@ -292,6 +297,10 @@ def doIt(self, args):
 
         maya.cmds.file(savePath, force=True, options="", typ="FBX export", pr=True, es=True)
 
+        # create temp file in _safe_to_delete/
+        with open(instructionFile,"w+") as f:
+            pass
+        
         if maya.cmds.about(macOS=True):
             # Use 'open -a' to bring app to front if it has already been started.
             # Note that the unity command will not get called.
@@ -303,8 +312,10 @@ def doIt(self, args):
                 .format(unityAppPath, unityProjectPath, unityCommand)
 
         elif maya.cmds.about(windows=True):
-            melCommand = r'system("start \"{0}\" \"{1}\" \"-projectPath {2} -executeMethod {3}\"");'\
-                .format(unityProjectPath + "/Assets/Integrations/BringToFront.exe", unityAppPath, unityProjectPath, unityCommand)
+            melCommand = r'system("start \"{0}\" \"{1}\" \"{2}\" \"-projectPath {3} -executeMethod {4}\"");'\
+                .format(unityProjectPath + "/Assets/Integrations/BringToFront.exe", 
+                        os.path.basename(unityProjectPath), unityAppPath,
+                        unityProjectPath, unityCommand)
 
         else:
             raise NotImplementedError("missing platform implementation for {0}".format(maya.cmds.about(os=True)))

Assets/Integrations/BringToFront.exe

@@ -47,16 +47,20 @@ static void Main(string[] args)
             {
                 if (!String.IsNullOrEmpty(process.MainWindowTitle))
                 {
+                    if(args.Length > 0 && !process.MainWindowTitle.Contains(args[0]))
+                    {
+                        continue;
+                    }
                     bringToFront(process.MainWindowTitle);
                     found = true;
                 }
             }
 
-            if(!found){
+            if(!found && args.Length > 1){
                 Process myProcess = new Process();
-                myProcess.StartInfo.FileName = args[0];
-                if(args.Length > 1){
-                    myProcess.StartInfo.Arguments = args[1]; 
+                myProcess.StartInfo.FileName = args[1];
+                if(args.Length > 2){
+                    myProcess.StartInfo.Arguments = args[2]; 
                 }
                 myProcess.Start();
             }