Merge pull request #285 from Unity-Technologies/Uni-35752-animation-unroll-filter

Uni 35752 animation unroll filter

Author: inwoods

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1793,6 +1793,12 @@ public void Animate(Transform unityTransform, FbxNode fbxNode, FbxAnimLayer fbxA
                     fbxAnimCurveY.KeyModifyEnd();
                     fbxAnimCurveX.KeyModifyEnd();
 
+                    // Uni-35616 unroll curves to preserve continuous rotations
+                    var fbxCurveNode = fbxNode.LclRotation.GetCurveNode(fbxAnimLayer, false /*should already exist*/);
+
+                    FbxAnimCurveFilterUnroll fbxAnimUnrollFilter = new FbxAnimCurveFilterUnroll();
+                    fbxAnimUnrollFilter.Apply(fbxCurveNode);
+
                     if (Verbose) {
                         Debug.Log("Exported rotation animation for " + fbxNode.GetName());
                     }

Assets/FbxExporters/Editor/UnitTests/FbxAnimationTest.cs

@@ -1,3 +1,7 @@
+// NOTE: uncomment the next line to leave temporary FBX files on disk
+// and create a imported object in the scene.
+// #define DEBUG_UNITTEST
+
 using UnityEngine;
 using UnityEditor;
 using NUnit.Framework;
@@ -77,11 +81,11 @@ public static IEnumerable TestCases4 {
         // specify continuous rotations
         public static IEnumerable TestCases5 {
             get {
-                yield return new TestCaseData (RotationInterpolation.kEuler /*use euler values*/, m_keytimes5, m_keyPosValues5, m_keyRotValues5).Returns (3);
+                yield return new TestCaseData (RotationInterpolation.kEuler /*use euler values*/, m_keytimes5, m_keyPosValues5, m_keyRotValues5).Returns (6);
                 // Uni-35616 can't programmatically define a Euler (Quaternion) mix.
                 // yield return new TestCaseData (RotationInterpolation.kMixed /*use euler+quaternion values*/, m_keytimes5, m_keyPosValues5, m_keyRotValues5).Returns (3);
                 // Uni-35616 doesn't work with quaternions; rotations don't exceed 180
-                // yield return new TestCaseData (RotationInterpolation.kQuaternion /*use quaternion values*/, m_keytimes5, m_keyPosValues5, m_keyRotValues5).Returns (3);
+                yield return new TestCaseData (RotationInterpolation.kQuaternion /*use quaternion values*/, m_keytimes5, m_keyPosValues5, m_keyRotValues5).Returns (6);
             }
         }
 
@@ -112,8 +116,9 @@ public class FbxAnimationTest : ExporterTestBase
         [TearDown]
         public override void Term ()
         {
-            // NOTE: comment out the next line to leave temporary FBX files on disk
+            #if (!DEBUG_UNITTEST)
             base.Term ();
+            #endif
         }
 
         protected void AnimClipPropertyTest (AnimationClip animClipExpected, AnimationClip animClipActual)
@@ -384,6 +389,13 @@ public int AnimTest (KeyData keyData, string testName)
                 AssetDatabase.ImportAsset (path);
             }
 
+            // create a scene GO so we can compare.
+            #if DEBUG_UNITTEST
+            GameObject prefabGO = AssetDatabase.LoadMainAssetAtPath (path) as GameObject;
+            GameObject sceneGO = Object.Instantiate(prefabGO, keyData.targetObject.transform.localPosition, keyData.targetObject.transform.localRotation);
+            sceneGO.name = "Imported_" + testName;
+            #endif 
+
             //acquire imported object from exported file
             AnimationClip animClipImported = GetClipFromFbx (path);
 
@@ -392,23 +404,31 @@ public int AnimTest (KeyData keyData, string testName)
             // check animCurve & keys
             int result = 0;
 
+            // keyed localEulerAnglesRaw.z m_LocalRotation.z -1
             foreach (EditorCurveBinding curveBinding in AnimationUtility.GetCurveBindings (animClipImported)) {
                 AnimationCurve animCurveImported = AnimationUtility.GetEditorCurve (animClipImported, curveBinding);
                 Assert.That (animCurveImported, Is.Not.Null);
 
-                string altPropertyName;
+                string altBinding;
+
+                MapAltPropertyName.TryGetValue (curveBinding.propertyName, out altBinding);
 
-                MapAltPropertyName.TryGetValue (curveBinding.propertyName, out altPropertyName);
+                bool hasAltBinding = !string.IsNullOrEmpty (altBinding);
 
-                bool hasAltPropertyName = !string.IsNullOrEmpty (altPropertyName);
+                if (!hasAltBinding)
+                    altBinding = curveBinding.propertyName;
 
-                if (!hasAltPropertyName)
-                    altPropertyName = curveBinding.propertyName;
+                int id = keyData.GetIndexOf (curveBinding.propertyName);
 
-                int id = keyData.GetIndexOf (altPropertyName);
+                if (id == -1)
+                    id = keyData.GetIndexOf (altBinding);
+                
+                #if DEBUG_UNITTEST
+                Debug.Log(string.Format("animtest binding={0} altBinding={1} id={2}", curveBinding.propertyName, altBinding, id));
+                #endif
 
                 if (id != -1) {
-                    AnimCurveTest (keyData.keyTimesInSeconds, hasAltPropertyName ? keyData.GetAltKeyValues (id) : keyData.GetKeyValues (id), animCurveImported, curveBinding.propertyName);
+                    AnimCurveTest (keyData.keyTimesInSeconds, hasAltBinding ? keyData.GetAltKeyValues (id) : keyData.GetKeyValues (id), animCurveImported, curveBinding.propertyName);
                     result++;
                 }
             }
@@ -491,6 +511,8 @@ public void LegacySkinnedMeshAnimTest (string fbxPath)
                     AnimCurveTest(animCurveImported, animCurveOrig, curveBinding.propertyName);
                 }
             }
