Merge pull request #222 from Unity-Technologies/UNI-30583-hide-disabled-gameobjects-in-fbx

UNI-30583 set visibility of fbx nodes according to whether the GO is enabled

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -944,6 +944,8 @@ protected int ExportComponents (
                     return -1;
                 }
 
+                fbxNode.SetVisibility (unityGo.activeSelf);
+
                 ExportTransform ( unityGo.transform, fbxNode, newCenter, exportType);
 
                 // try export mesh

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 ());
+                Assert.IsFalse (Editor.MayaIntegration.IsHeadlessInstall () == 0);
 
                 LogNonEmptyString ("module template path", mayaIntegration.GetModuleTemplatePath ());
                 LogNonEmptyString ("package path", Editor.MayaIntegration.GetPackagePath ());

Assets/FbxExporters/Editor/UnitTests/ModelExporterTest.cs

@@ -376,5 +376,69 @@ 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);
+        }
     }
 }