clean up implementation + still sample eulers with prerotation

Author: vkovec

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

@@ -1745,23 +1745,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, string uniPropertyName)
         {
-            // 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}))
@@ -1781,13 +1767,6 @@ internal void ExportAnimationKeys (AnimationCurve uniAnimCurve, FbxAnimCurve fbx
                     FbxAnimCurveDef.EInterpolationType interpMode = FbxAnimCurveDef.EInterpolationType.eInterpolationCubic;
                     switch (rTangent)
                     {
-                        /*case AnimationUtility.TangentMode.Auto:
-                        case AnimationUtility.TangentMode.ClampedAuto:
-                            tanMode = FbxAnimCurveDef.ETangentMode.eTangentAuto;
-                            break;
-                        case AnimationUtility.TangentMode.Free:
-                            tanMode = FbxAnimCurveDef.ETangentMode.eTangentUser;
-                            break;*/
                         case AnimationUtility.TangentMode.Linear:
                             interpMode = FbxAnimCurveDef.EInterpolationType.eInterpolationLinear;
                             break;
@@ -1799,21 +1778,17 @@ internal void ExportAnimationKeys (AnimationCurve uniAnimCurve, FbxAnimCurve fbx
                             break;
                     }
 
-                    float tangentMultiplier = 100;
+                    float tangentMultiplier = UnitScaleFactor;
                     if(uniPropertyName.StartsWith("localEulerAnglesRaw"))
                     {
                         tangentMultiplier = 1;
                     }
-                    if(uniPropertyName == "m_LocalPosition.x" || uniPropertyName == "localEulerAnglesRaw.y" || uniPropertyName == "localEulerAnglesRaw.z")
-                    {
-                        tangentMultiplier *= -1; // have to negate x when switching between Unity->Maya axes
-                    }
 
                     fbxAnimCurve.KeySet (fbxKeyIndex, 
                         fbxTime, 
                         convertSceneHelper.Convert(uniKeyFrame.value),
-                        interpMode,//FbxAnimCurveDef.EInterpolationType.eInterpolationCubic,
-                        tanMode,//FbxAnimCurveDef.ETangentMode.eTangentBreak,
+                        interpMode,
+                        tanMode,
                         tangentMultiplier*uniKeyFrame.outTangent,
                         keyIndex < uniAnimCurve.length -1 ? tangentMultiplier*uniAnimCurve[keyIndex+1].inTangent : 0,
                         FbxAnimCurveDef.EWeightedMode.eWeightedAll,
@@ -1822,16 +1797,6 @@ internal void ExportAnimationKeys (AnimationCurve uniAnimCurve, FbxAnimCurve fbx
                     );
 
                     Debug.LogWarning(uniPropertyName + ": tangents: " + uniKeyFrame.inTangent + ", " + uniKeyFrame.outTangent + ", weights: " + uniKeyFrame.inWeight + ", " + uniKeyFrame.outWeight);
-
-                    if (!(MapUnityKeyTangentModeToFBX.ContainsKey(lTangent) && MapUnityKeyTangentModeToFBX.ContainsKey(rTangent)))
-                    {
-                        Debug.LogWarning(string.Format("key[{0}] missing tangent mapping ({1},{2})", keyIndex, lTangent.ToString(), rTangent.ToString()));
-                        continue;
-                    }
-
-                    // TODO : handle broken tangents
-
-                    // TODO : set key tangents
                 }
             }
         }
@@ -1975,13 +1940,11 @@ 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 {*/
-                    ExportAnimationKeys (uniAnimCurve, fbxAnimCurve, convertSceneHelper, uniPropertyName);
+                ExportAnimationKeys (uniAnimCurve, fbxAnimCurve, convertSceneHelper, uniPropertyName);
                // }
             }
         }
@@ -2158,12 +2121,14 @@ private void ExportAnimationClip (AnimationClip uniAnimClip, GameObject uniRoot,
                         continue;
                     } 
 
-                    /*index = EulerCurve.GetEulerIndex (propertyName);
-                    if (index >= 0) {
+                    // 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 && fbxNode.GetPreRotation(FbxNode.EPivotSet.eSourcePivot).Distance(new FbxVector4()) > 0) {
                         RotationCurve rotCurve = GetRotationCurve<EulerCurve> (uniGO, uniAnimClip.frameRate, ref rotations);
                         rotCurve.SetCurve (index, uniAnimCurve);
                         continue;
-                    }*/
+                    }
 
                     // simple property (e.g. intensity), export right away
                     ExportAnimationCurve (fbxNode, uniAnimCurve, uniAnimClip.frameRate, 

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: []