[ADDED] color (3 channels) test added

[REMOVED] conditions for mapping that we don't need for these cases

Author: DESKTOP-F8VO8FK\Austin

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1030,37 +1030,31 @@ public static bool TryGetValue(string unityPropertyName, out FbxPropertyChannelP
                         return true;
                     }
 
-                    if (unityPropertyName.StartsWith("m_Intensity", ct) || unityPropertyName.EndsWith("T.z", ct))
+                    if (unityPropertyName.StartsWith("m_Intensity", ct))
                     {
                         prop = new FbxPropertyChannelPair("Intensity", null);
                         return true;
                     }
 
-                    if (unityPropertyName.StartsWith("m_SpotAngle", ct) || unityPropertyName.EndsWith("T.z", ct))
+                    if (unityPropertyName.StartsWith("m_SpotAngle", ct))
                     {
                         prop = new FbxPropertyChannelPair("OuterAngle", null);
                         return true;
                     }
 
-                    if (unityPropertyName.StartsWith("m_Color", ct) || unityPropertyName.EndsWith("T.z", ct))
-                    {
-                        prop = new FbxPropertyChannelPair("Color", Globals.FBXSDK_CURVENODE_COLOR);
-                        return true;
-                    }
-
-                    if (unityPropertyName.StartsWith("m_Color.r", ct) || unityPropertyName.EndsWith("T.z", ct))
+                    if (unityPropertyName.StartsWith("m_Color.r", ct))
                     {
                         prop = new FbxPropertyChannelPair("Color", Globals.FBXSDK_CURVENODE_COLOR_RED);
                         return true;
                     }
 
-                    if (unityPropertyName.StartsWith("m_Color.g", ct) || unityPropertyName.EndsWith("T.z", ct))
+                    if (unityPropertyName.StartsWith("m_Color.g", ct))
                     {
                         prop = new FbxPropertyChannelPair("Color", Globals.FBXSDK_CURVENODE_COLOR_GREEN);
                         return true;
                     }
 
-                    if (unityPropertyName.StartsWith("m_Color.b", ct) || unityPropertyName.EndsWith("T.z", ct))
+                    if (unityPropertyName.StartsWith("m_Color.b", ct))
                     {
                         prop = new FbxPropertyChannelPair("Color", Globals.FBXSDK_CURVENODE_COLOR_BLUE);
                         return true;

Assets/FbxExporters/Editor/UnitTests/FbxLightTest.cs

@@ -136,5 +136,72 @@ public void AnimationWithLightIntensityTest()
                 Assert.That(exportedCurve.keys[i].value == keys[i].value);
             }
         }
+
+        [Test]
+        public void AnimationWithLightColorTest()
+        {
+            string filename = GetRandomFbxFilePath();
+            GameObject go = new GameObject();
+            go.name = "original";
+            Light light = go.AddComponent(typeof(Light)) as Light;
+            Animation anim = go.AddComponent(typeof(Animation)) as Animation;
+
+            Keyframe[] keys = new Keyframe[3];
+            keys[0] = new Keyframe(0.0f, 0.0f);
+            keys[1] = new Keyframe(1.0f, 0.5f);
+            keys[2] = new Keyframe(2.0f, 1.0f);
+
+            AnimationCurve curve = new AnimationCurve(keys);
+
+            AnimationClip clip = new AnimationClip();
+
+            clip.legacy = true;
+
+            clip.SetCurve("", typeof(Light), "m_Color.r", curve);
+            clip.SetCurve("", typeof(Light), "m_Color.g", curve);
+            clip.SetCurve("", typeof(Light), "m_Color.b", 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));
+
+            for (int i = 0; i < exportedCurve.keys.Length; i++)
+            {
+                Assert.That(exportedCurve.keys[i].time == keys[i].time);
+                Assert.That(exportedCurve.keys[i].value == keys[i].value);
+            }
+        }
     }
 }