Merge pull request #223 from Unity-Technologies/Uni-29179_Handle_RectTransforms_in_export

Uni-29179 Handle Rect Transforms import / export

Author: inwoods

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -983,13 +983,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/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 ()
         {