export animated focal length and lens shift

Author: vkovec

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

@@ -109,8 +109,8 @@ private static void ConfigurePhysicalCamera (FbxCamera fbxCamera, Camera unityCa
 
                 // Lens Shift ( Film Offset ) as a percentage 0..1
                 // FBX FilmOffset is in inches
-                fbxCamera.FilmOffsetX.Set(apertureWidthInInches * Mathf.Clamp(unityCamera.lensShift.x, 0f, 1f));
-                fbxCamera.FilmOffsetY.Set(apertureHeightInInches * Mathf.Clamp(unityCamera.lensShift.y, 0f, 1f));
+                fbxCamera.FilmOffsetX.Set(apertureWidthInInches * Mathf.Clamp(Mathf.Abs(unityCamera.lensShift.x), 0f, 1f) * Mathf.Sign(unityCamera.lensShift.x));
+                fbxCamera.FilmOffsetY.Set(apertureHeightInInches * Mathf.Clamp(Mathf.Abs(unityCamera.lensShift.y), 0f, 1f) * Mathf.Sign(unityCamera.lensShift.y));
 
                 // Focal Length
                 fbxCamera.SetApertureMode (FbxCamera.EApertureMode.eFocalLength); 
@@ -123,7 +123,6 @@ private static void ConfigurePhysicalCamera (FbxCamera fbxCamera, Camera unityCa
 
                 // FarPlane
                 fbxCamera.SetFarPlane ((float)unityCamera.farClipPlane.Meters().ToCentimeters());
-
                 return ;
             }
         }

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

@@ -1984,14 +1984,22 @@ private void ExportAnimationCurve (FbxNode fbxNode,
                     Debug.LogError (string.Format ("no fbx property {0} found on {1} node or nodeAttribute ", fbxPropertyChannelPair.Property, fbxNode.GetName ()));
                     return;
                 }
+                if (!fbxProperty.GetFlag(FbxPropertyFlags.EFlags.eAnimatable))
+                {
+                    Debug.LogErrorFormat("fbx property {0} found on node {1} is not animatable", fbxPropertyChannelPair.Property, fbxNode.GetName());
+                }
 
                 // Create the AnimCurve on the channel
                 FbxAnimCurve fbxAnimCurve = fbxProperty.GetCurve (fbxAnimLayer, fbxPropertyChannelPair.Channel, true);
+                if(fbxAnimCurve == null)
+                {
+                    return;
+                }
 
                 // create a convert scene helper so that we can convert from Unity to Maya
                 // AxisSystem (LeftHanded to RightHanded) and FBX's default units 
                 // (Meters to Centimetres)
-                var convertSceneHelper = new UnityToMayaConvertSceneHelper (uniPropertyName);
+                var convertSceneHelper = new UnityToMayaConvertSceneHelper (uniPropertyName, fbxNode);
 
                 // TODO: we'll resample the curve so we don't have to 
                 // configure tangents
@@ -2008,10 +2016,14 @@ internal class UnityToMayaConvertSceneHelper
             bool convertDistance = false;
             bool convertLtoR = false;
             bool convertToRadian = false;
+            bool convertLensShiftX = false;
+            bool convertLensShiftY = false;
+
+            FbxCamera camera = null;
 
             float unitScaleFactor = 1f;
 
-            public UnityToMayaConvertSceneHelper(string uniPropertyName)
+            public UnityToMayaConvertSceneHelper(string uniPropertyName, FbxNode fbxNode)
             {
                 System.StringComparison cc = System.StringComparison.CurrentCulture;
 
@@ -2025,6 +2037,12 @@ public UnityToMayaConvertSceneHelper(string uniPropertyName)
                 convertDistance |= partT;
                 convertDistance |= uniPropertyName.StartsWith ("m_Intensity", cc);
                 convertDistance |= uniPropertyName.ToLower().EndsWith("weight", cc);
+                convertLensShiftX |= uniPropertyName.StartsWith("m_LensShift.x", cc);
+                convertLensShiftY |= uniPropertyName.StartsWith("m_LensShift.y", cc);
+                if (convertLensShiftX || convertLensShiftY)
+                {
+                    camera = fbxNode.GetCamera();
+                }
 
                 // The ParentConstraint's source Rotation Offsets are read in as radians, so make sure they are exported as radians
                 convertToRadian = uniPropertyName.StartsWith("m_RotationOffsets.Array.data", cc);
@@ -2043,9 +2061,26 @@ public UnityToMayaConvertSceneHelper(string uniPropertyName)
 
             public float Convert(float value)
             {
+                float convertedValue = value;
+                if (convertLensShiftX || convertLensShiftY)
+                {
+                    convertedValue = Mathf.Clamp(Mathf.Abs(value), 0f, 1f)*Mathf.Sign(value);
+                }
+                if (camera != null)
+                {
+                    if (convertLensShiftX)
+                    {
+                        convertedValue *= (float)camera.GetApertureWidth();
+                    }
+                    else if (convertLensShiftY)
+                    {
+                        convertedValue *= (float)camera.GetApertureHeight();
+                    }
+                }
+
                 // left handed to right handed conversion
                 // meters to centimetres conversion
-                return unitScaleFactor * value;
+                return unitScaleFactor * convertedValue;
             }
 
         }

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

@@ -90,7 +90,10 @@ public PropertyChannelMap(Dictionary<string,string> propertyMap, Dictionary<stri
             {
                 { "m_Intensity", "Intensity" },
                 { "field of view", "FieldOfView" },
-                { "m_Weight", "Weight" }
+                { "m_Weight", "Weight" },
+                { "m_FocalLength", "FocalLength" },
+                {"m_LensShift.x", "FilmOffsetX" },
+                {"m_LensShift.y", "FilmOffsetY" }
             };
 
         /// <summary>