add unit test

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -92,9 +92,11 @@ public static GameObject[] CreateInstantiatedModelPrefab (
                                 // don't re-export fbx
                                 // create prefab out of model instance in scene, link to existing fbx
                                 var mainAsset = PrefabUtility.GetPrefabParent(go) as GameObject;
-                                var mainAssetRelPath = AssetDatabase.GetAssetOrScenePath(mainAsset);
+                                var mainAssetRelPath = AssetDatabase.GetAssetPath(mainAsset);
                                 var mainAssetAbsPath = Directory.GetParent(Application.dataPath) + "/" + mainAssetRelPath;
                                 SetupFbxPrefab(go, mainAsset, mainAssetRelPath, mainAssetAbsPath);
+
+                                wasExported.Add(go);
                                 continue;
                             }
                         }
@@ -181,6 +183,13 @@ public static GameObject Convert (
             }
 
 
+            /// <summary>
+            /// Create the fbx prefab and connect it to the given fbx asset. 
+            /// </summary>
+            /// <param name="toConvert">Hierarchy to convert.</param>
+            /// <param name="unityMainAsset">Main asset in the FBX.</param>
+            /// <param name="projectRelativePath">Fbx project relative path.</param>
+            /// <param name="fbxFullPath">Fbx full path.</param>
             public static void SetupFbxPrefab(GameObject toConvert, GameObject unityMainAsset, string projectRelativePath, string fbxFullPath){
                 // Set up the FbxPrefab component so it will auto-update.
                 // Make sure to delete whatever FbxPrefab history we had.

Assets/FbxExporters/Editor/UnitTests/ConvertToModelTest.cs

@@ -256,5 +256,61 @@ public void TestInstanceNameMatchesFilename()
 
             Assert.AreEqual (Path.GetFileNameWithoutExtension (path), cube.name);
         }
+
+        [Test]
+        public void TestConvertModelInstance()
+        {
+            // expected result: prefab is linked to originally exported
+            //                  fbx and no new fbx is created.
+
+            // create hierarchy (Cube->Sphere)
+            var cube = GameObject.CreatePrimitive (PrimitiveType.Cube);
+            var sphere = GameObject.CreatePrimitive (PrimitiveType.Sphere);
+
+            sphere.transform.SetParent (cube.transform);
+
+            // export using regular model export
+            var filename = GetRandomFileNamePath();
+            GameObject fbxObj = ExportSelection (filename, cube);
+
+            // add back to scene
+            GameObject fbxInstance = PrefabUtility.InstantiatePrefab (fbxObj) as GameObject;
+            Assert.That (fbxInstance, Is.Not.Null);
+
+            // attach some components
+            var rigidBody = fbxInstance.AddComponent<Rigidbody> ();
+            Assert.That (rigidBody, Is.Not.Null);
+
+            var instanceSphere = fbxInstance.transform.GetChild (0);
+            Assert.That (instanceSphere, Is.Not.Null);
+
+            var boxCollider = instanceSphere.gameObject.AddComponent<BoxCollider> ();
+            Assert.That (boxCollider, Is.Not.Null);
+
+            // convert to prefab
+            GameObject[] converted = ConvertToModel.CreateInstantiatedModelPrefab (new GameObject[]{ fbxInstance }, Path.GetDirectoryName(filename));
+
+            Assert.That (converted.Length, Is.EqualTo(1));
+            Assert.That (converted [0], Is.EqualTo (fbxInstance));
+
+            // check meshes link to original fbx
+            var prefabCubeMesh = fbxInstance.GetComponent<MeshFilter>().sharedMesh;
+            Assert.That (prefabCubeMesh, Is.Not.Null);
+
+            var fbxObjAssetPath = AssetDatabase.GetAssetPath (fbxObj);
+
+            Assert.That (AssetDatabase.GetAssetPath (prefabCubeMesh), Is.EqualTo (fbxObjAssetPath));
+
+            var prefabSphere = fbxInstance.transform.GetChild (0);
+            Assert.That (prefabSphere, Is.Not.Null);
+            var prefabSphereMesh = prefabSphere.GetComponent<MeshFilter> ().sharedMesh;
+            Assert.That (prefabSphere, Is.Not.Null);
+
+            Assert.That (AssetDatabase.GetAssetPath (prefabSphereMesh), Is.EqualTo (fbxObjAssetPath));
+
+            // check that components are still there
+            Assert.That (fbxInstance.GetComponent<Rigidbody>(), Is.Not.Null);
+            Assert.That (prefabSphere.GetComponent<BoxCollider> (), Is.Not.Null);
+        }
     }
 }

Assets/FbxExporters/Editor/UnitTests/ExporterTestBase.cs

@@ -223,7 +223,10 @@ protected virtual GameObject ExportSelection(params Object[] selected)
         {
             // export selected to a file, then return the root
             var filename = GetRandomFileNamePath();
+            return ExportSelection (filename, selected);
+        }
 
+        protected virtual GameObject ExportSelection(string filename, params Object[] selected){
             Debug.unityLogger.logEnabled = false;
             var fbxFileName = FbxExporters.Editor.ModelExporter.ExportObjects (filename, selected) as string;
             Debug.unityLogger.logEnabled = true;