Merge remote-tracking branch 'origin/master' into Uni-32154_use_MAYA_LOCATION

Author: AJubrey

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -65,11 +65,7 @@ public override void OnInspectorGUI() {
             EditorGUILayout.SelectableLabel(pathLabel,
                 EditorStyles.textField,
                 GUILayout.MinWidth(SelectableLabelMinWidth),
-                GUILayout.Height(EditorGUIUtility.singleLineHeight));
-            GUILayout.EndHorizontal();
-            GUILayout.BeginHorizontal();
-
-            GUILayout.Space(LabelWidth + BrowseButtonOffset);
+                GUILayout.Height(EditorGUIUtility.singleLineHeight));            
 
             if (GUILayout.Button(new GUIContent("...", "Browse to a new location for saving model prefabs"), EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth)))
             {
@@ -105,6 +101,7 @@ public override void OnInspectorGUI() {
                     }
                 }
             }
+
             GUILayout.EndHorizontal();
 
             EditorGUILayout.Space();
@@ -123,11 +120,6 @@ public override void OnInspectorGUI() {
 
             exportSettings.selectedDCCApp = EditorGUILayout.Popup(exportSettings.selectedDCCApp, options);
 
-            GUILayout.EndHorizontal();
-            GUILayout.BeginHorizontal();
-
-            GUILayout.Space(LabelWidth + BrowseButtonOffset);
-
             if (GUILayout.Button(new GUIContent("...", "Browse to a 3D application in a non-default location"), EditorStyles.miniButton, GUILayout.Width(BrowseButtonWidth))) {
                 var ext = "";
                 switch (Application.platform) {
@@ -178,13 +170,15 @@ public override void OnInspectorGUI() {
 
             EditorGUILayout.Space();
 
-
+            // disable button if no 3D application is available
+            EditorGUI.BeginDisabledGroup (!ExportSettings.CanInstall());
             var installIntegrationContent = new GUIContent(
                     "Install Unity Integration",
                     "Install and configure the Unity integration for the selected 3D application so that you can import and export directly with this project.");
             if (GUILayout.Button (installIntegrationContent)) {
                 FbxExporters.Editor.IntegrationsUI.InstallDCCIntegration ();
             }
+            EditorGUI.EndDisabledGroup ();
 
             GUILayout.FlexibleSpace ();
             GUILayout.EndScrollView ();
@@ -649,9 +643,8 @@ public static GUIContent[] GetDCCOptions(){
                 instance.dccOptionNames = new List<string> ();
                 FindDCCInstalls ();
             }
-
-            // store the selected app
-            var prevSelection = instance.dccOptionPaths[instance.selectedDCCApp];
+            // store the selected app if any
+            string prevSelection = GetSelectedDCCPath();
 
             // remove options that no longer exist
             List<string> pathsToDelete = new List<string>();
@@ -791,12 +784,21 @@ public static bool IsEarlierThanMax2017(string AppName){
 
         public static string GetSelectedDCCPath()
         {
-            return (instance.dccOptionPaths.Count>0) ? instance.dccOptionPaths [instance.selectedDCCApp] : "";
+            return (instance.dccOptionPaths.Count>0 &&
+                instance.selectedDCCApp >= 0 &&
+                instance.selectedDCCApp < instance.dccOptionPaths.Count) ? instance.dccOptionPaths [instance.selectedDCCApp] : "";
         }
 
         public static string GetSelectedDCCName()
         {
-            return (instance.dccOptionPaths.Count>0) ? instance.dccOptionNames [instance.selectedDCCApp] : "";
+            return (instance.dccOptionNames.Count>0 &&
+                instance.selectedDCCApp >= 0 &&
+                instance.selectedDCCApp < instance.dccOptionNames.Count) ? instance.dccOptionNames [instance.selectedDCCApp] : "";
+        }
+
+        public static bool CanInstall()
+        {
+            return instance.dccOptionPaths.Count > 0;
         }
 
         /// <summary>

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -839,6 +839,11 @@ protected bool ExportCamera (GameObject unityGO, FbxScene fbxScene, FbxNode fbxN
 
                 fbxNode.SetNodeAttribute (fbxCamera);
 
+                // set +90 post rotation to counteract for FBX camera's facing +X direction by default
+                fbxNode.SetPostRotation(FbxNode.EPivotSet.eSourcePivot, new FbxVector4(0,90,0));
+                // have to set rotation active to true in order for post rotation to be applied
+                fbxNode.SetRotationActive (true);
+
                 // make the last camera exported the default camera
                 DefaultCamera = fbxNode.GetName ();
 
@@ -943,7 +948,12 @@ protected int ExportComponents (
                     return -1;
                 }
 
-                fbxNode.SetVisibility (unityGo.activeSelf);
+                // Default inheritance type in FBX is RrSs, which causes scaling issues in Maya as
+                // both Maya and Unity use RSrs inheritance by default.
+                // Note: MotionBuilder uses RrSs inheritance by default as well, though it is possible
+                //       to select a different inheritance type in the UI.
+                // Use RSrs as the scaling inhertiance instead.
+                fbxNode.SetTransformationInheritType (FbxTransform.EInheritType.eInheritRSrs);
 
                 ExportTransform ( unityGo.transform, fbxNode, newCenter, exportType);
 

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -306,6 +306,9 @@ public FbxRepresentation(Transform xfo, bool isRoot = true)
                         m_children.Add(child.name, new FbxRepresentation(child, isRoot: false));
                     }
                     foreach(var component in xfo.GetComponents<Component>()) {
+                        // ignore missing components
+                        if (component == null) { continue; }
+
                         // Don't save the prefab link, to avoid a logic loop.
                         if (component is FbxPrefab) { continue; }
 
@@ -759,6 +762,10 @@ void ClassifyComponents(Transform newFbx, Transform prefab)
                         componentTypes[componentType.ToString()] = componentType;
                     }
                     foreach(var component in prefab.GetComponentsInChildren<Component>()) {
+                        // ignore missing components
+                        if (component == null) {
+                            continue;
+                        }
                         var componentType = component.GetType();
                         componentTypes[componentType.ToString()] = componentType;
                     }
@@ -983,13 +990,40 @@ public HashSet<GameObject> ImplementUpdates(FbxPrefab prefabInstance)
                                 prefabComponent = prefabXfo.gameObject.AddComponent(fbxComponent.t);
                                 Log("created component {0}:{1}", nodeName, fbxComponent.t);
                             }
-                            // Check that the component exists before copying to it.
-                            // This happens for Rect Transform components as the fbx
-                            // contains a Transform which it tries to add/update on the
-                            // prefab, but fails because you cannot have both a Transform
-                            // and a Rect Transform
-                            // UNI-29179 TODO: better handling of Rect Transforms
+
+                            //If the prefabComponent has not been assigned yet,
+                            //it means that we couldn't find it, and that we tried to add it but that it seems like it already exists.
                             if (!prefabComponent) {
+                                //This is to confirm that it is a RectTransform
+                                index = prefabComponents.FindIndex(x => x.GetType() == typeof(RectTransform));
+
+                                if (index < 0)
+                                {
+                                    Log("The component could not be found or added, and was not a RectTransform");
+                                    continue;
+                                }
+
+                                prefabComponent = prefabComponents[index];
+                                prefabComponents.RemoveAt(index);
+
+                                GameObject tempGameObject = new GameObject();
+                                try
+                                {                                    
+                                    Transform tempTransform = tempGameObject.transform;
+
+                                    UnityEditor.EditorJsonUtility.FromJsonOverwrite(fbxComponent.jsonValue, tempTransform);
+
+                                    var rectTransform = prefabComponent as RectTransform;
+                                    rectTransform.localRotation = tempTransform.localRotation;
+                                    rectTransform.localPosition = tempTransform.localPosition;
+                                    rectTransform.localScale = tempTransform.localScale;
+                                }
+                                finally
+                                {
+                                    GameObject.DestroyImmediate(tempGameObject);
+                                }
+
+                                Log("updated component {0}:{1}", nodeName, typeof(RectTransform));
                                 continue;
                             }
                             // Now set the values.

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -352,6 +352,7 @@ public int ConfigureMaya(string mayaPath)
                 myProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
                 myProcess.StartInfo.CreateNoWindow = true;
                 myProcess.StartInfo.UseShellExecute = false;
+                myProcess.StartInfo.RedirectStandardError = true;
 
                 string commandString;
 
@@ -386,6 +387,14 @@ public int ConfigureMaya(string mayaPath)
                     ExitCode = myProcess.ExitCode;
                     Debug.Log(string.Format("Ran maya: [{0}]\nWith args [{1}]\nResult {2}",
                                 mayaPath, myProcess.StartInfo.Arguments, ExitCode));
+
+                    // see if we got any error messages
+                    if(ExitCode != 0){
+                        string stderr = myProcess.StandardError.ReadToEnd();
+                        if(!string.IsNullOrEmpty(stderr)){
+                            Debug.LogError(string.Format("Maya installation error (exit code: {0}): {1}", ExitCode, stderr));
+                        }
+                    }
                 }
                 else
                 {
@@ -625,6 +634,7 @@ public static int InstallMaxPlugin(string maxExe){
                 myProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
                 myProcess.StartInfo.CreateNoWindow = true;
                 myProcess.StartInfo.UseShellExecute = false;
+                myProcess.StartInfo.RedirectStandardOutput = true;
 
                 myProcess.StartInfo.Arguments = string.Format("-q -silent -mxs \"{0}\"", installScript);
 
@@ -644,6 +654,14 @@ public static int InstallMaxPlugin(string maxExe){
                     ExitCode = 0;
                 }
 
+                // print any errors
+                if(ExitCode != 0){
+                    string stderr = myProcess.StandardOutput.ReadToEnd();
+                    if(!string.IsNullOrEmpty(stderr)){
+                        Debug.LogError(string.Format("3ds Max installation error (exit code: {0}): {1}", ExitCode, stderr));
+                    }
+                }
+
                 Debug.Log(string.Format("Ran max: [{0}]\nWith args [{1}]\nResult {2}",
                     maxExe, myProcess.StartInfo.Arguments, ExitCode));
             }

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -197,8 +197,8 @@ public void TestFindPreferredProgram()
             ExportSettings.instance.SetDCCOptionNames(testList);
 
             int preferred = ExportSettings.instance.GetPreferredDCCApp();
-            //While Maya 2017 and 3ds Max 2017 are tied for most recent, Maya 2017 should win because we prefer Maya.
-            Assert.AreEqual(preferred, 9);
+            //While Maya 2017 and 3ds Max 2017 are tied for most recent, Maya 2017 (index 8) should win because we prefer Maya.
+            Assert.AreEqual(preferred, 8);
 
             ExportSettings.instance.ClearDCCOptionNames();
             //Try running it with an empty list

Assets/FbxExporters/Editor/UnitTests/FbxPrefabAutoUpdaterTest.cs

@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using System.IO;
 using System.Collections.Generic;
+using FbxExporters.Editor;
 
 namespace FbxExporters.UnitTests
 {
@@ -54,6 +55,62 @@ public void BasicTest ()
                         imported));
         }
 
+        [Test]
+        public void RectTransformTest ()
+        {
+            Vector3 scaleForward = new Vector3(1,2,3);
+            Vector3 positionForward = new Vector3(100, 200, 300);
+            Vector3 rotationForward = new Vector3(1,2,3);
+
+            Vector3 scaleBackward = new Vector3(3, 2, 1);
+            Vector3 positionBackward = new Vector3(300, 200, 100);
+            Vector3 rotationBackward = new Vector3(3,2,1);
+
+            //Create a hierarchy with a RectTransform
+            var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            var capsule = GameObject.CreatePrimitive(PrimitiveType.Capsule);
+            capsule.AddComponent<RectTransform>();
+            
+            capsule.GetComponent<RectTransform>().localScale = scaleForward;
+            capsule.GetComponent<RectTransform>().localPosition = positionForward;
+            capsule.GetComponent<RectTransform>().localRotation = Quaternion.Euler(rotationForward);
+
+            capsule.transform.parent = cube.transform;
+
+            string filePath = GetRandomFbxFilePath();
+
+            //instantiate our hierarchy as a prefab
+            var oldInstance = ConvertToModel.Convert(cube, fbxFullPath: filePath);
+            Assert.IsTrue(oldInstance);
+
+            Assert.IsTrue(oldInstance.transform.GetChild(0).GetComponent<RectTransform>().localScale == scaleForward);
+            Assert.IsTrue(oldInstance.transform.GetChild(0).GetComponent<RectTransform>().localPosition == positionForward);
+            Assert.IsTrue(oldInstance.transform.GetChild(0).GetComponent<RectTransform>().localRotation == Quaternion.Euler(rotationForward));
+
+            //Create an "updated" hierarchy
+            var cube2 = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            var capsule2 = GameObject.CreatePrimitive(PrimitiveType.Capsule);
+            capsule2.AddComponent<RectTransform>();
+
+            capsule2.GetComponent<RectTransform>().localScale = scaleBackward;
+            capsule2.GetComponent<RectTransform>().localPosition = positionBackward;
+            capsule2.GetComponent<RectTransform>().localRotation = Quaternion.Euler(rotationBackward);
+
+            capsule2.transform.parent = cube2.transform;        
+
+            //export our updated hierarchy to the same file path as the original
+            SleepForFileTimestamp();
+            FbxExporters.Editor.ModelExporter.ExportObject(filePath, cube2);
+            AssetDatabase.Refresh();
+
+            Assert.IsTrue(oldInstance.transform.GetChild(0).GetComponent<RectTransform>().localScale == scaleBackward);
+            Assert.IsTrue(oldInstance.transform.GetChild(0).GetComponent<RectTransform>().localPosition == positionBackward);
+            Assert.IsTrue(oldInstance.transform.GetChild(0).GetComponent<RectTransform>().localRotation == Quaternion.Euler(rotationBackward));
+
+            GameObject.DestroyImmediate(cube);
+            GameObject.DestroyImmediate(cube2);
+        }
+
         [Test]
         public void ReplaceTest ()
         {

Assets/FbxExporters/Editor/UnitTests/IntegrationsTest.cs

@@ -41,7 +41,7 @@ public void BasicTest() {
                 LogNonEmptyString ("display name", mayaIntegration.DccDisplayName);
                 LogNonEmptyString ("integration zip path", mayaIntegration.IntegrationZipPath);
 
-                Assert.IsFalse (Editor.MayaIntegration.IsHeadlessInstall () == 0);
+                Assert.IsTrue (Editor.MayaIntegration.IsHeadlessInstall () == 0);
 
                 LogNonEmptyString ("module template path", mayaIntegration.GetModuleTemplatePath ());
                 LogNonEmptyString ("package path", Editor.MayaIntegration.GetPackagePath ());

Assets/FbxExporters/Editor/UnitTests/ModelExporterTest.cs

@@ -349,6 +349,7 @@ public void TestExportCamera(){
             camera.nearClipPlane = 19;
             camera.farClipPlane = 500.6f;
 
+            filename = GetRandomFbxFilePath (); // export to a different file
             fbxCamera = ExportCamera (filename, cameraObj);
             CompareCameraValues (camera, fbxCamera);
             Assert.AreEqual (camera.orthographicSize, fbxCamera.orthographicSize);
@@ -376,69 +377,5 @@ private void CompareCameraValues(Camera camera, Camera fbxCamera, float delta=0.
             Assert.AreEqual (camera.nearClipPlane, fbxCamera.nearClipPlane, delta);
             Assert.AreEqual (camera.farClipPlane, fbxCamera.farClipPlane, delta);
         }
-
-        [Test]
-        public void TestNodeVisibility()
-        {
-            // create test hierarchy
-            // root (enabled)
-            // -- parent1 (enabled)
-            // ---- child3 (disabled)
-            // -- parent2 (disabled)
-            // ---- child1 (disabled)
-            // ---- child2 (enabled)
-
-            var root = GameObject.CreatePrimitive(PrimitiveType.Cube);
-            root.name = "root";
-            var parent1 = GameObject.CreatePrimitive(PrimitiveType.Cube);
-            parent1.name = "parent1";
-            var parent2 = GameObject.CreatePrimitive(PrimitiveType.Cube);
-            parent2.name = "parent2";
-            var child1 = GameObject.CreatePrimitive(PrimitiveType.Cube);
-            child1.name = "child1";
-            var child2 = GameObject.CreatePrimitive(PrimitiveType.Cube);
-            child2.name = "child2";
-            var child3 = GameObject.CreatePrimitive (PrimitiveType.Cube);
-            child3.name = "child3";
-
-            parent1.transform.SetParent (root.transform);
-            parent2.transform.SetParent (root.transform);
-            child1.transform.SetParent (parent2.transform);
-            child2.transform.SetParent (parent2.transform);
-            child3.transform.SetParent (parent1.transform);
-
-            root.SetActive (true);
-            parent1.SetActive (true);
-            child2.SetActive (true);
-            parent2.SetActive (false);
-            child1.SetActive (false);
-            child3.SetActive (false);
-
-            string filename = GetRandomFbxFilePath ();
-            ModelExporter.ExportObject (filename, root);
-
-            GameObject fbxObj = AssetDatabase.LoadMainAssetAtPath (filename) as GameObject;
-
-            // check root
-            CheckObjectVisibility (fbxObj, true);
-
-            // check child nodes
-            foreach (Transform child in fbxObj.transform) {
-                var isParent1 = child.name.Equals ("parent1");
-                CheckObjectVisibility (child.gameObject, isParent1);
-
-                // all children should be disabled
-                foreach (Transform c in child) {
-                    CheckObjectVisibility (c.gameObject, false);
-                }
-            }
-        }
-
-        private void CheckObjectVisibility(GameObject obj, bool expectedVisibility){
-            Assert.IsTrue (obj.activeSelf);
-            var renderer = obj.GetComponent<MeshRenderer> ();
-            Assert.IsNotNull (renderer);
-            Assert.AreEqual(expectedVisibility, renderer.enabled);
-        }
     }
 }