simplify animation export workflows

Author: vkovec

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

@@ -2323,7 +2323,7 @@ private void TransferMotion(Transform source, Transform dest, float sampleRate,
 
                 for (int k = 0; k < 3; k++) {
                     posKeyFrames [k][keyIndex] = new Keyframe(currSampleTime, (float)translation [k]);
-                    rotKeyFrames [k][keyIndex] = new Keyframe(currSampleTime, (float)rot [k]);
+                    rotKeyFrames [k][keyIndex] = new Keyframe(currSampleTime, rot [k]);
                     scaleKeyFrames [k][keyIndex] = new Keyframe(currSampleTime, (float)scale [k]);
                 }
                 keyIndex++;
@@ -2734,18 +2734,6 @@ internal int ExportAnimationOnly(
                 }
             }
 
-            // export animation
-            // export default clip first
-            if (exportData.defaultClip != null) {
-                var defaultClip = exportData.defaultClip;
-                ExportAnimationClip (defaultClip, exportData.animationClips[defaultClip], fbxScene);
-                exportData.animationClips.Remove (defaultClip);
-            }
-
-            foreach (var animClip in exportData.animationClips) {
-                ExportAnimationClip (animClip.Key, animClip.Value, fbxScene);
-            }
-
             return numObjectsExported;
         }
 
@@ -3012,7 +3000,7 @@ internal static Dictionary<GameObject, IExportData> GetExportData(Object[] objec
 
             Dictionary<GameObject, IExportData>  exportData = new Dictionary<GameObject, IExportData>();
 
-            if (exportOptions.ModelAnimIncludeOption != ExportSettings.Include.Anim)
+            if (exportOptions.ModelAnimIncludeOption == ExportSettings.Include.Model)
             {
                 return null;
             }
@@ -3174,21 +3162,7 @@ private bool ExportComponents(FbxScene fbxScene, bool exportAnim = true)
                 }
 
                 ExportConstraints(unityGo, fbxScene, fbxNode);
-
-                // check if this object contains animation, keep track of it
-                // if it does
-                if (exportAnim && GameObjectHasAnimation (unityGo) ) {
-                    animationNodes.Add (unityGo);
-                }
             }
-
-            // export all GameObjects that have animation
-            if (animationNodes.Count > 0) {
-                foreach (var go in animationNodes) {
-                    ExportAnimation (go, fbxScene);
-                }
-            }
-
             return true;
         }
 
@@ -3366,7 +3340,7 @@ internal int ExportAll (
             }
 
             try {
-                bool animOnly = exportData != null ;
+                bool animOnly = exportData != null && ExportOptions.ModelAnimIncludeOption == ExportSettings.Include.Anim;
                 bool status = false;
                 // Create the FBX manager
                 using (var fbxManager = FbxManager.Create ()) {
@@ -3508,6 +3482,28 @@ internal int ExportAll (
                         }
                     }
 
+                    foreach (var unityGo in revisedExportSet)
+                    {
+                        IExportData iData;
+                        if(!exportData.TryGetValue(unityGo, out iData))
+                        {
+                            continue;
+                        }
+                        var data = iData as AnimationOnlyExportData;
+                        // export animation
+                        // export default clip first
+                        if (data.defaultClip != null)
+                        {
+                            var defaultClip = data.defaultClip;
+                            ExportAnimationClip(defaultClip, data.animationClips[defaultClip], fbxScene);
+                            data.animationClips.Remove(defaultClip);
+                        }
+
+                        foreach (var animClip in data.animationClips)
+                        {
+                            ExportAnimationClip(animClip.Key, animClip.Value, fbxScene);
+                        }
+                    }
                     // Set the scene's default camera.
                     SetDefaultCamera (fbxScene);
 

com.unity.formats.fbx/Editor/Sources/Recorders/FbxRecorder/FbxRecorder.cs

@@ -45,42 +45,25 @@ protected override void EndRecording(RecordingSession session)
 #endif
                 var root = ((AnimationInputSettings)aInput.settings).gameObject;
                 clip.name = "recorded_clip";
-                clip.legacy = true;
-                Animation animator = root.GetComponent<Animation>();
-                bool hasAnimComponent = true;
-                if (!animator)
-                {
-                    animator = root.AddComponent<Animation>();
-                    hasAnimComponent = false;
-                }
-
-                AnimationClip[] prevAnimClips = null;
-                if (hasAnimComponent)
-                {
-                    prevAnimClips = AnimationUtility.GetAnimationClips(root);
-                }
 
-                AnimationUtility.SetAnimationClips(animator, new AnimationClip[] { clip });
                 var exportSettings = new ExportModelSettingsSerialize();
                 exportSettings.SetAnimationSource(settings.TransferAnimationSource);
                 exportSettings.SetAnimationDest(settings.TransferAnimationDest);
+                exportSettings.SetObjectPosition(ExportSettings.ObjectPosition.WorldAbsolute);
                 var toInclude = ExportSettings.Include.ModelAndAnim;
                 if (!settings.ExportGeometry)
                 {
                     toInclude = ExportSettings.Include.Anim;
                 } 
                 exportSettings.SetModelAnimIncludeOption(toInclude);
-                ModelExporter.ExportObject(clipName, root, exportSettings);
 
+                var exportData = new AnimationOnlyExportData();
+                exportData.CollectDependencies(clip, root, exportSettings);
+                var exportDataContainer = new Dictionary<GameObject, IExportData>();
+                exportDataContainer.Add(root, exportData);
+
+                ModelExporter.ExportObjects(clipName, new UnityEngine.Object[] { root }, exportSettings, exportDataContainer);
 
-                if (hasAnimComponent)
-                {
-                    AnimationUtility.SetAnimationClips(animator, prevAnimClips);
-                }
-                else
-                {
-                    Object.DestroyImmediate(animator);
-                }
                 aInput.GameObjectRecorder.ResetRecording();
             }
             base.EndRecording(session);