Merge pull request #360 from Unity-Technologies/UNI-32798-1.3.0b1-forum-release

UNI-32798 1.3.0b1 forum release

Author: vkovec

Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

@@ -556,7 +556,7 @@ protected override bool Export(){
                     return true;
                 }
 
-                if (ModelExporter.ExportObjects (filePath, ToExport, SettingsObject, timelineAnim: m_isTimelineAnim) != null) {
+                if (ModelExporter.ExportObjects (filePath, ToExport, SettingsObject) != null) {
                     // refresh the asset database so that the file appears in the
                     // asset folder view.
                     AssetDatabase.Refresh ();

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1889,8 +1889,8 @@ protected void ExportAnimationClip (AnimationClip uniAnimClip, GameObject uniRoo
             /// Transfers transform animation from source to dest. Replaces dest's Unity Animation Curves with updated animations.
             /// NOTE: Source must be the parent of dest.
             /// </summary>
-            /// <param name="source">Source.</param>
-            /// <param name="dest">Destination.</param>
+            /// <param name="source">Source animated object.</param>
+            /// <param name="dest">Destination, child of the source.</param>
             /// <param name="sampleRate">Sample rate.</param>
             /// <param name="unityCurves">Unity curves.</param>
             private void TransferMotion(Transform source, Transform dest, float sampleRate, ref Dictionary<GameObject, List<UnityCurve>> unityCurves){
@@ -1933,14 +1933,23 @@ private void TransferMotion(Transform source, Transform dest, float sampleRate,
                     scaleKeyFrames[k] = new Keyframe[sampleTimes.Count];
                 }
 
+                // If we have a point in local coords represented as a column-vector x, the equation of x in coordinates relative to source's parent is:
+                //   x_grandparent = source * dest * x
+                // Now we're going to change dest to dest' which has the animation from source. And we're going to change
+                // source to source' which has no animation. The equation of x will become:
+                //   x_grandparent = source' * dest' * x
+                // We're not changing x_grandparent and x, so we need that:
+                //   source * dest = source' * dest'
+                // We know dest and source (both animated) and source' (static). Solve for dest':
+                //   dest' = (source')^-1 * source * dest
                 int keyIndex = 0;
+                var sourceStaticMatrixInverse = Matrix4x4.TRS(source.localPosition, source.localRotation, source.localScale).inverse;
                 foreach (var currSampleTime in sampleTimes) 
                 {
                     var sourceLocalMatrix = GetTransformMatrix (currSampleTime, source, sourceUnityCurves);
                     var destLocalMatrix = GetTransformMatrix (currSampleTime, dest, destUnityCurves);
 
-                    // child * parent
-                    var newLocalMatrix = sourceLocalMatrix * destLocalMatrix;
+                    var newLocalMatrix = sourceStaticMatrixInverse * sourceLocalMatrix * destLocalMatrix;
 
                     FbxVector4 translation, rotation, scale;
                     GetTRSFromMatrix (newLocalMatrix, out translation, out rotation, out scale);
@@ -2227,9 +2236,6 @@ protected int ExportTransformHierarchy(
                 // Use RSrs as the scaling inheritance instead.
                 fbxNode.SetTransformationInheritType (FbxTransform.EInheritType.eInheritRSrs);
 
-                if (TransformShouldBeReset (unityGo.transform)) {
-                    exportType = TransformExportType.Reset;
-                }
                 ExportTransform (unityGo.transform, fbxNode, newCenter, exportType);
 
                 fbxNodeParent.AddChild (fbxNode);
@@ -2278,35 +2284,6 @@ protected int ExportTransformHierarchy(
                 return numObjectsExported;
             }
 
-            /// <summary>
-            /// Checks if the transform should be reset.
-            /// Transform should be reset if animation is being transferred, and this transform
-            /// is either the animation source, destination, or between these nodes.
-            /// </summary>
-            /// <returns><c>true</c>, if transform should be reset, <c>false</c> otherwise.</returns>
-            /// <param name="t">Transform.</param>
-            private bool TransformShouldBeReset(Transform t){
-                var source = ExportOptions.AnimationSource;
-                var dest = ExportOptions.AnimationDest;
-
-                if (!source || !dest || source == dest) {
-                    return false;
-                }
-
-                // don't want to reset destination, if it's a bone this could cause issues with the skinning
-                var curr = dest.parent;
-                while (curr != source && curr != null) {
-                    if (t == curr) {
-                        return true;
-                    }
-                    curr = curr.parent;
-                }
-                if (t == source) {
-                    return true;
-                }
-                return false;
-            }
-
             /// <summary>
             /// Export data containing what to export when
             /// exporting animation only.
@@ -2325,10 +2302,6 @@ public struct AnimationOnlyExportData {
                 // first clip to export
                 public AnimationClip defaultClip;
 
-                // TODO: find a better way to keep track of which components + properties we support
-                private static List<string> cameraProps = new List<string>{"field of view"};
-                private static List<string> lightProps = new List<string>{"m_Intensity", "m_SpotAngle", "m_Color.r", "m_Color.g", "m_Color.b"};
-
                 public AnimationOnlyExportData(
                     Dictionary<AnimationClip, GameObject> animClips,
                     HashSet<GameObject> exportSet,
@@ -2345,6 +2318,9 @@ public void ComputeObjectsInAnimationClips(
                     GameObject animationRootObject,
                     bool exportSkinnedMeshAnim = true
                 ){
+                    // NOTE: the object (animationRootObject) containing the animation is not necessarily animated
+                    // when driven by an animator or animation component.
+
                     foreach (var animClip in animClips) {
                         if (this.animationClips.ContainsKey(animClip)) {
                             // we have already exported gameobjects for this clip
@@ -2368,11 +2344,12 @@ public void ComputeObjectsInAnimationClips(
                                 continue;
                             }
 
-                            if (lightProps.Contains (uniCurveBinding.propertyName)) {
-                                this.exportComponent.Add (unityGo, typeof(Light));
-                            } else if (cameraProps.Contains (uniCurveBinding.propertyName)) {
-                                this.exportComponent.Add (unityGo, typeof(Camera));
-                            }
+                            // If we have a clip driving a camera or light then force the export of FbxNodeAttribute
+                            // so that they point the right way when imported into Maya.
+                            if (unityGo.GetComponent<Light>())
+                                this.exportComponent[unityGo] = typeof(Light);
+                            else if (unityGo.GetComponent<Camera>())
+                                this.exportComponent[unityGo] = typeof(Camera);
 
                             this.goExportSet.Add (unityGo);
                         }
@@ -2534,9 +2511,6 @@ private bool ExportGameObjectAndParents(
 
                 // export regular transform if we are not a bone or failed to export as a bone
                 if(!exportedBoneTransform){
-                    if (TransformShouldBeReset (unityGo.transform)) {
-                        exportType = TransformExportType.Reset;
-                    }
                     ExportTransform (unityGo.transform, fbxNode, newCenter, exportType);
                 }
 
@@ -3339,7 +3313,7 @@ public static void ExportSingleTimelineClip(TimelineClip timelineClipSelected, G
                 };
 
                 if (!string.IsNullOrEmpty (filePath)) {
-                    ExportObjects (filePath, exportArray, timelineAnim: true);
+                    ExportObjects (filePath, exportArray);
                     return;
                 }
 
@@ -3372,7 +3346,7 @@ public static void ExportAllTimelineClips(GameObject objectWithPlayableDirector,
                         }
                         string filePath = string.Format(AnimFbxFormat, folderPath, atObject.name, timelineClip.displayName);
                         UnityEngine.Object[] myArray = new UnityEngine.Object[] { atObject, timelineClip.animationClip };
-                        ExportObjects (filePath, myArray, exportOptions, timelineAnim: true);
+                        ExportObjects (filePath, myArray, exportOptions);
                     }
                 }
             }
@@ -3866,8 +3840,7 @@ private static void OnExport ()
             public static string ExportObjects (
                 string filePath,
                 UnityEngine.Object[] objects = null,
-                IExportOptions exportOptions = null,
-                bool timelineAnim = false)
+                IExportOptions exportOptions = null)
             {
                 LastFilePath = filePath;
 
@@ -3881,7 +3854,8 @@ public static string ExportObjects (
                     }
 
                     Dictionary<GameObject, AnimationOnlyExportData> animationExportData = null;
-                    if (timelineAnim) {
+                    // if there are only two objects for export and the second is an animation clip, then we are exporting from the timeline
+                    if (objects.Length == 2 && objects[1] is AnimationClip) {
                         // We expect the first argument in the list to be the GameObject, the second one is the Animation Clip/Track we are exporting from the timeline
                         GameObject rootObject = ModelExporter.GetGameObject (objects [0]);
                         AnimationClip timelineClip = objects [1] as AnimationClip;
@@ -3909,10 +3883,9 @@ public static string ExportObjects (
 
             public static string ExportObject (
                 string filePath, UnityEngine.Object root,
-                IExportOptions exportOptions = null,
-                bool isTimelineAnim = false)
+                IExportOptions exportOptions = null)
             {
-                return ExportObjects(filePath, new Object[] { root }, exportOptions, isTimelineAnim);
+                return ExportObjects(filePath, new Object[] { root }, exportOptions);
             }
 
             private static void EnsureDirectory (string path)

Assets/Integrations/Autodesk/maya/scripts/unityCommands.mel

@@ -234,7 +234,7 @@ proc importFile(string $filePathStr){
         storeAttribute($unityExportSet, $UnityFbxFileNameAttr, "");
         storeAttribute($unityExportSet, $UnityFbxNamespaceAttr, "");
     }
-    
+
     if(`namespaceInfo -cur -an` != $targetNamespace){
         namespace -set $targetNamespace;
     }

CMakeLists.txt

@@ -23,7 +23,7 @@ endif()
 message(STATUS "Building for ${CMAKE_BUILD_TYPE}")
 
 if (NOT DEFINED PACKAGE_VERSION OR "${PACKAGE_VERSION}" STREQUAL "")
-    set(PACKAGE_VERSION "sprint50")
+    set(PACKAGE_VERSION "1.3.0b1")
 endif()
 message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
 

RELEASE_NOTES.md

@@ -1,5 +1,21 @@
 RELEASE NOTES
 
+**Version**: 1.3.0b1
+
+FIXES
+
+* FbxExporter: if "Animated Skinned Mesh" off, don't export skinned mesh transform
+* Maya Integration: fix so saved files do not lose export set information on export
+* ConvertToPrefab: fix error when converting model instances whose file ends in .FBX (with capitals)
+
+KNOWN ISSUES
+
+* FbxExporter: animated skinned meshes must be in the bind pose on export (i.e. not being previewed in the Animation or Timeline windows, and the original rig's fbx must not contain animation)
+* FbxExporter: animated meshes in bone hierarchy are not supported
+* FbxExporter: for skinned meshes all bones must be descendants of the root bone
+* 3DIntegration: fbx containing rig must have file units in cm in order for animation exported from Unity to be properly applied
+* ConvertToPrefab: converting model instance that has been modified in the scene won't reexport fbx
+
 **Version**: sprint50
 
 NEW FEATURES

RELEASE_NOTES_EXTERNAL.md

@@ -1,5 +1,28 @@
 RELEASE NOTES
 
+**Version**: 1.3.0b1
+
+NEW FEATURES
+* FbxExporter: Export animation clips from Timeline
+* FbxExportSettings: Added new UI to set export settings
+* FbxExportSettings: Added option to transfer transform animation on export
+* FbxExporterSettings: Added option to export model only
+* FbxExporterSettings: Added option to export animation only
+* FbxExporterSettings: Added option not to export animation on skinned meshes
+* FbxExportSettings: Added option to export meshes without renderers
+* FbxExportSettings: Added LOD export option
+* UnityMayaIntegration: Allow multi file import
+* UnityMayaIntegration: Allow multi file export by scene selection
+* FbxPrefabAutoUpdater: new UI to help manage name changes
+
+FIXES
+* FbxExporter: link materials to objects connected to mesh instances
+* FbxExporter: export meshes in model prefab instances as mesh instances in fbx
+* ConvertToPrefab: Don't re-export fbx model instances
+* FbxExportSettings: fix console error on Mac when clicking "Install Unity Integration"
+* FbxExporter: fix so animating spot angle in Unity animates cone angle in Maya (not penumbra)
+* FbxExporter: export correct rotation order (xyz) for euler rotation animations (previously would export as zxy)
+
 **Version**: 1.3.0a1
 
 NEW FEATURES