Merge branch 'master' into UNI-48338-standardized-fbxsdk-namespace

Author: vkovec

Assets/com.unity.formats.fbx.tests/ExportTimelineClipTest.cs

@@ -1,10 +1,10 @@
 using UnityEngine;
-using UnityEditor;
 using NUnit.Framework;
 using FbxExporters.Editor;
 using UnityEngine.Timeline;
 using UnityEngine.Playables;
 using UnityEditor.SceneManagement;
+using System.Collections.Generic;
 
 namespace FbxExporters.UnitTests
 {
@@ -22,35 +22,31 @@ public void ExportSingleTimelineClipTest()
         {
             GameObject myCube = GameObject.Find("CubeSpecial");
             string folderPath = GetRandomFileNamePath(extName: "");
+            string filePath = null;
+            var exportData = new Dictionary<GameObject, IExportData>();
 
             PlayableDirector pd = myCube.GetComponent<PlayableDirector> ();
             if (pd != null) {
                 foreach (PlayableBinding output in pd.playableAsset.outputs) {
                     AnimationTrack at = output.sourceObject as AnimationTrack;
 
                     GameObject atObject = pd.GetGenericBinding (output.sourceObject) as GameObject;
+                    Assert.That (atObject, Is.Not.Null);
+
                     // One file by animation clip
                     foreach (TimelineClip timeLineClip in at.GetClips()) {
-                        var filePath = string.Format ("{0}/{1}@{2}", folderPath, atObject.name, "Recorded.fbx");
-                        ModelExporterReflection.ExportSingleTimelineClip (timeLineClip, atObject, filePath);
-                        FileAssert.Exists (filePath);
+                        Assert.That (timeLineClip.animationClip, Is.Not.Null);
+
+                        filePath = string.Format ("{0}/{1}@{2}", folderPath, atObject.name, "Recorded.fbx");
+                        exportData[atObject] = ModelExporterReflection.GetExportData(atObject, timeLineClip.animationClip);
+                        break;
                     }
                 }
             }
-        }
-
-        [Test]
-        public void ExportAllTimelineClipTest()
-        {
-            GameObject myCube = GameObject.Find("CubeSpecial");
-            Selection.objects = new UnityEngine.GameObject[] { myCube };
-            string folderPath = GetRandomFileNamePath(extName: "");
-
-            foreach(GameObject obj in Selection.objects)
-            {
-                ModelExporterReflection.ExportAllTimelineClips(obj, folderPath);
-                FileAssert.Exists(string.Format("{0}/{1}@{2}", folderPath, obj.name, "Recorded.fbx"));
-            }
+            Assert.That (filePath, Is.Not.Null);
+            Assert.That (exportData, Is.Not.Null);
+            ModelExporterReflection.ExportObjects(filePath, new Object[1]{myCube}, null, exportData);
+            FileAssert.Exists (filePath);
         }
     }
 }

Assets/com.unity.formats.fbx.tests/FbxExporterReflection.cs

@@ -1,12 +1,10 @@
 using FbxExporters.Editor;
-using FbxExporters.EditorTools;
 using System;
 using System.Linq;
 using System.Collections.Generic;
 using System.Reflection;
 using UnityEngine.Formats.FbxSdk;
 using UnityEngine;
-using UnityEngine.Timeline;	
 
 namespace FbxExporters.UnitTests
 {
@@ -94,6 +92,23 @@ public static bool ExportMaterial(ModelExporter instance, Material unityMaterial
             return (bool)InvokeMethod("ExportMaterial", new object[] {unityMaterial,fbxScene,fbxNode},instance);
         }
 
+        public static string ExportObjects(string filePath,
+                UnityEngine.Object[] objects = null,
+                EditorTools.IExportOptions exportOptions = null,
+                Dictionary<GameObject, IExportData> exportData = null)
+        {
+            return (string)InvokeMethodOverload("ExportObjects",
+                                              new object[] { filePath, objects, exportOptions, exportData },
+                                              new Type[] { typeof(string), typeof(UnityEngine.Object[]), typeof(EditorTools.IExportOptions), typeof(Dictionary<GameObject, IExportData>) });
+        }
+
+        public static IExportData GetExportData(GameObject rootObject, AnimationClip animationClip, EditorTools.IExportOptions exportOptions = null)
+        {
+            return (IExportData)InvokeMethodOverload("GetExportData",
+                                                    new object[] { rootObject, animationClip, exportOptions },
+                                                    new Type[] { typeof(GameObject), typeof(AnimationClip), typeof(EditorTools.IExportOptions) });
+        }
+
         // Redefinition of the internal delegate. There might be a way to re-use the one in ModelExporter
         public static void RegisterMeshObjectCallback(ModelExporter.GetMeshForObject callback)
         {
@@ -161,18 +176,6 @@ public static bool ExportMesh(ModelExporter instance, Mesh mesh, FbxNode fbxNode
 
         }
 
-        public static void ExportSingleTimelineClip(TimelineClip timelineClipSelected, GameObject animationTrackGObject, string filePath = null)
-        {
-            InvokeMethod("ExportSingleTimelineClip", 
-                         new object[] {timelineClipSelected, animationTrackGObject, filePath});
-        }
-
-        public static void ExportAllTimelineClips(GameObject objectWithPlayableDirector, string folderPath, IExportOptions exportOptions = null)
-        {
-            InvokeMethod("ExportAllTimelineClips", 
-                         new object[] {objectWithPlayableDirector, folderPath, exportOptions});
-        }
-
         /////////// Helpers ///////////
         private static object InvokeMethod(string methodName, object[] argsToPass, ModelExporter instance = null)
         {

Assets/com.unity.formats.fbx.tests/Models.meta

@@ -7,7 +7,7 @@ global string $unityImportIconPath = "import.png";
 global string $unityExportIconPath = "export.png";
 global string $unityIconPath = "unity.png";
 
-global string $unityFamilyLabel = "The UnityFbxForMaya plugin (v.{Version}) allows you to reliably exchange and review your work between Maya and Unity.";
+global string $unityFamilyLabel = "The UnityFbxForMaya plugin (v.1.6.0-preview) allows you to reliably exchange and review your work between Maya and Unity.";
 global string $unityImportLabel = "Import an FBX file from a Unity project and auto-configure for exporting";
 global string $unityExportModelLabel = "Export Model to Unity";
 global string $unityExportAnimLabel = "Export Animation to Unity";

Assets/com.unity.formats.fbx.tests/Models/DefaultMale.meta

@@ -2,6 +2,16 @@
 
 RELEASE NOTES
 
+**Version**: 1.6.0-preview
+
+NEW FEATURES
+
+* Added support for physical cameras
+
+FIXES
+
+* Fixed skinned mesh bone update
+
 **Version**: 1.5.0-preview
 
 NEW FEATURES

Packages/Integrations/Autodesk/maya/scripts/unitySetupUI.mel

@@ -1,6 +1,6 @@
 # About the FBX Exporter package 
 
-__Version__: 0.0.6-preview
+__Version__: 1.6.0-preview
 
 The FBX Exporter package provides round-trip workflows between Unity and 3D modeling software. Use this workflow to send geometry, Lights, Cameras, and animation from Unity to Maya, Maya LT, or 3ds Max, and back again, with minimal effort.
 
@@ -16,7 +16,7 @@ The FBX Exporter package includes the following features:
 
 The FBX Exporter package is compatible with the following versions of the Unity Editor:
 
-* 2018.1 and later
+* 2018.2 and later
 
 The Unity Integration for Maya feature supports the following versions of Maya: