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

Author: DESKTOP-F8VO8FK\Austin

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1537,6 +1537,12 @@ public static bool TryGetValue(string uniPropertyName, out FbxPropertyChannelPai
                         return true;
                     }
 
+                    if (uniPropertyName.StartsWith("field of view", ct))
+                    {
+                        prop = new FbxPropertyChannelPair("FieldOfView", null);
+                        return true;
+                    }
+
                     prop = new FbxPropertyChannelPair ();
                     return false;
                 }

Assets/FbxExporters/Editor/UnitTests/FbxCameraTests.cs

@@ -0,0 +1,83 @@
+using UnityEngine;
+using UnityEditor;
+using NUnit.Framework;
+using System.Collections.Generic;
+
+namespace FbxExporters.UnitTests
+{
+    public class MyKeyComparer : IComparer<Keyframe>
+    {
+        public int Compare(Keyframe a, Keyframe b)
+        {
+            Debug.Log(string.Format("a.value: {0}, b.value: {1}, a.time: {2}, b.time: {3}", a.value, b.value, a.time, b.time));
+            return a.time == b.time && a.value == b.value ? 0 : 1;
+        }
+    }
+
+    public class FbxCameraTest : ExporterTestBase
+    {
+
+        [Test]
+        public void AnimationWithCameraFOVTest()
+        {
+            string filename = GetRandomFbxFilePath();
+            GameObject go = new GameObject();
+            go.name = "originalCamera";
+            Camera camera = go.AddComponent(typeof(Camera)) as Camera;
+            Animation anim = go.AddComponent(typeof(Animation)) as Animation;
+
+            Keyframe[] keys = new Keyframe[3];
+            keys[0] = new Keyframe(0.0f, 1f);
+            keys[1] = new Keyframe(1.0f, 2f);
+            keys[2] = new Keyframe(2.0f, 3f);
+            
+            AnimationCurve curve = new AnimationCurve(keys);
+
+            AnimationClip clip = new AnimationClip();
+
+            clip.legacy = true;
+
+            clip.SetCurve("", typeof(Camera), "field of view", curve);
+
+            anim.AddClip(clip, "test");
+
+            //export the object
+            var exported = FbxExporters.Editor.ModelExporter.ExportObject(filename, go);
+
+            Assert.That(exported, 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;
+                Assert.That(modelImporter, Is.Not.Null);
+                modelImporter.resampleCurves = false;
+                AssetDatabase.ImportAsset(filename);
+                modelImporter.animationType = ModelImporterAnimationType.Legacy;
+                AssetDatabase.ImportAsset(filename);
+            }
+
+            Object[] objects = AssetDatabase.LoadAllAssetsAtPath(filename);
+
+            AnimationClip exportedClip = null;
+            foreach (Object o in objects)
+            {
+                exportedClip = o as AnimationClip;
+                if (exportedClip != null) break;
+            }
+
+            Assert.IsNotNull(exportedClip);
+            exportedClip.legacy = true;
+
+            EditorCurveBinding exportedEditorCurveBinding = AnimationUtility.GetCurveBindings(exportedClip)[0];
+
+            AnimationCurve exportedCurve = AnimationUtility.GetEditorCurve(exportedClip, exportedEditorCurveBinding);
+
+            Assert.That(exportedCurve.keys.Length, Is.EqualTo(keys.Length));
+
+            //check imported animation against original
+            Assert.That(exportedCurve.keys, Is.EqualTo(keys).Using<Keyframe>(new MyKeyComparer()), string.Format("key doesn't match"));
+        }
+
+    }
+}