Merge branch 'master' into Uni-35058-sprint42-release

Author: DESKTOP-F8VO8FK\Austin

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1137,6 +1137,30 @@ public static FbxVector4 ConvertQuaternionToXYZEuler (FbxQuaternion quat)
                 return new FbxVector4 (vector4.X, -vector4.Y, -vector4.Z, vector4.W);
             }
 
+            /// <summary>
+            /// Euler to quaternion without axis conversion.
+            /// </summary>
+            /// <returns>a quaternion.</returns>
+            /// <param name="euler">Euler.</param>
+            public static FbxQuaternion EulerToQuaternion(FbxVector4 euler)
+            {
+                FbxAMatrix m = new FbxAMatrix ();
+                m.SetR (euler);
+                return m.GetQ ();
+            }
+
+            /// <summary>
+            /// Quaternion to euler without axis conversion.
+            /// </summary>
+            /// <returns>a euler.</returns>
+            /// <param name="quat">Quaternion.</param>
+            public static FbxVector4 QuaternionToEuler(FbxQuaternion quat)
+            {
+                FbxAMatrix m = new FbxAMatrix ();
+                m.SetQ (quat);
+                return m.GetR ();
+            }
+
             // get a fbxNode's global default position.
             protected bool ExportTransform (UnityEngine.Transform unityTransform, FbxNode fbxNode, Vector3 newCenter, TransformExportType exportType)
             {
@@ -1602,8 +1626,9 @@ Key [] ComputeKeys(UnityEngine.Quaternion restRotation, FbxNode node) {
                     var fbxPreRotationEuler = node.GetRotationActive() 
                                                   ? node.GetPreRotation(FbxNode.EPivotSet.eSourcePivot)
                                                   : new FbxVector4();
-                    var fbxPreRotationInverse = new FbxQuaternion();
-                    fbxPreRotationInverse.ComposeSphericalXYZ(fbxPreRotationEuler);
+
+                    // Get the inverse of the prerotation
+                    var fbxPreRotationInverse = ModelExporter.EulerToQuaternion (fbxPreRotationEuler);
                     fbxPreRotationInverse.Inverse();
 
                     // If we're only animating along certain coords for some
@@ -1632,17 +1657,23 @@ Key [] ComputeKeys(UnityEngine.Quaternion restRotation, FbxNode node) {
                             (z == null) ? lclQuaternion[2] : z.Evaluate(seconds),
                             (w == null) ? lclQuaternion[3] : w.Evaluate(seconds));
 
+                        // convert the final animation to righthanded coords
+                        var finalEuler = ModelExporter.ConvertQuaternionToXYZEuler(fbxFinalAnimation);
+
+                        // convert it back to a quaternion for multiplication
+                        fbxFinalAnimation = ModelExporter.EulerToQuaternion (finalEuler);
+
                         // Cancel out the pre-rotation. Order matters. FBX reads left-to-right.
                         // When we run animation we will apply:
                         //      pre-rotation
                         //      then pre-rotation inverse
                         //      then animation.
-                        var fbxQuat = fbxPreRotationInverse * fbxFinalAnimation;
+                        var fbxFinalQuat = fbxPreRotationInverse * fbxFinalAnimation;
 
                         // Store the key so we can sort them later.
                         Key key;
                         key.time = FbxTime.FromSecondDouble(seconds);
-                        key.euler = ModelExporter.ConvertQuaternionToXYZEuler(fbxQuat);
+                        key.euler = ModelExporter.QuaternionToEuler (fbxFinalQuat);;
                         keys[i++] = key;
                     }
 

Assets/FbxExporters/Editor/UnitTests/FbxAnimationTest.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using NUnit.Framework;
 using System.Collections;
@@ -84,6 +84,12 @@ public static IEnumerable TestCases5 {
                 // yield return new TestCaseData (RotationInterpolation.kQuaternion /*use quaternion values*/, m_keytimes5, m_keyPosValues5, m_keyRotValues5).Returns (3);
             }
         }
+
+        public static IEnumerable SkinnedMeshTestCases {
+            get {
+                yield return "Models/DefaultMale/Male_DyingHitFromBack_Blend_T3_Cut01_James.fbx";
+            }
+        }
     }
 
     [TestFixture]
@@ -103,7 +109,7 @@ public override void Term ()
             base.Term ();
         }
 
