Revert "add support for recording multiple objects from one recorder"

This reverts commit 7273fdc.

Author: vkovec

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

@@ -21,67 +21,61 @@ public override void EndRecording(RecordingSession session)
             foreach (var input in m_Inputs)
             {
 
-                var aInput = (FbxInput)input;
+                var aInput = (AnimationInput)input;
 
-                var recorders = aInput.gameObjectRecorder;
-                var gameObjects = ((FbxInputSettings)aInput.settings).gameObjects;
-                if (recorders == null || recorders.Length <= 0)
+                if (aInput.gameObjectRecorder == null)
                     continue;
 
-                var clips = new AnimationClip[recorders.Length];
-                for (int i = 0; i < recorders.Length; i++)
-                {
-                    clips[i] = new AnimationClip();
-
-                    ars.fileNameGenerator.CreateDirectory(session);
+                var clip = new AnimationClip();
 
-                    var absolutePath = FileNameGenerator.SanitizePath(ars.fileNameGenerator.BuildAbsolutePath(session));
-                    var clipName = absolutePath.Replace(FileNameGenerator.SanitizePath(Application.dataPath), "Assets");
+                ars.fileNameGenerator.CreateDirectory(session);
 
-                    //AssetDatabase.CreateAsset(clip, clipName);
-    #if UNITY_2018_3_OR_NEWER
-                        recorders[i].SaveToClip(clips[i], ars.frameRate);
+                var absolutePath = FileNameGenerator.SanitizePath(ars.fileNameGenerator.BuildAbsolutePath(session));
+                var clipName = absolutePath.Replace(FileNameGenerator.SanitizePath(Application.dataPath), "Assets");
+                
+                //AssetDatabase.CreateAsset(clip, clipName);
+#if UNITY_2018_3_OR_NEWER
+                aInput.gameObjectRecorder.SaveToClip(clip, ars.frameRate);
 #else
-                        recorder.SaveToClip(clip);
+                aInput.gameObjectRecorder.SaveToClip(clip);
 #endif
-                    var root = gameObjects[i];
-                    clips[i].name = "recorded_clip";
-                    clips[i].legacy = true;
-                    Animation animator = root.GetComponent<Animation>();
-                    bool hasAnimComponent = true;
-                    if (!animator)
-                    {
-                        animator = root.AddComponent<Animation>();
-                        hasAnimComponent = false;
-                    }
+                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);
-                    }
+                AnimationClip[] prevAnimClips = null;
+                if (hasAnimComponent)
+                {
+                    prevAnimClips = AnimationUtility.GetAnimationClips(root);
+                }
 
-                    AnimationUtility.SetAnimationClips(animator, new AnimationClip[] { clips[i] });
-                    var exportSettings = new ExportModelSettingsSerialize();
-                    var toInclude = ExportSettings.Include.ModelAndAnim;
-                    if (!ars.ExportGeometry)
-                    {
-                        toInclude = ExportSettings.Include.Anim;
-                    } 
-                    exportSettings.SetModelAnimIncludeOption(toInclude);
-                    ModelExporter.ExportObject(clipName, root, exportSettings);
+                AnimationUtility.SetAnimationClips(animator, new AnimationClip[] { clip });
+                var exportSettings = new ExportModelSettingsSerialize();
+                var toInclude = ExportSettings.Include.ModelAndAnim;
+                if (!ars.ExportGeometry)
+                {
+                    toInclude = ExportSettings.Include.Anim;
+                } 
+                exportSettings.SetModelAnimIncludeOption(toInclude);
+                ModelExporter.ExportObject(clipName, root, exportSettings);
 
 
-                    if (hasAnimComponent)
-                    {
-                        AnimationUtility.SetAnimationClips(animator, prevAnimClips);
-                    }
-                    else
-                    {
-                        Object.DestroyImmediate(animator);
-                    }
-                    recorders[i].ResetRecording();
+                if (hasAnimComponent)
+                {
+                    AnimationUtility.SetAnimationClips(animator, prevAnimClips);
+                }
+                else
+                {
+                    Object.DestroyImmediate(animator);
                 }
+                aInput.gameObjectRecorder.ResetRecording();
             }
             base.EndRecording(session);
         }

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

@@ -22,36 +22,36 @@ public bool ExportGeometry
             }
         }
 
-        [SerializeField] FbxInputSettings m_AnimationInputSettings = new FbxInputSettings();
+        [SerializeField] AnimationInputSettings m_AnimationInputSettings = new AnimationInputSettings();
 
-        public FbxInputSettings animationInputSettings
+        public AnimationInputSettings animationInputSettings
         {
             get { return m_AnimationInputSettings; }
             set { m_AnimationInputSettings = value; }
         }
 
         public FbxRecorderSettings()
         {
-            //var goWildcard = DefaultWildcard.GeneratePattern("GameObject");
+            var goWildcard = DefaultWildcard.GeneratePattern("GameObject");
 
-            //fileNameGenerator.AddWildcard(goWildcard, GameObjectNameResolver);
+            fileNameGenerator.AddWildcard(goWildcard, GameObjectNameResolver);
             fileNameGenerator.AddWildcard(DefaultWildcard.GeneratePattern("GameObjectScene"), GameObjectSceneNameResolver);
 
             fileNameGenerator.forceAssetsFolder = true;
             fileNameGenerator.root = OutputPath.Root.AssetsFolder;
-            fileNameGenerator.fileName = "animation_" /*+ goWildcard*/ + "@" + DefaultWildcard.Take;
+            fileNameGenerator.fileName = "animation_" + goWildcard + "_" + DefaultWildcard.Take;
         }
 
         string GameObjectNameResolver(RecordingSession session)
         {
-            var go = m_AnimationInputSettings.gameObjects;
-            return /*go != null ? go[0].name :*/ "None";
+            var go = m_AnimationInputSettings.gameObject;
+            return go != null ? go.name : "None";
         }
 
         string GameObjectSceneNameResolver(RecordingSession session)
         {
-            var go = m_AnimationInputSettings.gameObjects;
-            return go != null && go.Length > 0 ? go[0].scene.name : "None";
+            var go = m_AnimationInputSettings.gameObject;
+            return go != null ? go.scene.name : "None";
         }
 
         public override bool isPlatformSupported
@@ -73,7 +73,7 @@ internal override bool ValidityCheck(List<string> errors)
         {
             var ok = base.ValidityCheck(errors);
 
-            if (m_AnimationInputSettings.gameObjects == null)
+            if (m_AnimationInputSettings.gameObject == null)
             {
                 ok = false;
                 errors.Add("No input object set");