Merge pull request #490 from Unity-Technologies/UT-2995-export-anim-curve-tangents

Ut 2995 export anim curve tangents

Author: vkovec

com.unity.formats.fbx/Editor/FbxExportSettings.cs

@@ -460,7 +460,7 @@ public bool HideSendToUnityMenuProperty
         }
 
         [SerializeField]
-        private bool BakeAnimation = true;
+        private bool BakeAnimation = false;
         internal bool BakeAnimationProperty
         {
             get { return BakeAnimation; }
@@ -578,7 +578,7 @@ internal override void LoadDefaults()
             integrationSavePath = DefaultIntegrationSavePath;
             dccOptionPaths = null;
             dccOptionNames = null;
-            BakeAnimationProperty = true;
+            BakeAnimationProperty = false;
             ExportModelSettings = ScriptableObject.CreateInstance (typeof(ExportModelSettings)) as ExportModelSettings;
             exportModelSettingsSerialize = ExportModelSettings.info;
             ShowConvertToPrefabDialog = true;

com.unity.formats.fbx/Editor/FbxExporter.cs

@@ -1715,6 +1715,13 @@ internal static HashSet<float> GetSampleTimes(AnimationCurve[] animCurves, doubl
                 lastTime = System.Math.Max(lastTime, ac[ac.length-1].time);
             }
 
+            // if these values didn't get set there were no valid anim curves,
+            // so don't return any keys
+            if(firstTime == double.MaxValue || lastTime == double.MinValue)
+            {
+                return keyTimes;
+            }
+
             int firstframe = (int)System.Math.Floor(firstTime * sampleRate);
             int lastframe = (int)System.Math.Ceiling(lastTime * sampleRate);
             for (int i = firstframe; i <= lastframe; i++) {
@@ -1745,23 +1752,9 @@ internal static HashSet<float> GetKeyTimes(AnimationCurve[] animCurves)
         /// NOTE : This is a work in progress (WIP). We only export the key time and value on
         /// a Cubic curve using the default tangents.
         /// </summary>
-        internal void ExportAnimationKeys (AnimationCurve uniAnimCurve, FbxAnimCurve fbxAnimCurve, 
+        internal static void ExportAnimationKeys (AnimationCurve uniAnimCurve, FbxAnimCurve fbxAnimCurve, 
             UnityToMayaConvertSceneHelper convertSceneHelper)
         {
-            // TODO: complete the mapping between key tangents modes Unity and FBX
-            Dictionary<AnimationUtility.TangentMode, List<FbxAnimCurveDef.ETangentMode>> MapUnityKeyTangentModeToFBX =
-                new Dictionary<AnimationUtility.TangentMode, List<FbxAnimCurveDef.ETangentMode>>
-            {
-                //TangeantAuto|GenericTimeIndependent|GenericClampProgressive
-                {AnimationUtility.TangentMode.Free, new List<FbxAnimCurveDef.ETangentMode>{FbxAnimCurveDef.ETangentMode.eTangentAuto,FbxAnimCurveDef.ETangentMode.eTangentGenericClampProgressive}},
-
-                //TangeantAuto|GenericTimeIndependent
-                {AnimationUtility.TangentMode.Auto, new List<FbxAnimCurveDef.ETangentMode>{FbxAnimCurveDef.ETangentMode.eTangentAuto,FbxAnimCurveDef.ETangentMode.eTangentGenericTimeIndependent}},
-
-                //TangeantAuto|GenericTimeIndependent|GenericClampProgressive
-                {AnimationUtility.TangentMode.ClampedAuto, new List<FbxAnimCurveDef.ETangentMode>{FbxAnimCurveDef.ETangentMode.eTangentAuto,FbxAnimCurveDef.ETangentMode.eTangentGenericClampProgressive}},
-            };
-
             // Copy Unity AnimCurve to FBX AnimCurve.
             // NOTE: only cubic keys are supported by the FbxImporter
             using (new FbxAnimCurveModifyHelper(new List<FbxAnimCurve>{fbxAnimCurve}))
@@ -1773,24 +1766,44 @@ internal void ExportAnimationKeys (AnimationCurve uniAnimCurve, FbxAnimCurve fbx
 
                     int fbxKeyIndex = fbxAnimCurve.KeyAdd (fbxTime);
 
-                    fbxAnimCurve.KeySet (fbxKeyIndex, 
-                        fbxTime, 
-                        convertSceneHelper.Convert(uniKeyFrame.value)
-                    );
 
                     // configure tangents
                     var lTangent = AnimationUtility.GetKeyLeftTangentMode(uniAnimCurve, keyIndex);
                     var rTangent = AnimationUtility.GetKeyRightTangentMode(uniAnimCurve, keyIndex);
 
-                    if (!(MapUnityKeyTangentModeToFBX.ContainsKey(lTangent) && MapUnityKeyTangentModeToFBX.ContainsKey(rTangent)))
+                    // Always set tangent mode to eTangentBreak, as other modes are not handled the same in FBX as in
+                    // Unity, thus leading to discrepancies in animation curves.
+                    FbxAnimCurveDef.ETangentMode tanMode = FbxAnimCurveDef.ETangentMode.eTangentBreak;
+
+                    // Default to cubic interpolation, which is the default for KeySet
+                    FbxAnimCurveDef.EInterpolationType interpMode = FbxAnimCurveDef.EInterpolationType.eInterpolationCubic;
+                    switch (rTangent)
                     {
-                        Debug.LogWarning(string.Format("key[{0}] missing tangent mapping ({1},{2})", keyIndex, lTangent.ToString(), rTangent.ToString()));
-                        continue;
+                        case AnimationUtility.TangentMode.Linear:
+                            interpMode = FbxAnimCurveDef.EInterpolationType.eInterpolationLinear;
+                            break;
+                        case AnimationUtility.TangentMode.Constant:
+                            interpMode = FbxAnimCurveDef.EInterpolationType.eInterpolationConstant;
+                            break;
+                        default:
+                            break;
                     }
 
-                    // TODO : handle broken tangents
-
-                    // TODO : set key tangents
+                    fbxAnimCurve.KeySet (fbxKeyIndex, 
+                        fbxTime, 
+                        convertSceneHelper.Convert(uniKeyFrame.value),
+                        interpMode,
+                        tanMode,
+                        // value of right slope
+                        convertSceneHelper.Convert(uniKeyFrame.outTangent),
+                        // value of next left slope
+                        keyIndex < uniAnimCurve.length -1 ? convertSceneHelper.Convert(uniAnimCurve[keyIndex+1].inTangent) : 0,
+                        FbxAnimCurveDef.EWeightedMode.eWeightedAll,
+                        // weight for right slope
+                        uniKeyFrame.outWeight,
+                        // weight for next left slope
+                        keyIndex < uniAnimCurve.length - 1 ? uniAnimCurve[keyIndex + 1].inWeight : 0
+                    );
                 }
             }
         }
@@ -1934,9 +1947,7 @@ private void ExportAnimationCurve (FbxNode fbxNode,
                 // AxisSystem (LeftHanded to RightHanded) and FBX's default units 
                 // (Meters to Centimetres)
                 var convertSceneHelper = new UnityToMayaConvertSceneHelper (uniPropertyName);
-
-                // TODO: we'll resample the curve so we don't have to 
-                // configure tangents
+                
                 if (ModelExporter.ExportSettings.BakeAnimationProperty) {
                     ExportAnimationSamples (uniAnimCurve, fbxAnimCurve, frameRate, convertSceneHelper);
                 } else {
@@ -2117,8 +2128,15 @@ private void ExportAnimationClip (AnimationClip uniAnimClip, GameObject uniRoot,
                         continue;
                     } 
 
+                    // If this is an euler curve with a prerotation, then need to sample animations to remove the prerotation.
+                    // Otherwise can export normally with tangents.
                     index = EulerCurve.GetEulerIndex (propertyName);
-                    if (index >= 0) {
+                    if (index >= 0 && 
+                        // still need to sample euler curves if baking is specified
+                        (ModelExporter.ExportSettings.BakeAnimationProperty ||
+                        // also need to make sure to sample if there is a prerotation, as this is baked into the Unity curves
+                        fbxNode.GetPreRotation(FbxNode.EPivotSet.eSourcePivot).Distance(new FbxVector4()) > 0)) {
+
                         RotationCurve rotCurve = GetRotationCurve<EulerCurve> (uniGO, uniAnimClip.frameRate, ref rotations);
                         rotCurve.SetCurve (index, uniAnimCurve);
                         continue;

com.unity.formats.fbx/Editor/FbxPropertyChannelPair.cs

@@ -61,7 +61,8 @@ public PropertyChannelMap(Dictionary<string,string> propertyMap, Dictionary<stri
                 { "Motion T", "Lcl Translation" },
                 { "m_TranslationOffset", "Translation" },
                 { "m_ScaleOffset", "Scaling" },
-                { "m_RotationOffset", "Rotation" }
+                { "m_RotationOffset", "Rotation" },
+                { "localEulerAnglesRaw", "Lcl Rotation" }
             };
 
         /// <summary>

com.unity.formats.fbx/Editor/FbxRotationCurve.cs

@@ -58,10 +58,7 @@ private Key [] ComputeKeys(UnityEngine.Quaternion restRotation, FbxNode node) {
             fbxPreRotationInverse.Inverse();
 
             // Find when we have keys set.
-            var keyTimes = 
-                (UnityEditor.Formats.Fbx.Exporter.ModelExporter.ExportSettings.BakeAnimationProperty) 
-                ? ModelExporter.GetSampleTimes(GetCurves(), SampleRate) 
-                : ModelExporter.GetKeyTimes(GetCurves());
+            var keyTimes = ModelExporter.GetSampleTimes(GetCurves(), SampleRate);
 
             // Convert to the Key type.
             var keys = new Key[keyTimes.Count];
@@ -120,9 +117,6 @@ public void Animate(Transform unityTransform, FbxNode fbxNode, FbxAnimLayer fbxA
                 }
             }
 
-            // Uni-35616 unroll curves to preserve continuous rotations
-            var fbxCurveNode = fbxNode.LclRotation.GetCurveNode(fbxAnimLayer, false /*should already exist*/);
-
             if (Verbose) {
                 Debug.Log("Exported rotation animation for " + fbxNode.GetName());
             }

com.unity.formats.fbx/Tests/Models/Player/Player.controller

@@ -22,32 +22,6 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1102 &380199431843810593
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: EulerAnimation 0
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: dfbbf56ceff8a4b31b6f69b12073eefc, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
 --- !u!1102 &1102573189940394992
 AnimatorState:
   serializedVersion: 5
@@ -86,9 +60,6 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 1102573189940394992}
     m_Position: {x: 250, y: 170, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 380199431843810593}
-    m_Position: {x: 285, y: 235, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []