Merge branch 'master' into Uni-31457_remove_send_to_unity_menu_item_in_Maya

AJubrey · AJubrey · commit a276f0818204 · 2017-11-21T15:40:58.000-05:00
# Conflicts:
#	Assets/Integrations/Autodesk/maya/scripts/unitySetupUI.mel
diff --git a/Assets/FbxExporters/Editor/FbxExportSettings.cs b/Assets/FbxExporters/Editor/FbxExportSettings.cs
@@ -1,10 +1,3 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
 using System;
 using System.IO;
 using UnityEditorInternal;
@@ -191,8 +184,8 @@ public override void OnInspectorGUI() {
             }
 
             exportSettings.launchAfterInstallation = EditorGUILayout.Toggle(
-                new GUIContent("Launch 3D Application:",
-                    "Launch the selected application after unity integration is completed."),
+                new GUIContent("Keep 3D Application opened:",
+                    "Keep the selected 3D application open after Unity integration install has completed."),
                 exportSettings.launchAfterInstallation
             );
 
@@ -261,12 +254,17 @@ private static string TryFindDCC(string dccPath, string ext, ExportSettings.DCCT
     public class ExportSettings : ScriptableSingleton<ExportSettings>
     {
         public const string kDefaultSavePath = ".";
-        private static List<string> s_PreferenceList = new List<string>() {kMayaOptionName, kMayaLtOptionName, kMaxOptionName, kBlenderOptionName };
+        private static List<string> s_PreferenceList = new List<string>() {kMayaOptionName, kMayaLtOptionName, kMaxOptionName};
         //Any additional names require a space after the name
         public const string kMaxOptionName = "3ds Max ";
         public const string kMayaOptionName = "Maya ";
         public const string kMayaLtOptionName = "MayaLT ";
-        public const string kBlenderOptionName = "Blender ";
+
+        private static string DefaultIntegrationSavePath {
+            get{
+                return Path.GetDirectoryName(Application.dataPath);
+            }
+        }
 
         /// <summary>
         /// The paths where all the different versions of Maya are installed
@@ -343,7 +341,7 @@ protected override void LoadDefaults()
             HideSendToUnityMenu = true;
             ExportFormatSelection = 0;
             convertToModelSavePath = kDefaultSavePath;
-            IntegrationSavePath = Directory.GetCurrentDirectory().ToString();
+            IntegrationSavePath = DefaultIntegrationSavePath;
             dccOptionPaths = null;
             dccOptionNames = null;
         }
@@ -494,7 +492,7 @@ private static int FindDCCVersion(string AppName)
             else
             {
                 float fVersion;
-                //In case we are looking at a Blender version- the int parse will fail so we'll need to parse it as a float.
+                //In case we are looking at something with a decimal based version- the int parse will fail so we'll need to parse it as a float.
                 if (float.TryParse(number, out fVersion))
                 {
                    return (int)fVersion;
@@ -708,7 +706,7 @@ static string AskMayaVersion(string exePath) {
 
             // Output is like: Maya 2018, Cut Number 201706261615
             // We want the stuff after 'Maya ' and before the comma.
-            // TODO: less brittle! Consider also the mel command "about -version".
+            // (Uni-31601) less brittle! Consider also the mel command "about -version".
             var commaIndex = resultString.IndexOf(',');
             return resultString.Substring(0, commaIndex).Substring("Maya ".Length);
         }
@@ -775,7 +773,7 @@ public static string GetIntegrationSavePath()
             if (string.IsNullOrEmpty(instance.IntegrationSavePath.Trim()) || !Directory.Exists(instance.IntegrationSavePath))
             {
                 //The project folder, above the asset folder
-                Directory.GetCurrentDirectory().ToString();
+                instance.IntegrationSavePath = DefaultIntegrationSavePath;
             }
             return instance.IntegrationSavePath;
         }
diff --git a/Assets/FbxExporters/Editor/FbxExporter.cs b/Assets/FbxExporters/Editor/FbxExporter.cs
@@ -236,7 +236,7 @@ void ExportComponentAttributes (MeshInfo mesh, FbxMesh fbxMesh, int[] unmergedTr
                     // set texture coordinates per vertex
                     FbxLayerElementArray fbxElementArray = fbxLayerElement.GetDirectArray ();
 
-                    // TODO: only copy unique UVs into this array, and index appropriately
+                    // (Uni-31596) only copy unique UVs into this array, and index appropriately
                     for (int n = 0; n < mesh.VertexColors.Length; n++) {
                         // Converting to Color from Color32, as Color32 stores the colors
                         // as ints between 0-255, while FbxColor and Color
@@ -289,7 +289,7 @@ static void ExportUVs(FbxMesh fbxMesh, MeshInfo mesh, int[] unmergedTriangles)
                         // set texture coordinates per vertex
                         FbxLayerElementArray fbxElementArray = fbxLayerElement.GetDirectArray ();
 
-                        // TODO: only copy unique UVs into this array, and index appropriately
+                        // (Uni-31596) only copy unique UVs into this array, and index appropriately
                         for (int n = 0; n < uvs[i].Length; n++) {
                             fbxElementArray.Add (new FbxVector2 (uvs[i] [n] [0],
                                 uvs[i] [n] [1]));
@@ -1242,7 +1242,7 @@ public Vector3 [] Normals { get {
                     } }
 
                 /// <summary>
-                /// TODO: Gets the binormals for the vertices.
+                /// Gets the binormals for the vertices.
                 /// </summary>
                 /// <value>The normals.</value>
                 private Vector3[] m_Binormals;
@@ -1270,7 +1270,7 @@ public Vector3 [] Binormals {
                 }
 
                 /// <summary>
-                /// TODO: Gets the tangents for the vertices.
+                /// Gets the tangents for the vertices.
                 /// </summary>
                 /// <value>The tangents.</value>
                 private Vector4[] m_tangents;
@@ -1282,7 +1282,7 @@ public Vector4 [] Tangents { get {
                     } }
 
                 /// <summary>
-                /// TODO: Gets the vertex colors for the vertices.
+                /// Gets the vertex colors for the vertices.
                 /// </summary>
                 /// <value>The vertex colors.</value>
                 private Color32 [] m_vertexColors;
diff --git a/Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs b/Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs
@@ -773,11 +773,11 @@ void ClassifyComponents(Transform newFbx, Transform prefab)
                     // same node), we line up the components in the order they
                     // appear. This never happens in stock Unity, someone must have
                     // added an AssetPostprocessor for it to occur.
-                    // TODO: do something smarter.
+                    // (Uni-31604) Improve how the auto-updater classifies components
                     //
                     // If the node isn't going to be in the prefab, we don't care
                     // about what components might be on it.
-                    foreach(var name in m_nodesInUpdatedPrefab)
+                    foreach (var name in m_nodesInUpdatedPrefab)
                     {
                         if (!m_new.HasNode(name)) {
                             // It's not in the FBX, so clearly we're not updating any components.
@@ -794,18 +794,12 @@ void ClassifyComponents(Transform newFbx, Transform prefab)
                             List<string> prefabValues = null; // get them only if we need them.
 
                             // If we have multiple identical-type components, match them up by index.
-                            // TODO: match them up to minimize the diff instead.
                             int oldN = oldValues.Count;
                             int newN = newValues.Count;
                             for(int i = 0, n = System.Math.Max(oldN, newN); i < n; ++i) {
                                 if (/* isNew */ i < newN) {
                                     var newValue = newValues[i];
-
-                                    // Special case on Transform: if we reparented
-                                    // this node then always update the transform
-                                    // (UNI-25526). That's because when we do the
-                                    // reparenting, it changes the 'prefabValue' in
-                                    // a complicated way.
+                                    
                                     var isReparentedTransform = (typename == "UnityEngine.Transform"
                                         && m_reparentings.ContainsKey(name));
 
diff --git a/Assets/FbxExporters/Editor/InstallIntegration.cs b/Assets/FbxExporters/Editor/InstallIntegration.cs
@@ -1,10 +1,3 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
 using UnityEngine;
 using UnityEditor;
 using System;
@@ -442,8 +435,9 @@ public bool InstallMaya(bool verbose = false)
 
                 if (installed)
                 {
-                    // FIXME: remove this when we support parsing existing .mod files
-                    try {
+                    // (Uni-31606): remove this when we support parsing existing .mod files
+                    try
+                    {
                         if (verbose) { Debug.Log(string.Format("Deleting module file {0}", moduleFilePath)); }
                         System.IO.File.Delete(moduleFilePath);
                         installed = false;
@@ -478,15 +472,7 @@ public bool InstallMaya(bool verbose = false)
             {
                 throw new NotImplementedException();
 
-                // TODO: parse installed .mod file
-
-                // TODO: if maya version not installed add
-
-                // TODO: else check installation path
-
-                // TODO: if installation path different
-
-                // TODO: print message package already installed else where
+                // (Uni-31606) Parse maya mod file during installation and find location
             }
 
             return SetupUserStartupScript (verbose);
diff --git a/Assets/FbxExporters/Editor/ReviewLastSavedModel.cs b/Assets/FbxExporters/Editor/ReviewLastSavedModel.cs
@@ -189,7 +189,7 @@ public static void LastSavedModel ()
                 System.Collections.Generic.List<UnityEngine.SceneManagement.Scene> scenes
                       = new System.Collections.Generic.List<UnityEngine.SceneManagement.Scene> ();
 
-                string desiredSceneName = "";//FbxExporters.EditorTools.ExportSettings.GetTurnTableSceneName ();
+                string desiredSceneName = "";
                 if (string.IsNullOrEmpty (desiredSceneName)) {
                     desiredSceneName = DefaultSceneName;
                 }
@@ -212,7 +212,7 @@ public static void LastSavedModel ()
                 // if turntable scene not added to list of scenes
                 if (!scene.IsValid () || !scene.isLoaded) 
                 {
-                    string scenePath = "";//FbxExporters.EditorTools.ExportSettings.GetTurnTableScenePath ();
+                    string scenePath = "";
                     if (string.IsNullOrEmpty(scenePath)) {
                         // and if for some reason the turntable scene is missing create an empty scene
                         // NOTE: we cannot use NewScene because it will force me to save the modified Untitled scene
diff --git a/Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs b/Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs
@@ -189,7 +189,6 @@ public void TestFindPreferredProgram()
             testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMayaOptionName + "2016"));
             testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMayaOptionName + "2017"));
             testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMaxOptionName + "2017"));
-            testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kBlenderOptionName + "2.67"));
             testList.Add(ExportSettings.GetUniqueDCCOptionName(""));
             testList.Add(ExportSettings.GetUniqueDCCOptionName(null));
             testList.Add(ExportSettings.GetUniqueDCCOptionName(ExportSettings.kMayaLtOptionName));
@@ -201,13 +200,6 @@ public void TestFindPreferredProgram()
             //While Maya 2017 and 3ds Max 2017 are tied for most recent, Maya 2017 should win because we prefer Maya.
             Assert.AreEqual(preferred, 9);
 
-            List<string> blenderList = new List<string> { "Blender 2.67", "Blender 3.0" };
-            ExportSettings.instance.SetDCCOptionNames(blenderList);
-
-            preferred = ExportSettings.instance.GetPreferredDCCApp();
-            //The function should be able to deal with floats well enough to give us a preferred version of soemthing like blender, which does not use the year.
-            Assert.AreEqual(preferred, 1);
-
             ExportSettings.instance.ClearDCCOptionNames();
             //Try running it with an empty list
             preferred = ExportSettings.instance.GetPreferredDCCApp();
diff --git a/Assets/Integrations/Autodesk/max/scripts/UnityFbxForMaxPlugin.ms b/Assets/Integrations/Autodesk/max/scripts/UnityFbxForMaxPlugin.ms
@@ -1,5 +1,5 @@
 -- MacroScripts that will perform actions
-macroScript UnityImport category:"Unity" tooltip:"Import FBX file from Unity project and auto-configure for exporting."
+macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unity project and auto-configure for exporting"
 (
     origObjects = #()
 
diff --git a/Assets/Integrations/Autodesk/maya/scripts/unitySetupUI.mel b/Assets/Integrations/Autodesk/maya/scripts/unitySetupUI.mel
@@ -8,41 +8,68 @@ global string $unityExportIconPath = "export.png";
 global string $unityIconPath = "unity.png";
 
 global string $unityFamilyLabel = "The UnityFbxForMaya plugin allows you to reliably exchange and review your work between Maya and Unity.";
-global string $unityImportLabel = "Import FBX file from Unity Project and auto-configure for exporting";
+global string $unityImportLabel = "Import an FBX file from a Unity project and auto-configure for exporting";
 global string $unityExportLabel = "Export Model to Unity";
 
+global string $unityCommandsFile = "unityCommands.mel";
+global string $unityImportMenuName = "Import";
+global string $unityExportMenuName = "Export";
+global string $unityImportCommand = "unityImport";
+global string $unityExportCommand = "unityExport";
 global string $unityRemoveSendToUnityMenuOption = "UnityFbxForMaya_removeSendToUnityMenu";
 global string $unitySendToUnityMenuName = "sendToUnityMenu";
 
-
 global proc string unityWhatsNewVersion(){
     return `about -q -version`;
 
 }
 
 global proc unitySetupUI(){
-
     global string $removeOtherMenuString;
     global string $unitySendToUnityMenuName;
 
     $isHeadless = `optionVar -q "UnityFbxForMaya_Headless"`;
     if($isHeadless){
         // headless install, don't add UI
         return;
-    }
+    }    
+
+    evalDeferred -lowestPriority "unityInstallUI";
+}
+
+global proc unityInstallUI(){
+    global string $unityMenuName;
+    global string $unityMenuDivider;
+    global string $unityMenuLabel;
+    global string $unityMenuInsertAfter;
+
+    global string $unityImportIconPath;
+    global string $unityExportIconPath;
+    global string $unityIconPath;
+
+    global string $unityFamilyLabel;
+    global string $unityImportLabel;
+    global string $unityExportLabel;
+    global string $unityCommandsFile;
+    global string $unityImportMenuName;
+    global string $unityExportMenuName;
+    global string $unityImportCommand;
+    global string $unityExportCommand;
     
-    evalDeferred -lowestPriority "buildFileMenu; \
-    \
-    $removeOtherMenu = `optionVar -q $unityRemoveSendToUnityMenuOption`;\
-    if($removeOtherMenu){\
-        menu -e -visible false $unitySendToUnityMenuName;\
-    }\
-    \
-    $parentMenu = $gMainFileMenu; \
-    $pluginVersion = unityWhatsNewVersion(); \
-    source \"unityCommands.mel\"; \
-    menuItem -parent $parentMenu -insertAfter $unityMenuInsertAfter -divider true -longDivider false -version $pluginVersion $unityMenuDivider; \
-    menuItem -parent $parentMenu -insertAfter $unityMenuDivider -subMenu true -label $unityMenuLabel -tearOff true -version $pluginVersion -image $unityIconPath -annotation $unityFamilyLabel $unityMenuName; \
-    menuItem -parent $unityMenuName -label \"Import\" -version $pluginVersion -image $unityImportIconPath -annotation $unityImportLabel -command \"unityImport\"; \
-    menuItem -parent $unityMenuName -label \"Export\" -version $pluginVersion -image $unityExportIconPath -annotation $unityExportLabel -command \"unityExport\";";
+    global string $gMainFileMenu;
+
+    buildFileMenu;
+    $parentMenu = $gMainFileMenu;
+    $pluginVersion = unityWhatsNewVersion();
+    eval ("source " + $unityCommandsFile);
+    menuItem -parent $parentMenu -insertAfter $unityMenuInsertAfter -divider true -longDivider false -version $pluginVersion $unityMenuDivider;
+    menuItem -parent $parentMenu -insertAfter $unityMenuDivider -subMenu true -label $unityMenuLabel -tearOff true -version $pluginVersion -image $unityIconPath -annotation $unityFamilyLabel $unityMenuName;
+    menuItem -parent $unityMenuName -label $unityImportMenuName -version $pluginVersion -image $unityImportIconPath -annotation $unityImportLabel -command $unityImportCommand;
+    menuItem -parent $unityMenuName -label $unityExportMenuName -version $pluginVersion -image $unityExportIconPath -annotation $unityExportLabel -command $unityExportCommand;
+    
+    $removeOtherMenu = `optionVar -q $unityRemoveSendToUnityMenuOption`;
+    if($removeOtherMenu){
+        menu -e -visible false $unitySendToUnityMenuName;
+    }    
+
 }
diff --git a/CMakeLists.txt b/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 "1.1.0b1")
+    set(PACKAGE_VERSION "sprint34")
 endif()
 message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,33 @@
 RELEASE NOTES
 
+**Version**: sprint34
+
+NEW FEATURES
+
+* Ship all C# scripts as source code
+
+* Added Maya LT Integration
+
+Replaced Maya python implementation with MEL script, which is used by both Maya and Maya LT.
+
+NOTE: it is no longer possible to unload the plugin using Maya's plugin manager.
+
+* Export Settings: Added option to launch 3D application after installing integration
+
+* Export Settings: Added option to export FBX as ASCII or Binary
+
+* Export Settings: Added integration unzip location field
+
+Use new field to select where to unzip the integration zip file, instead of being asked each time
+"Install Unity Integration" button is clicked.
+
+FIXES
+* Export Settings: Moved "Browse" button out of the dropdown
+* Unity 3ds Max Integration: Added tooltips to the import/export menu items
+* Export Settings: Align checkboxes, text fields, and dropdown
+* Fbx Prefab: Add tooltip to "Source Fbx Asset" field
+* Export Settings: Search for 3D applicaitons in multiple vendor locations (e.g. C:/ and D:/ drive)
+
 **Version**: 1.1.0b1
 
 NEW FEATURES

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`-- MacroScripts that will perform actions`
`2`		`-macroScript UnityImport category:"Unity" tooltip:"Import FBX file from Unity project and auto-configure for exporting."`
	`2`	`+macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unity project and auto-configure for exporting"`
`3`	`3`	`(`
`4`	`4`	`origObjects = #()`
`5`	`5`