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

EMSUSD-279 - Change the export options to be consistent with import options #3251

Merged
merged 1 commit into from
Aug 1, 2023
Merged

EMSUSD-279 - Change the export options to be consistent with import options #3251

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/usd/translators/shading/shadingTokens.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ TF_DECLARE_PUBLIC_TOKENS(
#define TR_MTLX_COMMON \
((conversionName, "MaterialX")) \
((contextName, "mtlx")) \
((niceName, "MaterialX shading")) \
((niceName, "MaterialX Shading")) \
((exportDescription, "Exports bound shaders as a MaterialX UsdShade network.")) \
((importDescription, "Search for a MaterialX UsdShade network to import.")) \
((ConstructorPrefix, "MayaCTOR")) \
Expand Down
26 changes: 13 additions & 13 deletions plugin/adsk/scripts/mayaUSDRegisterStrings.mel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,24 +126,24 @@ global proc mayaUSDRegisterStrings()

// All strings for export dialog:
register("kExportAnimDataAnn", "Exports Maya animation data as USD time samples.");
register("kExportAnimDataLbl", "Animation Data: ");
register("kExportAnimDataLbl", "Animation Data");
register("kExportBlendShapesAnn", "Exports Maya Blend Shapes as USD blendshapes. Requires skeletons to be exported as well.");
register("kExportBlendShapesLbl", "Blend Shapes:");
register("kExportBlendShapesLbl", "Blend Shapes");
register("kExportColorSetsAnn", "Exports Maya Color Sets as USD primvars.");
register("kExportColorSetsLbl", "Color Sets:");
register("kExportColorSetsLbl", "Color Sets");
register("kExportComponentTagsAnn", "If selected, component tags get exported as USDGeomSubsets. Note: Edges and vertices are unsupported in USD.");
register("kExportComponentTagsLbl", "Component Tags:");
register("kExportComponentTagsLbl", "Component Tags");
register("kExportCurvesAnn", "If selected, curves get exported to USD primTypes NurbsCurves or BasisCurves.");
register("kExportCurvesLbl", "NURBS Curves:");
register("kExportCurvesLbl", "NURBS Curves");
register("kExportDefaultFormatAnn", "Select whether the .usd file is written out in binary or ASCII");
register("kExportDefaultFormatLbl", ".usd File Format:");
register("kExportDefaultFormatBinLbl", "Binary");
register("kExportDefaultFormatAscLbl", "ASCII");
register("kExportDefaultFormatStatus", "Select whether the .usd file is written out in binary or ASCII. You can save a file in .usdc (binary), or .usda (ASCII) format. Manually entering a file name with an extension overrides the selection in this drop-down menu.");
register("kExportDisplayColorAnn", "If selected, exports the diffuse color of the geometry's bound shader as a displayColor primvar on the USD mesh.");
register("kExportDisplayColorLbl", "Display Colors:");
register("kExportDisplayColorLbl", "Display Colors");
register("kExportEulerFilterAnn", "Exports the euler angle filtering that was performed in Maya.");
register("kExportEulerFilterLbl", "Euler Filter:");
register("kExportEulerFilterLbl", "Euler Filter");
register("kExportFrameAdvancedLbl", "Advanced");
register("kExportFrameAnimationLbl", "Animation");
register("kExportFrameGeometryLbl", "Geometry");
Expand All @@ -165,11 +165,11 @@ global proc mayaUSDRegisterStrings()
register("kExportMaterialsAnn", "Select the material(s) to bind to prims for export. With USD, you can bind multiple materials to prims.");
register("kExportMaterialsDefaultScopeName", "mtl");
register("kExportMergeShapesAnn", "Merges Maya transform and shape nodes into a single USD prim.");
register("kExportMergeShapesLbl", "Merge Transform and\nShape Nodes:");
register("kExportMergeShapesLbl", "Merge Transform and\nShape Nodes");
register("kExportNamespacesAnn", "By default, namespaces are exported to the USD file in the following format: nameSpaceExample_pPlatonic1");
register("kExportNamespacesLbl", "Include Namespaces:");
register("kExportNamespacesLbl", "Include Namespaces");
register("kExportWorldspaceAnn", "Exports the root prims with their worldspace transform instead of their local transform.");
register("kExportWorldspaceLbl", "Worldspace Roots:");
register("kExportWorldspaceLbl", "Worldspace Roots");
register("kExportParentScopeAnn", "Name of the USD scope that is the parent of the exported data.");
register("kExportParentScopeLbl", "Create USD Parent Scope:");
register("kExportParentScopePht", "USD Prim Name");
Expand All @@ -181,17 +181,17 @@ global proc mayaUSDRegisterStrings()
register("kExportSkinClustersAnn", "Exports Maya skin clusters as part of a USD skeleton.");
register("kExportSkinClustersLbl", "Skin Clusters");
register("kExportStaticSingleSampleAnn", "Converts animated values with a single time sample to be static instead.");
register("kExportStaticSingleSampleLbl", "Static Single Sample:");
register("kExportStaticSingleSampleLbl", "Static Single Sample");
register("kExportSubdMethodAnn", "Exports the selected subdivision method as a USD uniform attribute.");
register("kExportSubdMethodLbl", "Subdivision Method:");
register("kExportSubdMethodCCLbl", "Catmull-Clark");
register("kExportSubdMethodBiLbl", "Bilinear");
register("kExportSubdMethodLoLbl", "Loop");
register("kExportSubdMethodNoLbl", "None (Polygonal Mesh)");
register("kExportUVSetsAnn", "Exports Maya UV Sets as USD primvars.");
register("kExportUVSetsLbl", "UV Sets:");
register("kExportUVSetsLbl", "UV Sets");
register("kExportVisibilityAnn", "Exports Maya visibility attributes as USD metadata.");
register("kExportVisibilityLbl", "Visibility:");
register("kExportVisibilityLbl", "Visibility");

// All strings for import dialog:
register("kImportAnimationDataLbl", "Animation Data: ");
Expand Down
37 changes: 18 additions & 19 deletions plugin/adsk/scripts/mayaUsdTranslatorExport.mel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ global proc mayaUsdTranslatorExport_AnimationCB() {
if (`checkBoxGrp -exists animationCheckBox` == 0)
return;

columnLayout -e -visible (`checkBoxGrp -q -v1 animationCheckBox`) animOptsCol;
columnLayout -e -enable (`checkBoxGrp -q -v1 animationCheckBox`) animOptsCol;
}

// Callback called when the animation frame layout is expanded.
Expand Down Expand Up @@ -612,7 +612,7 @@ global proc int mayaUsdTranslatorExport (string $parent,
menuItem -l `getMayaUsdString("kExportDefaultFormatAscLbl")` -ann "usda";

if (stringArrayContains("output-parentscope", $sectionNames)) {
separator -style "none";
//separator -style "none";

textFieldGrp -l `getMayaUsdString("kExportParentScopeLbl")` -placeholderText `getMayaUsdString("kExportParentScopePht")`
-annotation `getMayaUsdString("kExportParentScopeAnn")` parentScopeField;
Expand All @@ -633,13 +633,13 @@ global proc int mayaUsdTranslatorExport (string $parent,
menuItem -l `getMayaUsdString("kExportSubdMethodLoLbl")` -ann "loop";
menuItem -l `getMayaUsdString("kExportSubdMethodNoLbl")` -ann "none";

checkBoxGrp -l `getMayaUsdString("kExportComponentTagsLbl")` -annotation `getMayaUsdString("kExportComponentTagsAnn")` exportComponentTagsCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportComponentTagsLbl")` -annotation `getMayaUsdString("kExportComponentTagsAnn")` exportComponentTagsCheckBox;

checkBoxGrp -l `getMayaUsdString("kExportCurvesLbl")` -annotation `getMayaUsdString("kExportCurvesAnn")` exportCurvesCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportCurvesLbl")` -annotation `getMayaUsdString("kExportCurvesAnn")` exportCurvesCheckBox;

checkBoxGrp -l `getMayaUsdString("kExportColorSetsLbl")` -annotation `getMayaUsdString("kExportColorSetsAnn")` exportColorSetsCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportColorSetsLbl")` -annotation `getMayaUsdString("kExportColorSetsAnn")` exportColorSetsCheckBox;

checkBoxGrp -l `getMayaUsdString("kExportUVSetsLbl")` -annotation `getMayaUsdString("kExportUVSetsAnn")` exportUVsCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportUVSetsLbl")` -annotation `getMayaUsdString("kExportUVSetsAnn")` exportUVsCheckBox;

optionMenuGrp -l `getMayaUsdString("kExportSkelsLbl")` -annotation `getMayaUsdString("kExportSkelsAnn")` skelsPopup;
menuItem -l `getMayaUsdString("kExportSkelsNoneLbl")` -ann "none";
Expand All @@ -651,9 +651,9 @@ global proc int mayaUsdTranslatorExport (string $parent,
menuItem -l `getMayaUsdString("kExportSkelsAllLbl")` -ann "auto";
menuItem -l `getMayaUsdString("kExportSkelsRootLbl")` -ann "explicit";

checkBoxGrp -l `getMayaUsdString("kExportBlendShapesLbl")` -annotation `getMayaUsdString("kExportBlendShapesAnn")` exportBlendShapesCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportBlendShapesLbl")` -annotation `getMayaUsdString("kExportBlendShapesAnn")` exportBlendShapesCheckBox;

checkBoxGrp -l `getMayaUsdString("kExportDisplayColorLbl")` -annotation `getMayaUsdString("kExportDisplayColorAnn")` exportDisplayColorCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportDisplayColorLbl")` -annotation `getMayaUsdString("kExportDisplayColorAnn")` exportDisplayColorCheckBox;

separator -style "none";
setParent ..;
Expand Down Expand Up @@ -687,24 +687,23 @@ global proc int mayaUsdTranslatorExport (string $parent,
separator -style "none";

if (stringArrayContains("animation-data", $sectionNames)) {
checkBoxGrp -l `getMayaUsdString("kExportAnimDataLbl")` -cc ("mayaUsdTranslatorExport_AnimationCB")
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportAnimDataLbl")` -cc ("mayaUsdTranslatorExport_AnimationCB")
-annotation `getMayaUsdString("kExportAnimDataAnn")` animationCheckBox;
}

columnLayout -width 100 animOptsCol;
rowLayout -numberOfColumns 2 -columnAttach 2 "left" 20;
intFieldGrp -l `getMayaUsdString("kExportFrameRangeLbl")` -numberOfFields 2 -v1 1 -v2 200 -cw 1 175 frameRangeFields;
intFieldGrp -l `getMayaUsdString("kExportFrameRangeLbl")` -numberOfFields 2 -v1 1 -v2 200 frameRangeFields;
button -l `getMayaUsdString("kExportFrameRangeBtn")` -command ("mayaUsdTranslatorExport_AnimationRangeCB") animRangeButton;
setParent ..;

floatFieldGrp -l `getMayaUsdString("kExportFrameStepLbl")` -v1 1 -cw 1 175 -annotation `getMayaUsdString("kExportFrameStepAnn")` frameStrideField;
floatFieldGrp -l `getMayaUsdString("kExportFrameStepLbl")` -v1 1 -annotation `getMayaUsdString("kExportFrameStepAnn")` frameStrideField;

textFieldGrp -l `getMayaUsdString("kExportFrameSamplesLbl")` -cw 1 175 -annotation `getMayaUsdString("kExportFrameSamplesAnn")` frameSampleField;
textFieldGrp -l `getMayaUsdString("kExportFrameSamplesLbl")` -annotation `getMayaUsdString("kExportFrameSamplesAnn")` frameSampleField;

checkBoxGrp -l `getMayaUsdString("kExportEulerFilterLbl")` -cw 1 175
-annotation `getMayaUsdString("kExportEulerFilterAnn")` eulerFilterCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportEulerFilterLbl")` -annotation `getMayaUsdString("kExportEulerFilterAnn")` eulerFilterCheckBox;

checkBoxGrp -l `getMayaUsdString("kExportStaticSingleSampleLbl")` -annotation `getMayaUsdString("kExportStaticSingleSampleAnn")` -v1 0 staticSingleSampleCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportStaticSingleSampleLbl")` -annotation `getMayaUsdString("kExportStaticSingleSampleAnn")` -v1 0 staticSingleSampleCheckBox;

setParent ..;

Expand All @@ -718,18 +717,18 @@ global proc int mayaUsdTranslatorExport (string $parent,
frameLayout -label `getMayaUsdString("kExportFrameAdvancedLbl")` -collapsable true -collapse $collapse advancedFrameLayout;
separator -style "none";

checkBoxGrp -l `getMayaUsdString("kExportVisibilityLbl")` -annotation `getMayaUsdString("kExportVisibilityAnn")` exportVisibilityCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportVisibilityLbl")` -annotation `getMayaUsdString("kExportVisibilityAnn")` exportVisibilityCheckBox;

optionMenuGrp -l `getMayaUsdString("kExportInstancesLbl")` -annotation `getMayaUsdString("kExportInstancesAnn")` exportInstancesPopup;
menuItem -l `getMayaUsdString("kExportInstancesFlatLbl")`;
menuItem -l `getMayaUsdString("kExportInstancesRefLbl")`;

checkBoxGrp -l `getMayaUsdString("kExportMergeShapesLbl")`
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportMergeShapesLbl")`
-annotation `getMayaUsdString("kExportMergeShapesAnn")` mergeTransformAndShapeCheckBox;

checkBoxGrp -l `getMayaUsdString("kExportNamespacesLbl")` -annotation `getMayaUsdString("kExportNamespacesAnn")` includeNamespacesCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportNamespacesLbl")` -annotation `getMayaUsdString("kExportNamespacesAnn")` includeNamespacesCheckBox;

checkBoxGrp -l `getMayaUsdString("kExportWorldspaceLbl")` -annotation `getMayaUsdString("kExportWorldspaceAnn")` worldspaceCheckBox;
checkBoxGrp -label "" -label1 `getMayaUsdString("kExportWorldspaceLbl")` -annotation `getMayaUsdString("kExportWorldspaceAnn")` worldspaceCheckBox;

separator -style "none";
setParent ..;
Expand Down