Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAYA-103230 Cleaned-up export material UI #709

Merged
merged 1 commit into from
Aug 19, 2020
Merged

MAYA-103230 Cleaned-up export material UI #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/mayaUsd/fileio/jobs/jobArgs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ UsdMayaJobExportArgs::GetDefaultDictionary()
d[UsdMayaJobExportArgsTokens->renderLayerMode] =
UsdMayaJobExportArgsTokens->defaultLayer.GetString();
d[UsdMayaJobExportArgsTokens->shadingMode] =
UsdMayaShadingModeTokens->displayColor.GetString();
UsdMayaShadingModeTokens->useRegistry.GetString();
d[UsdMayaJobExportArgsTokens->stripNamespaces] = false;
d[UsdMayaJobExportArgsTokens->verbose] = false;

Expand Down
3 changes: 2 additions & 1 deletion lib/mayaUsd/fileio/shading/shadingModeRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ PXR_NAMESPACE_OPEN_SCOPE

#define PXRUSDMAYA_SHADINGMODE_TOKENS \
(none) \
(displayColor)
(displayColor) \
(useRegistry)

TF_DECLARE_PUBLIC_TOKENS(UsdMayaShadingModeTokens,
MAYAUSD_CORE_PUBLIC,
Expand Down
72 changes: 61 additions & 11 deletions plugin/adsk/scripts/mayaUsdTranslatorExport.mel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,54 @@ global proc mayaUsdTranslatorExport_AnimationRangeCB() {
intFieldGrp -e -v1 $startTime -v2 $endTime framRangeFields;
}

// Known shading modes, in triplets with the nice name and the annotation:
proc string[] mayaUsdTranslatorExport_shadingModeData() {
string $shadingModeData[] = {
"useRegistry",
"USD Preview Surface",
"Exports the bound shader as a USD preview surface UsdShade network.",

"displayColor",
"Display Colors",
"Exports the diffuse color of the bound shader as a displayColor primvar on the USD mesh.",

"none",
"None",
"No material data gets exported.",

"pxrRis",
"RfM Shaders",
""
};
return $shadingModeData;
}

proc string[] mayaUsdTranslatorExport_shadingModeInfo(string $shadingMode) {
string $shadingModeData[] = mayaUsdTranslatorExport_shadingModeData();
int $index = stringArrayFind($shadingMode, 0, $shadingModeData);
if ($index != -1) {
return { $shadingModeData[$index + 1], $shadingModeData[$index + 2] };
} else {
return { $shadingMode, "" };
}
}

proc mayaUsdTranslatorExport_SetMaterialOptionMenu(string $shadingMode, string $widget) {
string $info[] = mayaUsdTranslatorExport_shadingModeInfo($shadingMode);
optionMenuGrp -e -value $info[0] $widget;
}

proc string mayaUsdTranslatorExport_AppendFromMaterialPopup(string $currentOptions, string $arg, string $widget) {
string $value = `optionMenuGrp -q -value $widget`;
string $shadingModeData[] = mayaUsdTranslatorExport_shadingModeData();
int $index = stringArrayFind($value, 1, $shadingModeData);
if ($index != -1) {
return $currentOptions + ";" + $arg + "=" + $shadingModeData[$index - 1];
} else {
return $currentOptions + ";" + $arg + "=" + $value;
}
}

global proc int mayaUsdTranslatorExport (string $parent,
string $action,
string $initialSettings,
Expand Down Expand Up @@ -157,6 +205,7 @@ global proc int mayaUsdTranslatorExport (string $parent,
string $parentScopAnn = "Name of the USD scope that is the parent of the exported data.";
string $colorSetsAnn = "Exports Maya Color Sets as USD primvars.";
string $uvSetsAnn = "Exports Maya UV Sets as USD primvars.";
string $materialsAnn = "Controls whether shading data is exported from the Maya scene and how it is created in USD.";
string $animDataAnn = "Exports Maya animation data as USD time samples.";
string $frameStepAnn = "Specifies the increment between USD time sample frames during animation export";
string $eulerFilterAnn = "Exports the euler angle filtering that was performed in Maya.";
Expand Down Expand Up @@ -200,18 +249,19 @@ global proc int mayaUsdTranslatorExport (string $parent,

checkBoxGrp -l "UV Sets:" -annotation $uvSetsAnn exportUVsCheckBox;

optionMenuGrp -l "Materials:" -ann $materialsAnn shadingModePopup;
string $commonExporters[] = {"useRegistry", "displayColor", "none"};
for ($modeName in $commonExporters) {
string $info[] = mayaUsdTranslatorExport_shadingModeInfo($modeName);
menuItem -l $info[0] -ann $info[1];
}
string $exporters[] = `mayaUSDListShadingModes -export`;
optionMenuGrp -l "Materials:" shadingModePopup;
for ($modeName in $exporters) {
string $niceName = $modeName;
if ($modeName == "displayColor") {
$niceName = "Material Colors";
} else if ($modeName == "pxrRis") {
$niceName = "RfM Shaders";
} else if ($modeName == "useRegistry") {
$niceName = "Preview Surface Shaders";
if (stringArrayFind($modeName, 0, $commonExporters) != -1) {
continue;
}
menuItem -l $niceName -ann $modeName;
string $info[] = mayaUsdTranslatorExport_shadingModeInfo($modeName);
menuItem -l $info[0] -ann $info[1];
}

separator -style "none";
Expand Down Expand Up @@ -291,7 +341,7 @@ global proc int mayaUsdTranslatorExport (string $parent,
} else if ($optionBreakDown[0] == "parentScope") {
mayaUsdTranslatorExport_SetTextField($optionBreakDown[1], "parentScopeField");
} else if ($optionBreakDown[0] == "shadingMode") {
mayaUsdTranslatorExport_SetOptionMenuByAnnotation($optionBreakDown[1], "shadingModePopup");
mayaUsdTranslatorExport_SetMaterialOptionMenu($optionBreakDown[1], "shadingModePopup");
} else if ($optionBreakDown[0] == "exportInstances") {
mayaUsdTranslatorExport_SetOptionMenuByBool($optionBreakDown[1], "exportInstancesPopup");
} else if ($optionBreakDown[0] == "exportVisibility") {
Expand Down Expand Up @@ -319,7 +369,7 @@ global proc int mayaUsdTranslatorExport (string $parent,
$currentOptions = mayaUsdTranslatorExport_AppendFromFloatField($currentOptions, "frameStride", "frameStrideField");
$currentOptions = mayaUsdTranslatorExport_AppendFromTextField($currentOptions, "frameSample", "frameSampleField");
$currentOptions = mayaUsdTranslatorExport_AppendFromTextField($currentOptions, "parentScope", "parentScopeField");
$currentOptions = mayaUsdTranslatorExport_AppendFromPopup($currentOptions, "shadingMode", "shadingModePopup");
$currentOptions = mayaUsdTranslatorExport_AppendFromMaterialPopup($currentOptions, "shadingMode", "shadingModePopup");
$currentOptions = mayaUsdTranslatorExport_AppendFromBoolPopup($currentOptions, "exportInstances", "exportInstancesPopup");
$currentOptions = mayaUsdTranslatorExport_AppendFromCheckbox($currentOptions, "exportVisibility", "exportVisibilityCheckBox");
$currentOptions = mayaUsdTranslatorExport_AppendFromCheckbox($currentOptions, "mergeTransformAndShape", "mergeTransformAndShapeCheckBox");
Expand Down