Merge pull request #299 from Unity-Technologies/UNI-20156-export-multi-select-and-animation

Uni 20156 export multi select and animation

Author: vkovec

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

@@ -217,12 +217,70 @@ global proc unityImport(){
     }
 }
 
+// returns the intersection of two string arrays
+proc string[] getIntersection(string $set1[], string $set2[]){
+    string $myIntersector = `stringArrayIntersector`;
+    
+    stringArrayIntersector -edit -reset $myIntersector;
+    stringArrayIntersector -edit -intersect $set1 $myIntersector;
+    stringArrayIntersector -edit -intersect $set2 $myIntersector;
+    
+    string $intersection[] = `stringArrayIntersector -query $myIntersector`;
+    
+    // Delete the intersector
+    deleteUI $myIntersector;
+    
+    return $intersection;
+}
 
-global proc unityExport(){
-    // get the global variables
-    global string $UnityExportSet;
+proc exportSet(string $unitySet, int $exportAnim){
     global string $UnityFbxFilePathAttr;
     global string $UnityFbxFileNameAttr;
+    global string $UnityFbxAnimFilePathAttr;
+    global string $UnityFbxAnimFileNameAttr;
+
+    string $unitySetContents[] = `listConnections $unitySet`;
+        
+    string $animatedObjectSet = "";
+    if($exportAnim){
+        string $animCurveSelect[] = `ls -typ animCurve`;
+        string $animatedTransforms[] = `listConnections -t transform $animCurveSelect`;
+        
+        string $setAnimatedTransforms[] = getIntersection($animatedTransforms, $unitySetContents);
+        
+        select -r $setAnimatedTransforms;
+        $animatedObjectSet = `sets`;
+        select -r -ne $animatedObjectSet;
+    }
+    else{
+        select -r -ne $unitySet;
+    }
+    
+    $pathAttr = $UnityFbxFilePathAttr;
+    $nameAttr = $UnityFbxFileNameAttr;
+    
+    if($exportAnim){
+        $pathAttr = $UnityFbxAnimFilePathAttr;
+        $nameAttr = $UnityFbxAnimFileNameAttr;
+    }
+    
+    $unity_fbx_file_path = getAttribute($unitySet, $pathAttr);
+    $unity_fbx_file_name = getAttribute($unitySet, $nameAttr);
+    
+    $strCmd = "";
+    if ($unity_fbx_file_path != "" && $unity_fbx_file_name != ""){
+        $strCmd = "file -force -options \"\" -typ \"FBX export\" -pr -es \"" + $unity_fbx_file_path + "/" + $unity_fbx_file_name + "\"";
+        eval $strCmd;
+    }
+    
+    if(setExists($animatedObjectSet)){
+       delete $animatedObjectSet; 
+    }
+}
+
+proc unityExport(int $exportAnim){
+    // get the global variables
+    global string $UnityExportSets[];
 
     if(!loadUnityDependencies()){
         return;
@@ -232,27 +290,56 @@ global proc unityExport(){
         return;
     }
 
-    // select the export set for export, if it exists,
-    // otherwise take what is currently selected
+    FBXProperty "Export|IncludeGrp|Animation" -v $exportAnim;
+    FBXExportAnimationOnly -v $exportAnim;
+    
     $origSelection = `ls -sl`;
-    if (setExists($UnityExportSet)){
-        select -r -ne $UnityExportSet;
+    if(size($origSelection) <= 0){
+        // nothing selected
+        return;
     }
 
-    $unity_fbx_file_path = getAttribute($UnityExportSet, $UnityFbxFilePathAttr);
-    $unity_fbx_file_name = getAttribute($UnityExportSet, $UnityFbxFileNameAttr);
+    $i = 0;
+    string $setsToExport[];
+    for($exportSet in $UnityExportSets){
+        if(!setExists($exportSet)){
+            continue;
+        }
+        
+        // TODO (UNI-39197) move functionality to separate mel file
+        // check if the selection intersects with this export set
+        string $exportSetContents[] = `listConnections $exportSet`; 
+        string $intersection[] = getIntersection($origSelection, $exportSetContents);
+        
+        if(size($intersection) > 0 ||
+           stringArrayContains($exportSet, $origSelection)){
+            
+            $setsToExport[$i] = $exportSet;
+            $i++;
+        }
+    }
 
-    $strCmd = "";
-    if ($unity_fbx_file_path != "" && $unity_fbx_file_name != ""){
-        $strCmd = "file -force -options \"\" -typ \"FBX export\" -pr -es \"" + $unity_fbx_file_path + "/" + $unity_fbx_file_name + "\"";
+    // if selection doesn't belong to a set, export to a new file
+    if(size($setsToExport) <= 0){
+        eval "SendToUnitySelection";
+        return;
     }
-    else {
-        $strCmd = "SendToUnitySelection";
+    
+    for($unitySet in $setsToExport){
+        print ("exporting set: " + $unitySet);
+        exportSet($unitySet, $exportAnim);
     }
-    eval $strCmd;
 
     select -cl;
     if (size($origSelection) > 0){    
         select -add -ne $origSelection;
     }
+}
+
+global proc unityExportAnim(){
+    unityExport(true);
+}
+
+global proc unityExportModel(){
+    unityExport(false);
 }

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

@@ -9,13 +9,16 @@ 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 $unityImportLabel = "Import an FBX file from a Unity project and auto-configure for exporting";
-global string $unityExportLabel = "Export Model to Unity";
+global string $unityExportModelLabel = "Export Model to Unity";
+global string $unityExportAnimLabel = "Export Animation to Unity";
 
 global string $unityCommandsFile = "unityCommands.mel";
 global string $unityImportMenuName = "Import";
-global string $unityExportMenuName = "Export";
+global string $unityExportModelMenuName = "Export Model Only";
+global string $unityExportAnimMenuName = "Export Animation Only";
 global string $unityImportCommand = "unityImport";
-global string $unityExportCommand = "unityExport";
+global string $unityExportModelCommand = "unityExportModel";
+global string $unityExportAnimCommand = "unityExportAnim";
 
 global proc string unityWhatsNewVersion(){
     return `about -q -version`;
@@ -49,12 +52,15 @@ global proc unityInstallUI(){
     global string $unityPluginVersion;
     global string $unityFamilyLabel;
     global string $unityImportLabel;
-    global string $unityExportLabel;
+    global string $unityExportModelLabel;
+    global string $unityExportAnimLabel;
     global string $unityCommandsFile;
     global string $unityImportMenuName;
-    global string $unityExportMenuName;
+    global string $unityExportModelMenuName;
+    global string $unityExportAnimMenuName;
     global string $unityImportCommand;
-    global string $unityExportCommand;
+    global string $unityExportModelCommand;
+    global string $unityExportAnimCommand;
 
     global string $gMainFileMenu;
 
@@ -65,8 +71,10 @@ global proc unityInstallUI(){
     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;
 
+    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;
+    
     unityRemoveNativeMenuOnLoad(); 
 
 }