Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-23240-bring-Unity-to-front-Windows

vkovec · vkovec · commit a867da3228df · 2017-08-17T14:35:46.000-04:00
diff --git a/Assets/FbxExporters/Editor/FbxPrefabInspector.cs b/Assets/FbxExporters/Editor/FbxPrefabInspector.cs
@@ -8,8 +8,16 @@ public class FbxPrefabInspector : UnityEditor.Editor {
         public override void OnInspectorGUI() {
             FbxPrefab fbxPrefab = (FbxPrefab)target;
 
+            // We can only change these settings when applied to a prefab.
+            bool isDisabled = AssetDatabase.GetAssetPath(fbxPrefab) == "";
+            if (isDisabled) {
+                EditorGUILayout.HelpBox("Please select a prefab. You can't edit an instance in the scene.",
+                        MessageType.Info);
+            }
+            EditorGUI.BeginDisabledGroup(isDisabled);
+
             fbxPrefab.SetAutoUpdate(EditorGUILayout.Toggle ("Auto-update:", fbxPrefab.WantsAutoUpdate()));
-            if (!fbxPrefab.WantsAutoUpdate()) {
+            if (!isDisabled && !fbxPrefab.WantsAutoUpdate()) {
                 if (GUILayout.Button("Sync prefab to FBX")) {
                     fbxPrefab.SyncPrefab();
                 }
@@ -30,6 +38,8 @@ public override void OnInspectorGUI() {
             EditorGUILayout.SelectableLabel(fbxPrefab.GetFbxHistory().ToJson());
             GUILayout.EndHorizontal();
 #endif
+
+            EditorGUI.EndDisabledGroup();
         }
     }
 }
diff --git a/Assets/FbxExporters/Editor/InstallIntegration.cs b/Assets/FbxExporters/Editor/InstallIntegration.cs
diff --git a/Assets/FbxExporters/Editor/ReviewLastSavedModel.cs b/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
diff --git a/Assets/FbxExporters/Editor/UnitTests/IntegrationsTest.cs b/Assets/FbxExporters/Editor/UnitTests/IntegrationsTest.cs
@@ -0,0 +1,53 @@
+using UnityEngine;
+using UnityEditor;
+using System.IO;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace FbxExporters.UnitTests
+{
+    public class IntegrationsTest {
+        string m_oldMayaLocation;
+
+        [SetUp]
+        public void ClearEnv() {
+            m_oldMayaLocation = System.Environment.GetEnvironmentVariable ("MAYA_LOCATION");
+            System.Environment.SetEnvironmentVariable("MAYA_LOCATION", null);
+        }
+
+        [TearDown]
+        public void ResetEnv() {
+            System.Environment.SetEnvironmentVariable("MAYA_LOCATION", m_oldMayaLocation);
+        }
+
+        void LogNonEmptyString(string name, string str) {
+            Debug.Log(name + ": " + str);
+            Assert.IsFalse(string.IsNullOrEmpty(str));
+        }
+
+        [Test]
+        public void BasicTest() {
+            // Note: This test assumes that Maya is actually installed in a default location.
+            Assert.IsTrue(Directory.Exists(Editor.Integrations.MayaVersion.AdskRoot));
+
+            var maya = new Editor.Integrations.MayaVersion();
+
+            LogNonEmptyString("location", maya.Location);
+            LogNonEmptyString("binary  ", maya.MayaExe);
+            LogNonEmptyString("version ", maya.Version);
+
+            Assert.IsFalse(Editor.Integrations.IsHeadlessInstall());
+
+            LogNonEmptyString("module path (2017)", Editor.Integrations.GetModulePath("2017"));
+            LogNonEmptyString("module template path (2017)", Editor.Integrations.GetModuleTemplatePath("2017"));
+            Assert.That( () => Editor.Integrations.GetModuleTemplatePath("bad version"),
+                    Throws.Exception.TypeOf<Editor.Integrations.MayaException>());
+
+            LogNonEmptyString("app path", Editor.Integrations.GetAppPath());
+            LogNonEmptyString("project path", Editor.Integrations.GetProjectPath());
+            LogNonEmptyString("package path", Editor.Integrations.GetPackagePath());
+            LogNonEmptyString("package version", Editor.Integrations.GetPackageVersion());
+            LogNonEmptyString("temp path", Editor.Integrations.GetTempSavePath());
+        }
+    }
+}
diff --git a/Assets/FbxExporters/README.txt b/Assets/FbxExporters/README.txt
@@ -11,16 +11,26 @@ Requirements
 
 * [FBX SDK C# Bindings](https://github.com/Unity-Technologies/FbxSharp)
 
-Command-line Installing Maya2017 Integration
+Installing Maya Integration
 --------------------------------------------
 
-You can install the package and integrations from the command-line using the following script:
+The easy way to install the Maya integration is with the
+        FbxExporters -> Install Maya Integration
+menu option in Unity.
+
+It uses the most recent version of Maya it can find.  Set your MAYA_LOCATION
+environment before running Unity if you want to specify a particular version of Maya.
+
+
+Alternately, you can install the package and integrations from the command-line
+using the following script:
+
 
 MacOS:
 
 # Configure where Unity is installed
-if [ ! -f "${UNITY3D_PATH}" ]; then
-    UNITY3D_PATH="/Applications/Unity/Unity.app/Contents/MacOS/Unity"
+if [ ! -d "${UNITY3D_PATH}" ]; then
+    UNITY3D_PATH="/Applications/Unity/Unity.app"
 fi
 
 # Configure which Unity project to install package
@@ -33,23 +43,24 @@ if [ ! -f "${PACKAGE_PATH}" ]; then
     PACKAGE_PATH=`ls -t ${PROJECT_PATH}/FbxExporters_*.unitypackage | head -1`
 fi
 
-if [ ! -f "${UNITY3D_PATH}" ]; then
+# Configuring Maya2017 to auto-load integration
+if [ ! -d "${MAYA_LOCATION}" ] ; then
+    MAYA_LOCATION=/Applications/Autodesk/maya2017/Maya.app
+fi
+export MAYA_LOCATION
+
+if [ ! -d "${UNITY3D_PATH}" ]; then
     echo "Unity is not installed"
+elif [ ! -d "${MAYA_LOCATION}" ] ; then
+    echo "Maya is not installed"
 else
     # Install FbxExporters package
-    "${UNITY3D_PATH}" -projectPath "${PROJECT_PATH}" -importPackage ${PACKAGE_PATH} -quit
-
-    # Install Maya2017 Integration
-    "${UNITY3D_PATH}" -batchMode -projectPath "${PROJECT_PATH}" -executeMethod FbxExporters.Integrations.InstallMaya2017 -quit
+    "${UNITY3D_PATH}/Contents/MacOS/Unity" -projectPath "${PROJECT_PATH}" -importPackage ${PACKAGE_PATH} -quit
 
-    # Configuring Maya2017 to auto-load integration
-    MAYA_PATH=/Applications/Autodesk/maya2017/Maya.app/Contents/bin/maya
+    # Install Maya Integration. Requires MAYA_LOCATION.
+    "${UNITY3D_PATH}/Contents/MacOS/Unity" -batchMode -projectPath "${PROJECT_PATH}" -executeMethod FbxExporters.Integrations.InstallMaya -quit
 
-    if [ ! -f "${MAYA_PATH}" ]; then
-        echo "Maya2017 not installed"
-    else
-        # To configure without user interface change the last argument to 1 instead of 0
-        "${MAYA_PATH}" -command "configureUnityOneClick \"${PROJECT_PATH}\" \"${UNITY3D_PATH}\" 0; scriptJob -idleEvent quit;"
-    fi
+    # To configure without user interface change the last argument to 1 instead of 0
+    "${MAYA_LOCATION}/Contents/MacOS/Maya" -command "configureUnityOneClick \"${PROJECT_PATH}\" \"${UNITY3D_PATH}\" 0; scriptJob -idleEvent quit;"
 fi
 
diff --git a/Assets/FbxExporters/RotateModel.cs b/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);	
+    }
+}
diff --git a/Assets/Integrations/Autodesk/maya2017/README.txt b/Assets/Integrations/Autodesk/maya2017/README.txt
@@ -13,17 +13,28 @@
 #
 ########################################################################
 
