Merge pull request #353 from Unity-Technologies/UNI-39859-maya-export-model-and-anim

UNI-39859 Maya add option to export both model and anim together

Author: inwoods

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

@@ -6,6 +6,11 @@ global string $UnityFbxAnimFileNameAttr = "unityFbxAnimFileName";
 global string $UnityFbxNamespaceAttr = "unityFbxNamespace";
 global string $UnityExportSetNameFormat = "^1s_UnityExportSet";
 
+/* Enum */
+global int $UnityExportAnim = 0;
+global int $UnityExportModel = 1;
+global int $UnityExportModelAnim = 2;
+
 global proc unityRemoveNativeMenuOnLoad(){
     $removeSendToUnityMenu = `optionVar -q "UnityFbxForMaya_removeSendToUnityMenu"`;
     if($removeSendToUnityMenu && `menu -exists "sendToUnityMenu"`){
@@ -413,7 +418,7 @@ proc exportSet(string $unitySet, int $exportAnim){
     }
 }
 
-proc unityExport(int $exportAnim){
+proc unityExport(int $exportType){
     // get the global variables
     global string $UnityExportSets[];
 
@@ -425,8 +430,21 @@ proc unityExport(int $exportAnim){
         return;
     }
 
+    $exportAnim = false;
+    $exportAnimOnly = false;
+    switch($exportType){
+    case 0 /* export animation only */:
+        $exportAnim = true;
+        $exportAnimOnly = true;
+        break;
+    case 1 /* export model only */:
+        break;
+    default: /* export model + animation */
+        $exportAnim = true;
+        break;
+    }
     FBXProperty "Export|IncludeGrp|Animation" -v $exportAnim;
-    FBXExportAnimationOnly -v $exportAnim;
+    FBXExportAnimationOnly -v $exportAnimOnly;
 
     $origSelection = `ls -sl`;
     if(size($origSelection) <= 0){
@@ -462,7 +480,7 @@ proc unityExport(int $exportAnim){
 
     for($unitySet in $setsToExport){
         print ("exporting set: " + $unitySet);
-        exportSet($unitySet, $exportAnim);
+        exportSet($unitySet, $exportAnimOnly);
     }
 
     select -cl;
@@ -472,9 +490,16 @@ proc unityExport(int $exportAnim){
 }
 
 global proc unityExportAnim(){
-    unityExport(true);
+    global int $UnityExportAnim;
+    unityExport($UnityExportAnim);
 }
 
 global proc unityExportModel(){
-    unityExport(false);
+    global int $UnityExportModel;
+    unityExport($UnityExportModel);
+}
+
+global proc unityExportModelAnim(){
+    global int $UnityExportModelAnim;
+    unityExport($UnityExportModelAnim);
 }

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

@@ -11,14 +11,17 @@ global string $unityFamilyLabel = "The UnityFbxForMaya plugin (v.{Version}) allo
 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";
+global string $unityExportModelAnimLabel = "Export Model and Animation to Unity in a single file";
 
 global string $unityCommandsFile = "unityCommands.mel";
 global string $unityImportMenuName = "Import";
 global string $unityExportModelMenuName = "Export Model Only";
 global string $unityExportAnimMenuName = "Export Animation Only";
+global string $unityExportModelAnimMenuName = "Export";
 global string $unityImportCommand = "unityImport";
 global string $unityExportModelCommand = "unityExportModel";
 global string $unityExportAnimCommand = "unityExportAnim";
+global string $unityExportModelAnimCommand = "unityExportModelAnim";
 
 global proc string unityWhatsNewVersion(){
     return `about -q -version`;
@@ -54,13 +57,16 @@ global proc unityInstallUI(){
     global string $unityImportLabel;
     global string $unityExportModelLabel;
     global string $unityExportAnimLabel;
+    global string $unityExportModelAnimLabel;
     global string $unityCommandsFile;
     global string $unityImportMenuName;
     global string $unityExportModelMenuName;
     global string $unityExportAnimMenuName;
+    global string $unityExportModelAnimMenuName;
     global string $unityImportCommand;
     global string $unityExportModelCommand;
     global string $unityExportAnimCommand;
+    global string $unityExportModelAnimCommand;
 
     global string $gMainFileMenu;
 
@@ -72,6 +78,7 @@ global proc unityInstallUI(){
     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 $unityExportModelAnimMenuName -version $pluginVersion -image $unityExportIconPath -annotation $unityExportModelAnimLabel -command $unityExportModelAnimCommand;
     menuItem -parent $unityMenuName -label $unityExportModelMenuName -version $pluginVersion -image $unityExportIconPath -annotation $unityExportModelLabel -command $unityExportModelCommand;
     menuItem -parent $unityMenuName -label $unityExportAnimMenuName -version $pluginVersion -image $unityExportIconPath -annotation $unityExportAnimLabel -command $unityExportAnimCommand;