export rotation offsets

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1993,8 +1993,10 @@ public UnityToMayaConvertSceneHelper(string uniPropertyName)
 
                     bool partT = uniPropertyName.StartsWith ("m_LocalPosition.", cc) || uniPropertyName.StartsWith("m_TranslationOffset.", cc);
                     bool partTx = uniPropertyName.EndsWith ("Position.x", cc) || uniPropertyName.EndsWith ("T.x", cc) || uniPropertyName.EndsWith("TranslationOffset.x", cc);
+                    bool partRyz = uniPropertyName.StartsWith("m_RotationOffset", cc) && (uniPropertyName.EndsWith(".y") || uniPropertyName.EndsWith(".z"));
 
                     convertLtoR |= partTx;
+                    convertLtoR |= partRyz;
 
                     convertDistance |= partT;
                     convertDistance |= uniPropertyName.StartsWith ("m_Intensity", cc);
@@ -2029,12 +2031,19 @@ struct FbxPropertyChannelPair {
                     { "S", "Lcl Scaling" },
                     { "m_LocalPosition", "Lcl Translation" },
                     { "T", "Lcl Translation" },
+                    { "m_TranslationOffset", "Translation" },
+                    { "m_ScaleOffset", "Scaling" },
+                    { "m_RotationOffset", "Rotation" }
+                };
+
+                private static Dictionary<string, string> AimConstraintProperties = new Dictionary<string, string>()
+                {
                     { "m_AimVector", "AimVector" },
                     { "m_UpVector", "UpVector" },
                     { "m_WorldUpVector", "WorldUpVector" },
-                    { "m_TranslationOffset", "Translation" },
-                    { "m_ScaleOffset", "Scaling" }
+                    { "m_RotationOffset", "RotationOffset" }
                 };
+
                 private static Dictionary<string, string> TransformChannels = new Dictionary<string, string>()
                 {
                     { "x", Globals.FBXSDK_CURVENODE_COMPONENT_X },
@@ -2059,7 +2068,9 @@ struct FbxPropertyChannelPair {
                 };
                 private static Dictionary<string, string> ConstraintSourceProperties = new Dictionary<string, string>()
                 {
-                    { "m_Sources\\.Array\\.data\\[(\\d+)\\]\\.weight", "{0}.Weight" }
+                    { "m_Sources\\.Array\\.data\\[(\\d+)\\]\\.weight", "{0}.Weight" },
+                    { "m_TranslationOffsets\\.Array\\.data\\[(\\d+)\\]", "{0}.Offset T" },
+                    { "m_RotationOffsets\\.Array\\.data\\[\\d+)\\]", "{0}.Offset R" }
                 };
 
                 public FbxPropertyChannelPair(string p, string c) : this() {
@@ -2150,9 +2161,21 @@ public static bool TryGetValue(string uniPropertyName, out FbxPropertyChannelPai
                         return true;
                     }
 
-                    if(constraint != null && TryGetConstraintSourceChannelPairs(uniPropertyName, constraint, ref prop))
+                    if(constraint != null)
                     {
-                        return true;
+                        // Aim constraint shares the RotationOffset property with RotationConstraint, so make sure that the correct FBX property is returned
+                        if (constraint.GetConstraintType() == FbxConstraint.EType.eAim)
+                        {
+                            if (TryGetChannelPairs(uniPropertyName, propFormat, AimConstraintProperties, TransformChannels, ref prop))
+                            {
+                                return true;
+                            }
+                        }
+
+                        if (TryGetConstraintSourceChannelPairs(uniPropertyName, constraint, ref prop))
+                        {
+                            return true;
+                        }
                     }
 
                     return false;

Assets/FbxExporters/Editor/UnitTests/FbxConstraintTest.cs

@@ -15,12 +15,20 @@ public static IEnumerable TestCases
             {
                 /* Test Weight */
                 yield return new TestCaseData(typeof(RotationConstraint), new float[] { 1f, 20f, 30f }, new float[] { 0f, 0.5f, 1f }, "m_Weight").Returns(1);
-                yield return new TestCaseData(typeof(RotationConstraint), new float[] { 2, 9, 33 },  new float[] { 0.1f, 0.67f, 0.2f }, "m_Sources.Array.data[0].weight").Returns(1);
+                yield return new TestCaseData(typeof(RotationConstraint), new float[] { 2, 9, 33 }, new float[] { 0.1f, 0.67f, 0.2f }, "m_Sources.Array.data[0].weight").Returns(1);
+
+                /* Test Rotation */
+                yield return new TestCaseData(typeof(RotationConstraint), new float[] { 1, 0.3f, 10f }, new float[] { -4, 39, 45 }, "m_RotationOffset.x").Returns(1);
+                yield return new TestCaseData(typeof(RotationConstraint), new float[] { 1, 4f, 3f }, new float[] { -4, -39, 145 }, "m_RotationOffset.y").Returns(1);
+                yield return new TestCaseData(typeof(RotationConstraint), new float[] { 1.2f, 0.8f, 10.3f }, new float[] { 194, 9, 195 }, "m_RotationOffset.z").Returns(1);
 
                 /* Test Aim */
                 yield return new TestCaseData(typeof(AimConstraint), new float[] { 1f, 30f, 10f }, new float[] { 10f, 180f, 10f }, "m_AimVector.x").Returns(1);
                 yield return new TestCaseData(typeof(AimConstraint), new float[] { 1f, 30f, 10f }, new float[] { 90f, 45f, 60f }, "m_AimVector.y").Returns(1);
                 yield return new TestCaseData(typeof(AimConstraint), new float[] { 1f, 30f, 10f }, new float[] { 10f, 180f, 10f }, "m_AimVector.z").Returns(1);
+                yield return new TestCaseData(typeof(AimConstraint), new float[] { 1, 0.3f, 10f }, new float[] { -4, 39, 45 }, "m_RotationOffset.x").Returns(1);
+                yield return new TestCaseData(typeof(AimConstraint), new float[] { 1, 4f, 3f }, new float[] { -4, -39, 145 }, "m_RotationOffset.y").Returns(1);
+                yield return new TestCaseData(typeof(AimConstraint), new float[] { 1.2f, 0.8f, 10.3f }, new float[] { 194, 9, 195 }, "m_RotationOffset.z").Returns(1);
 
                 yield return new TestCaseData(typeof(AimConstraint), new float[] { 1f, 2f, 4f }, new float[] { 100f, 80f, 19f }, "m_UpVector.x").Returns(1);
                 yield return new TestCaseData(typeof(AimConstraint), new float[] { 1f, 2f, 4f }, new float[] { 4f, 154f, 454f }, "m_UpVector.y").Returns(1);