+Automatic Installation
+===================
+
+The easiest installation method is to launch Unity and use the
+        FbxExporters -> Install Maya Integration
+option.
+
+It will choose the most recent version of Maya installed in the default
+installation location. To choose a particular version of Maya or to handle
+non-default installation locations, set the MAYA_LOCATION environment variable.
+
 Manual Installation
 ===================
 
 Instructions for installing if you don't use the unity package installer
-and your installing in a none-default location.
+and your installing in a non-default location.
 
 1. copy unityoneclick.mod to user folder
 
     MacOS & Ubuntu: ~/MayaProjects/modules
     Windows:        C:\Program Files\Autodesk\Maya2017\modules
-    
+
 2. configure path within unityoneclick.mod to point to integration installation folder
 
     {UnityProject}/Assets/Integrations/Autodesk/maya2017
@@ -42,4 +53,4 @@ export PYTHONPATH=${MAYA_INTEGRATION_PATH}/scripts
 ${MAYAPY_PATH} ${MAYA_INTEGRATION_PATH}/scripts/run_all_tests.py
 
 # run one test
-${MAYAPY_PATH} ${MAYA_INTEGRATION_PATH}/scripts/unityOneClick/commands.py
+${MAYAPY_PATH} ${MAYA_INTEGRATION_PATH}/scripts/unityOneClick/commands.py
diff --git a/Assets/Integrations/Autodesk/maya2017/scripts/configureUnityOneClick.mel b/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
diff --git a/Assets/Integrations/Autodesk/maya2017/scripts/unityOneClick/commands.py b/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.
diff --git a/Assets/Integrations/Autodesk/maya2017/unityoneclick.txt b/Assets/Integrations/Autodesk/maya2017/unityoneclick.txt
@@ -13,4 +13,4 @@
 #
 ########################################################################
 
-+ MAYAVERSION:2017 unityoneclick {Version} {UnityProject}/Assets/Integrations/Autodesk/maya2017
++ unityoneclick {Version} {UnityProject}/Assets/Integrations/Autodesk/maya2017

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`#`
`14`	`14`	`########################################################################`
`15`	`15`
`16`		`-+ MAYAVERSION:2017 unityoneclick {Version} {UnityProject}/Assets/Integrations/Autodesk/maya2017`
	`16`	`++ unityoneclick {Version} {UnityProject}/Assets/Integrations/Autodesk/maya2017`