+
+
         }
 
         [Test, TestCaseSource (typeof (AnimationTestDataClass), "TestCases1")]

Assets/FbxSdk/LICENSE.txt

@@ -1,3 +1,3 @@
-Autodesk FBX SDK. Copyright (c) 2016 Autodesk, Inc. All rights reserved. 
-Use of the FBX SDK requires agreeing to and complying with the FBX SDK License and Service Agreement terms 
+Autodesk FBX SDK. Copyright (c) 2016 Autodesk, Inc. All rights reserved. 
+Use of the FBX SDK requires agreeing to and complying with the FBX SDK License and Service Agreement terms 
 accessed at https://damassets.autodesk.net/content/dam/autodesk/www/Company/docs/pdf/legal-notices-&-trademarks/Autodesk_FBX_SDK_2015_License_and_Services_Agreement.pdf"

Assets/FbxSdk/Plugins/UnityFbxSdk.dll

@@ -1,28 +1,28 @@
-FBX SDK C# Bindings
-===================
-
-Autodesk FBX SDK. Copyright (c) 2016 Autodesk, Inc. All rights reserved.<br/>
-Use of the FBX SDK requires agreeing to and complying with the FBX SDK License and Service Agreement terms 
-accessed at https://damassets.autodesk.net/content/dam/autodesk/www/Company/docs/pdf/legal-notices-&-trademarks/Autodesk_FBX_SDK_2015_License_and_Services_Agreement.pdf"
-
-**Version**: 1.2.0b1
-
-This package contains only a subset of the FbxSdk, and is designed to work in the Unity Editor only.
-
-How to Access Bindings in Code
--------------------------------
-All the bindings are located under the FbxSdk namespace,
-and are accessed almost the same way as in C++.
-e.g. FbxManager::Create() in C++ becomes FbxSdk.FbxManager.Create() in C#
-
-
-How to Access Global Variables and Functions
---------------------------------------------
-All global variables and functions are in Globals.cs, in the Globals class under the FbxSdk namespace.
-e.g. if we want to access the IOSROOT variable, we would do FbxSdk.Globals.IOSROOT
-
-   
-How to Access Documentation for Bindings
-----------------------------------------
-1. Unzip docs.zip outside of the Assets folder
+FBX SDK C# Bindings
+===================
+
+Autodesk FBX SDK. Copyright (c) 2016 Autodesk, Inc. All rights reserved.<br/>
+Use of the FBX SDK requires agreeing to and complying with the FBX SDK License and Service Agreement terms 
+accessed at https://damassets.autodesk.net/content/dam/autodesk/www/Company/docs/pdf/legal-notices-&-trademarks/Autodesk_FBX_SDK_2015_License_and_Services_Agreement.pdf"
+
+**Version**: sprint42
+
+This package contains only a subset of the FbxSdk, and is designed to work in the Unity Editor only.
+
+How to Access Bindings in Code
+-------------------------------
+All the bindings are located under the FbxSdk namespace,
+and are accessed almost the same way as in C++.
+e.g. FbxManager::Create() in C++ becomes FbxSdk.FbxManager.Create() in C#
+
+
+How to Access Global Variables and Functions
+--------------------------------------------
+All global variables and functions are in Globals.cs, in the Globals class under the FbxSdk namespace.
+e.g. if we want to access the IOSROOT variable, we would do FbxSdk.Globals.IOSROOT
+
+   
+How to Access Documentation for Bindings
+----------------------------------------
+1. Unzip docs.zip outside of the Assets folder
 2. Open docs/html/index.html