polish

Author: inwoods

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1445,12 +1445,55 @@ protected bool ExportLight (GameObject unityGo, FbxScene fbxScene, FbxNode fbxNo
             }
 
             /// <summary>
-            /// Export animation curve key frames with key tangents
+            /// Return set of sample times to cover all keys on animation curves
             /// </summary>
-            protected void ExportAnimationKeyFrames (AnimationCurve uniAnimCurve, FbxAnimCurve fbxAnimCurve, 
+            public static HashSet<float> GetSampleTimes(AnimationCurve[] animCurves, double sampleRate)
+            {
+                var keyTimes = new HashSet<float>();
+                double fs = 1.0/sampleRate;
+
+                double currSample = double.MaxValue, firstTime = double.MaxValue, lastTime = double.MinValue;
+
+                foreach (var ac in animCurves)
+                {
+                    if (ac==null || ac.length<=0) continue;
+
+                    firstTime = System.Math.Min(firstTime, ac[0].time);
+                    lastTime = System.Math.Max(lastTime, ac[ac.length-1].time);
+                }
+
+                for (currSample = firstTime; currSample < lastTime; currSample += fs) 
+                {
+                    keyTimes.Add((float)currSample);
+                }
+
+                return keyTimes;
+            }
+
+            /// <summary>
+            /// Return set of all keys times on animation curves
+            /// </summary>
+            public static HashSet<float> GetKeyTimes(AnimationCurve[] animCurves)
+            {
+                var keyTimes = new HashSet<float>();
+
+                foreach (var ac in animCurves)
+                {
+                    if (ac!=null) foreach(var key in ac.keys) { keyTimes.Add(key.time); }
+                }
+
+                return keyTimes;
+            }
+
+            /// <summary>
+            /// Export animation curve key frames with key tangents 
+            /// 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>
+            protected void ExportAnimationKeys (AnimationCurve uniAnimCurve, FbxAnimCurve fbxAnimCurve, 
                 UnityToMayaConvertSceneHelper convertSceneHelper)
             {
-                // TODO: map key tangents mode between Unity and FBX
+                // 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>>
                 {
@@ -1504,32 +1547,14 @@ protected void ExportAnimationSamples (AnimationCurve uniAnimCurve, FbxAnimCurve
                 double sampleRate,
                 UnityToMayaConvertSceneHelper convertSceneHelper)
             {
+                
                 using (new FbxAnimCurveModifyHelper(new List<FbxAnimCurve>{fbxAnimCurve}))
                 {
-                    double fs = 1.0/sampleRate;
-                    int numKeys = uniAnimCurve.length;
-
-                    int numSamples = 0;
-                    int sampleIndex = 0;
-                    double currSample = double.MaxValue, firstTime = double.MaxValue, lastTime = double.MaxValue;
-
-                    if (numKeys>0)
-                    {
-                        firstTime = uniAnimCurve[0].time;
-                        lastTime = uniAnimCurve[uniAnimCurve.length-1].time;
-
-                        numSamples = (int)((float)((lastTime-firstTime) * sampleRate));
-                        Debug.Log(string.Format("Exporting Animation Samples : firstTime={0}, lastTime={1} frameRate={2} numSamples={3}", 
-                            firstTime, lastTime, sampleRate, numSamples));
-
-                        currSample = firstTime;
-                    }
-
-                    for (sampleIndex = 0, currSample = firstTime; currSample < lastTime; ++sampleIndex, currSample += fs) 
+                    foreach (var currSampleTime in GetSampleTimes(new AnimationCurve[]{uniAnimCurve}, sampleRate)) 
                     {
-                        float currSampleValue = uniAnimCurve.Evaluate((float)currSample);
+                        float currSampleValue = uniAnimCurve.Evaluate((float)currSampleTime);
 
-                        var fbxTime = FbxTime.FromSecondDouble (currSample);
+                        var fbxTime = FbxTime.FromSecondDouble (currSampleTime);
 
                         int fbxKeyIndex = fbxAnimCurve.KeyAdd (fbxTime);
 
@@ -1608,7 +1633,7 @@ protected void ExportAnimationCurve (UnityEngine.Object uniObj,
                 }
                 else 
                 {
-                    ExportAnimationKeyFrames(uniAnimCurve, fbxAnimCurve, convertSceneHelper);
+                    ExportAnimationKeys(uniAnimCurve, fbxAnimCurve, convertSceneHelper);
                 }
             }
 
@@ -1784,6 +1809,7 @@ public void Dispose()
             /// from quaternion to euler. We use this class to help.
             /// </summary>
             class QuaternionCurve {
+                public double sampleRate;
                 public AnimationCurve x;
                 public AnimationCurve y;
                 public AnimationCurve z;
@@ -1844,11 +1870,11 @@ Key [] ComputeKeys(UnityEngine.Quaternion restRotation, FbxNode node) {
                     var lclQuaternion = new FbxQuaternion(restRotation.x, restRotation.y, restRotation.z, restRotation.w);
 
                     // Find when we have keys set.
-                    var keyTimes = new HashSet<float>();
-                    if (x != null) { foreach(var key in x.keys) { keyTimes.Add(key.time); } }
-                    if (y != null) { foreach(var key in y.keys) { keyTimes.Add(key.time); } }
-                    if (z != null) { foreach(var key in z.keys) { keyTimes.Add(key.time); } }
-                    if (w != null) { foreach(var key in w.keys) { keyTimes.Add(key.time); } }
+                    var animCurves = new AnimationCurve[]{x,y,z,w};
+                    var keyTimes = 
+                        (FbxExporters.Editor.ModelExporter.ExportSettings.BakeAnimation) 
+                        ? ModelExporter.GetSampleTimes(animCurves, sampleRate) 
+                        : ModelExporter.GetKeyTimes(animCurves);
 
                     // Convert to the Key type.
                     var keys = new Key[keyTimes.Count];
@@ -1997,7 +2023,7 @@ protected void ExportAnimationClip (AnimationClip uniAnimClip, GameObject uniRoo
 
                         QuaternionCurve quat;
                         if (!quaternions.TryGetValue (uniGO, out quat)) {
-                            quat = new QuaternionCurve ();
+                            quat = new QuaternionCurve {sampleRate = uniAnimClip.frameRate};
                             quaternions.Add (uniGO, quat);
                         }
                         quat.SetCurve (index, uniAnimCurve);
@@ -3027,7 +3053,7 @@ public void Dispose ()
             {
             }
 
-            public bool Verbose { private set {;} get { return true; } }
+            public bool Verbose { private set {;} get { return false; } }
 
             /// <summary>
             /// manage the selection of a filename

Assets/FbxExporters/Editor/UnitTests/FbxAnimationTest.cs

@@ -273,10 +273,14 @@ public int CompareKeyValue(Keyframe a, Keyframe b)
                 bool result = true;
 
                 result &= a.time.Equals(b.time);
+                #if DEBUG_UNITTEST
                 Debug.Log(string.Format("{2} a.time: {0}, b.time: {1}", a.time, b.time,result));
+                #endif
 
                 result &= (Mathf.Abs(a.value - b.value) <= Epsilon);
+                #if DEBUG_UNITTEST
                 Debug.Log(string.Format("{2} a.value: {0}, b.value: {1}", a.value, b.value,result));
+                #endif
 
                 return  result ? 0 : 1;
             }
@@ -294,15 +298,17 @@ public int CompareKeyTangents(Keyframe a, Keyframe b)
                 bool result = true;
 
                 result &= a.time.Equals(b.time);
+                #if DEBUG_UNITTEST
                 Debug.Log(string.Format("{2} a.time: {0}, b.time: {1}", a.time, b.time,result));
-
+                #endif
                 // TODO : use AnimationUtility.GetLeftTangentMode 
                 // requires reference to AnimationCurve and keyindex
                 result &= (a.tangentMode == b.tangentMode);
+                #if DEBUG_UNITTEST
                 Debug.Log(string.Format("{2} a.tangentMode={0} b.tangentMode={1}", 
                     ((AnimationUtility.TangentMode)a.tangentMode).ToString(),
                     ((AnimationUtility.TangentMode)b.tangentMode).ToString(),result));
-
+                #endif
                 return result ? 0 : 1;
             }
 
@@ -712,11 +718,15 @@ public int KeyTangentsAnimTest (float [] keyTimesInSeconds, Vector3 [] keyPosVal
         [Test, TestCaseSource (typeof (AnimationTestDataClass), "ComponentTestCases")]
         public int ComponentAnimTest (System.Type componentType)
         {
+            #if DEBUG_UNITTEST
             Debug.Log (string.Format ("ComponentAnimTest {0}", componentType.ToString()));
+            #endif 
 
             if (!ModelExporter.MapsToFbxObject.ContainsKey(componentType))
             {
+                #if DEBUG_UNITTEST
                 Debug.Log (string.Format ("skipping {0}; fbx export not supported", componentType.ToString()));
+                #endif 
                 return 1;                
             }
 
@@ -729,7 +739,9 @@ public int ComponentAnimTest (System.Type componentType)
 
             if (propertyNames.Length == 0)
             {
+                #if DEBUG_UNITTEST
                 Debug.Log (string.Format ("skipping {0}; no animatable Single properties found", componentType.ToString()));
+                #endif 
                 return 1;                
             }