fix skinned mesh animation export

- fix test failing because of precision
- fix player controller example having an extra unconnected animation

Author: vkovec

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

@@ -1160,21 +1160,15 @@ internal static FbxVector4 ToFbxVector4(FbxDouble3 v)
         /// <param name="euler">Euler.</param>
         internal static FbxQuaternion EulerToQuaternion(FbxVector4 euler)
         {
-            FbxAMatrix m = new FbxAMatrix ();
-            m.SetR (euler);
-            return m.GetQ ();
+            var unityQuat = Quaternion.Euler(new Vector3((float)euler.X, (float)euler.Y, (float)euler.Z));
+            return new FbxQuaternion(unityQuat.x, unityQuat.y, unityQuat.z, unityQuat.w);
         }
 
-        /// <summary>
-        /// Quaternion to euler without axis conversion.
-        /// </summary>
-        /// <returns>a euler.</returns>
-        /// <param name="quat">Quaternion.</param>
-        internal static FbxVector4 QuaternionToEuler(FbxQuaternion quat)
+        internal static FbxQuaternion EulerToQuaternionXYZ(FbxVector4 euler)
         {
             FbxAMatrix m = new FbxAMatrix ();
-            m.SetQ (quat);
-            return m.GetR ();
+            m.SetR (euler);
+            return m.GetQ ();
         }
 
         // get a fbxNode's global default position.
@@ -2715,6 +2709,13 @@ AnimationOnlyExportData exportData
                         return false;
                     }
 
+                    // Rotation order and rotation active must be set before setting the transform, otherwise
+                    // values may change if setting the rotation order afterwards.
+                    if (!fbxNode.GetRotationActive())
+                    {
+                        fbxNode.SetRotationOrder(FbxNode.EPivotSet.eSourcePivot, FbxEuler.EOrder.eOrderZXY);
+                        fbxNode.SetRotationActive(true);
+                    }
                     ExportBoneTransform(fbxNode, fbxScene, bone.transform, boneInfo);
                 }
             }
@@ -3336,10 +3337,11 @@ internal int ExportAll (
                     // The Maya axis system has Y up, Z forward, X to the left (right handed system with odd parity).
                     // We need to export right-handed for Maya because ConvertScene can't switch handedness:
                     // https://forums.autodesk.com/t5/fbx-forum/get-confused-with-fbxaxissystem-convertscene/td-p/4265472
-                    fbxSettings.SetAxisSystem (new FbxAxisSystem(
+                    var unityAxisSystem = new FbxAxisSystem(
                         FbxAxisSystem.EUpVector.eYAxis,
                         FbxAxisSystem.EFrontVector.eParityOdd,
-                        FbxAxisSystem.ECoordSystem.eLeftHanded));
+                        FbxAxisSystem.ECoordSystem.eLeftHanded);
+                    fbxSettings.SetAxisSystem (unityAxisSystem);
 
                     // export set of object
                     FbxNode fbxRootNode = fbxScene.GetRootNode ();

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

@@ -54,7 +54,7 @@ private Key [] ComputeKeys(UnityEngine.Quaternion restRotation, FbxNode node) {
                 : new FbxVector4();
 
             // Get the inverse of the prerotation
-            var fbxPreRotationInverse = ModelExporter.EulerToQuaternion (fbxPreRotationEuler);
+            var fbxPreRotationInverse = ModelExporter.EulerToQuaternionXYZ (fbxPreRotationEuler);
             fbxPreRotationInverse.Inverse();
 
             // Find when we have keys set.
@@ -76,10 +76,12 @@ private Key [] ComputeKeys(UnityEngine.Quaternion restRotation, FbxNode node) {
                 //      then animation.
                 var fbxFinalQuat = fbxPreRotationInverse * fbxFinalAnimation;
 
+                var finalUnityQuat = new Quaternion((float)fbxFinalQuat.X, (float)fbxFinalQuat.Y, (float)fbxFinalQuat.Z, (float)fbxFinalQuat.W);
+
                 // Store the key so we can sort them later.
                 Key key = new Key();
                 key.time = FbxTime.FromSecondDouble(seconds);
-                key.euler = ModelExporter.QuaternionToEuler (fbxFinalQuat);
+                key.euler = ModelExporter.ConvertToFbxVector4(finalUnityQuat.eulerAngles);
                 keys[i++] = key;
             }
 

com.unity.formats.fbx/Tests/FbxTests/FbxAnimationTest.cs

@@ -557,7 +557,7 @@ public static void KeyValuesTest (float [] expectedKeyTimes, float [] expectedKe
                     #if DEBUG_UNITTEST
                     Debug.Log(string.Format("key time={0} expected={1} actual={2} delta={3}", expectedKeyTime.ToString(), expectedKeyValue.ToString(), actualKeyValue.ToString(), Mathf.Abs(expectedKeyValue-actualKeyValue).ToString()));
                     #endif
-                    Assert.That(expectedKeyValue, Is.EqualTo(actualKeyValue).Within(0.000001), string.Format("{0} key ({1}) doesn't match", message, expectedKeyTime));
+                    Assert.That(expectedKeyValue, Is.EqualTo(actualKeyValue).Within(0.0001), string.Format("{0} key ({1}) doesn't match", message, expectedKeyTime));
                 }
             }
 

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

@@ -22,6 +22,32 @@ 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
@@ -60,6 +86,9 @@ 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: []