Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-22026-project-settings-turntable-scene

Author: vkovec

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -25,8 +25,8 @@ class Integrations
 #endif
 
         private static string MAYA_COMMANDS { get { 
-            return string.Format("configureUnityOneClick {3}{0}{3} {3}{1}{3} {2}; scriptJob -idleEvent quit;", 
-                GetProjectPath(), GetAppPath(), (IsHeadlessInstall()?1:0), ESCAPED_QUOTE); 
+                return string.Format("configureUnityOneClick {0}{1}{0} {0}{2}{0} {0}{3}{0} {4}; scriptJob -idleEvent quit;", 
+                    ESCAPED_QUOTE, GetProjectPath(), GetAppPath(), GetTempSavePath(), (IsHeadlessInstall()?1:0)); 
         }}
         private static Char[] FIELD_SEPARATORS = new Char[] {':'};
 
@@ -111,6 +111,11 @@ private static string GetPackagePath()
             return System.IO.Path.Combine(Application.dataPath, PACKAGE_NAME);
         }
 
+        public static string GetTempSavePath()
+        {
+            return System.IO.Path.Combine(Application.dataPath, FbxExporters.Review.TurnTable.TempSavePath).Replace("\\", "/");
+        }
+
         private static string GetPackageVersion()
         {
             string result = null;

Assets/FbxExporters/Editor/ReviewLastSavedModel.cs

@@ -12,6 +12,8 @@ class TurnTable
             const string ScenesPath = "Assets";
             const string SceneName = "FbxExporters_TurnTableReview";
 
+            public const string TempSavePath = "_safe_to_delete";
+
             static string LastFilePath = null;
             static Object LastModel = null;
 
@@ -50,7 +52,7 @@ private static string GetSceneFilePath ()
 
             private static string GetLastSavedFilePath ()
             {
-                string modelPath = FbxExporters.EditorTools.ExportSettings.GetAbsoluteSavePath ();
+                string modelPath = FbxExporters.Integrations.GetTempSavePath ();
                 System.IO.FileInfo fileInfo = GetLastSavedFile (modelPath);
 
                 return (fileInfo != null) ? fileInfo.FullName : null;
@@ -81,9 +83,11 @@ private static Object LoadModel (string fbxFileName)
                     modelGO = UnityEditor.PrefabUtility.InstantiatePrefab (unityMainAsset) as GameObject;
 
                     GameObject turntableGO = GameObject.Find ("TurnTable");
-                    if (turntableGO!=null)
-                    {
+                    if (turntableGO != null) {
                         modelGO.transform.parent = turntableGO.transform;
+                        turntableGO.AddComponent<RotateModel> ();
+                    } else {
+                        modelGO.AddComponent<RotateModel> ();
                     }
                 }
 

Assets/FbxExporters/RotateModel.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class RotateModel : MonoBehaviour {
+
+    [Tooltip("Rotation speed in degrees/second")]
+    [SerializeField]
+    private float speed = 10f;
+    
+    void Update () {
+        transform.Rotate (Vector3.up, speed * Time.deltaTime, Space.World);	
+    }
+}

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

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

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

@@ -129,8 +129,17 @@ def doIt(self, args):
 
         unityAppPath = maya.cmds.optionVar(q='UnityApp')
         unityProjectPath = maya.cmds.optionVar(q='UnityProject')
+        unityTempSavePath = maya.cmds.optionVar(q='UnityTempSavePath')
         unityCommand = "FbxExporters.Review.TurnTable.LastSavedModel"
 
+        # make sure the GamePipeline and fbxmaya plugins are loaded
+        if self.loadDependencies() and self.loadPlugin('fbxmaya.mll'):
+            # 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));
+        
         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.