-        protected void AnimClipTest (AnimationClip animClipExpected, AnimationClip animClipActual)
+        protected void AnimClipPropertyTest (AnimationClip animClipExpected, AnimationClip animClipActual)
         {
 #if UNITY_EDITOR_WIN
             // TODO: figure out why we get __preview__ on Windows
@@ -135,6 +141,21 @@ protected void AnimCurveTest (float [] keyTimesExpected, float [] keyValuesExpec
             return ;
         }
 
+        private void AnimCurveTest(AnimationCurve animCurveImported, AnimationCurve animCurveActual, string message){
+            // TODO : Uni-34492 number of keys don't match
+            //Assert.That (animCurveActual.length, Is.EqualTo (animCurveImported.length), "animcurve number of keys doesn't match");
+
+            var actualTimeKeys = new ListMapper (animCurveActual.keys).Property ("time");
+            var actualValueKeys = new ListMapper (animCurveActual.keys).Property ("value");
+
+            var importedTimeKeys = new ListMapper (animCurveImported.keys).Property ("time");
+            var importedValueKeys = new ListMapper (animCurveImported.keys).Property ("value");
+
+            //check imported animation against original
+            Assert.That(actualTimeKeys, Is.EqualTo(importedTimeKeys), string.Format("{0} key time doesn't match",message));
+            Assert.That(actualValueKeys, Is.EqualTo(importedValueKeys), string.Format("{0} key value doesn't match", message));
+        }
+
         public class KeyData
         {
             public float [] keyTimesInSeconds;
@@ -357,23 +378,9 @@ public int AnimTest (KeyData keyData, string testName)
             }
 
             //acquire imported object from exported file
-            Object [] goAssetImported = AssetDatabase.LoadAllAssetsAtPath (path);
-            Assert.That (goAssetImported, Is.Not.Null);
-
-            // TODO : configure object so that it imports w Legacy Animation
-
-            AnimationClip animClipImported = null;
-            foreach (Object o in goAssetImported) {
-                animClipImported = o as AnimationClip;
-                if (animClipImported) break;
-            }
-            Assert.That (animClipImported, Is.Not.Null, "expected imported clip");
+            AnimationClip animClipImported = GetClipFromFbx (path);
 
-            // TODO : configure import settings so we don't need to force legacy
-            animClipImported.legacy = true;
-
-            // check clip properties match
-            AnimClipTest (animClipOriginal, animClipImported);
+            AnimClipPropertyTest (animClipOriginal, animClipImported);
 
             // check animCurve & keys
             int result = 0;
@@ -402,6 +409,83 @@ public int AnimTest (KeyData keyData, string testName)
             return result;
         }
 
+        private AnimationClip GetClipFromFbx(string path){
+            //acquire imported object from exported file
+            Object [] goAssetImported = AssetDatabase.LoadAllAssetsAtPath (path);
+            Assert.That (goAssetImported, Is.Not.Null);
+
+            // TODO : configure object so that it imports w Legacy Animation
+
+            AnimationClip animClipImported = null;
+            foreach (Object o in goAssetImported) {
+                animClipImported = o as AnimationClip;
+                if (animClipImported) break;
+            }
+            Assert.That (animClipImported, Is.Not.Null, "expected imported clip");
+
+            // TODO : configure import settings so we don't need to force legacy
+            animClipImported.legacy = true;
+
+            return animClipImported;
+        }
+
+        [Ignore("Uni-34804 gimbal conditions, and Uni-34492 number of keys don't match")]
+        [Test, TestCaseSource (typeof (AnimationTestDataClass), "SkinnedMeshTestCases")]
+        public void LegacySkinnedMeshAnimTest (string fbxPath)
+        {
+            fbxPath = FindPathInUnitTests (fbxPath);
+            Assert.That (fbxPath, Is.Not.Null);
+
+            // add fbx to scene
+            GameObject originalFbxObj = AssetDatabase.LoadMainAssetAtPath("Assets/" + fbxPath) as GameObject;
+            Assert.IsNotNull (originalFbxObj);
+            GameObject originalGO = GameObject.Instantiate (originalFbxObj);
+            Assert.IsTrue (originalGO);
+
+            // get clip
+            AnimationClip animClipOriginal = originalGO.GetComponentInChildren<Animation>().clip;
+            Assert.That (animClipOriginal, Is.Not.Null);
+
+            // export fbx
+            // get GameObject
+            string filename = GetRandomFbxFilePath();
+            var exportedFilePath = ModelExporter.ExportObject (filename, originalGO);
+            Assert.That (exportedFilePath, Is.EqualTo (filename));
+
+            // TODO: Uni-34492 change importer settings of (newly exported model) 
+            // so that it's not resampled and it is legacy animation
+            {
+                ModelImporter modelImporter = AssetImporter.GetAtPath (filename) as ModelImporter;
+                modelImporter.resampleCurves = false;
+                AssetDatabase.ImportAsset (filename);
+                modelImporter.animationType = ModelImporterAnimationType.Legacy;
+                AssetDatabase.ImportAsset (filename);
+            }
+
+            var animClipImported = GetClipFromFbx (filename);
+
+            // check clip properties match
+            AnimClipPropertyTest (animClipOriginal, animClipImported);
+
+            foreach (EditorCurveBinding curveBinding in AnimationUtility.GetCurveBindings (animClipOriginal)) {
+                foreach(EditorCurveBinding impCurveBinding in AnimationUtility.GetCurveBindings (animClipImported)) {
+
+                    // only compare if the path and property names match
+                    if (curveBinding.path != impCurveBinding.path || curveBinding.propertyName != impCurveBinding.propertyName) {
+                        continue;
+                    }
+
+                    AnimationCurve animCurveOrig = AnimationUtility.GetEditorCurve (animClipOriginal, curveBinding);
+                    Assert.That (animCurveOrig, Is.Not.Null);
+
+                    AnimationCurve animCurveImported = AnimationUtility.GetEditorCurve (animClipImported, impCurveBinding);
+                    Assert.That (animCurveImported, Is.Not.Null);
+
+                    AnimCurveTest(animCurveImported, animCurveOrig, curveBinding.propertyName);
+                }
+            }
+        }
+
         [Test, TestCaseSource (typeof (AnimationTestDataClass), "TestCases1")]
         public int SimplePropertyAnimTest (float [] keyTimesInSeconds, float [] keyValues, System.Type componentType, string componentName)
         {