Merge branch 'master' into uni-23392-maya-versions

Conflict in InstallIntegration,
Namespace change to ReviewLastSavedModel,
New test in the IntegrationsTest for the new functionality from the merge.

Author: Benoit Hudson

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -175,8 +175,8 @@ static string AskVersion(string exePath) {
 #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[] {':'};
 
@@ -244,6 +244,11 @@ public 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("\\", "/");
+        }
+
         public 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.Editor.Integrations.GetTempSavePath ();
                 System.IO.FileInfo fileInfo = GetLastSavedFile (modelPath);
 
                 return (fileInfo != null) ? fileInfo.FullName : null;
@@ -81,15 +83,32 @@ 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> ();
                     }
                 }
 
+                FrameCameraOnModel (modelGO);
+
                 return modelGO as Object;
             }
 
+            private static void FrameCameraOnModel(GameObject modelGO)
+            {
+                // Set so camera frames model
+                // Note: this code assumes the model is at 0,0,0
+                Vector3 boundsSize = modelGO.GetComponent<Renderer>().bounds.size;
+                float distance = Mathf.Max(boundsSize.x, boundsSize.y, boundsSize.z);
+                distance /= (2.0f * Mathf.Tan(0.5f * Camera.main.fieldOfView * Mathf.Deg2Rad));
+                Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, Camera.main.transform.position.y, -distance * 2.0f);
+
+                // rotate camera towards model
+                Camera.main.transform.LookAt(modelGO.transform.position);
+            }
+
             private static void LoadLastSavedModel ()
             {
                 string fbxFileName = GetLastSavedFilePath ();
@@ -179,13 +198,46 @@ public static void LastSavedModel ()
                 // make turntable the active scene
                 UnityEngine.SceneManagement.SceneManager.SetActiveScene (scene);
 
+                // create camera and light if none
+                if (Camera.main == null) {
+                    GameObject camera = new GameObject ("MainCamera");
+                    camera.AddComponent<Camera> ();
+                    camera.tag = "MainCamera";
+                }
+                
+                if(!Object.FindObjectOfType<Light>()){
+                    GameObject light = new GameObject ("Light");
+                    light.transform.localEulerAngles = new Vector3 (50, -30, 0);
+                    Light lightComp = light.AddComponent<Light> ();
+                    lightComp.type = LightType.Directional;
+                    lightComp.intensity = 1;
+                    lightComp.shadows = LightShadows.Soft;
+                }
+
+                // maximize game window and start playing
+                var gameWindow = GetMainGameView();
+                if (gameWindow) {
+                    gameWindow.maximized = true;
+                    UnityEditor.EditorApplication.isPlaying = true;
+                } else {
+                    Debug.LogWarning ("Failed to access Game Window, please restart Unity to try again.");
+                }
+
                 if (AutoUpdateEnabled ()) {
                     LoadLastSavedModel ();
 
                     SubscribeToEvents ();
                 }
             }
 
+            public static UnityEditor.EditorWindow GetMainGameView()
+            {
+                System.Reflection.Assembly assembly = typeof(UnityEditor.EditorWindow).Assembly;
+                System.Type type = assembly.GetType("UnityEditor.GameView");
+                UnityEditor.EditorWindow gameview = UnityEditor.EditorWindow.GetWindow(type, false, null, true);
+                return gameview;
+            }
+
             private static void SubscribeToEvents ()
             {
                 // ensure we only subscribe once

Assets/FbxExporters/Editor/UnitTests/IntegrationsTest.cs

@@ -47,6 +47,7 @@ public void BasicTest() {
             LogNonEmptyString("project path", Editor.Integrations.GetProjectPath());
             LogNonEmptyString("package path", Editor.Integrations.GetPackagePath());
             LogNonEmptyString("package version", Editor.Integrations.GetPackageVersion());
+            LogNonEmptyString("temp path", Editor.Integrations.GetTempSavePath());
         }
     }
 }

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.