MAYA-121534 Mtlx subcomponent connections export #2211

JGamache-autodesk · 2022-03-24T20:20:12Z

Adds only one new node: clamp -> ND_clamp_vector3
Adds support for automatically adding conversions between vector and color types since Maya allows these kind of connections transparently.
Adds a lot of infrastructure to support exporting and importing connections at subcomponent level to and from USD/MaterialX.

Builds on to of PR #2207, which must be merged before this one.

- Adds only one new node: clamp -> ND_clamp_vector3 - Adds support for automatically adding conversions between vector and color types since Maya allows these kind of connections transparently. - Adds a lot of infrastructure to support exporting and importing connections at subcomponent level to and from USD/MaterialX. Builds on to of PR #2207, which must be merged before this one.

JGamache-autodesk · 2022-03-24T20:21:43Z

lib/mayaUsd/fileio/shaderReader.cpp

@@ -63,10 +63,7 @@ TfToken UsdMayaShaderReader::GetMayaNameForUsdAttrName(const TfToken& usdAttrNam
    return TfToken();
 }

-bool UsdMayaShaderReader::TraverseUnconnectableInput(const TfToken& usdAttrName) const


Removing const. Allows calling _GetArgs which is not.

JGamache-autodesk · 2022-03-24T20:22:22Z

lib/mayaUsd/fileio/shading/symmetricShaderReader.cpp

@@ -90,58 +87,13 @@ UsdMayaShaderReader::ContextSupport UsdMayaSymmetricShaderReader::CanImport(
    return ContextSupport::Unsupported;
 }

-static UsdMayaShadingNodeType
-_ComputeShadingNodeTypeForMayaTypeName(const TfToken& mayaNodeTypeName)


Moved to translatorUtil.cpp to be shared with Mtlx code.

JGamache-autodesk · 2022-03-24T20:23:04Z

lib/mayaUsd/render/MaterialXGenOgsXml/CMakeLists.txt

@@ -27,6 +27,7 @@ list(APPEND LIGHT_IMPLEMENTATIONS
 list(APPEND NODE_DECLARATIONS
    libraries/maya_surfaces.mtlx
    libraries/maya_utilities.mtlx
+    libraries/maya_utilities_ng.mtlx


Split the NodeGraphs out to a separate file, hence the _ng suffix.

JGamache-autodesk · 2022-03-24T20:24:25Z

lib/mayaUsd/render/MaterialXGenOgsXml/libraries/maya_utilities_ng.mtlx

+  </nodegraph>
+
+  <!-- Nodegraph only wraps the difference in interface -->
+  <nodegraph name="MayaNG_clamp_vector3" nodedef="MayaND_clamp_vector3">


New node. The Maya and MaterialX clamp nodes differ only in their interfaces. The NodeGraph allows using symmetric reader/writer code.

JGamache-autodesk · 2022-03-24T20:25:59Z

lib/usd/translators/shading/mtlxBaseReader.cpp

@@ -152,4 +140,79 @@ bool MtlxUsd_BaseReader::GetColorAndAlphaFromInput(
    return false;
 }

+bool MtlxUsd_BaseReader::TraverseUnconnectableInput(const TfToken& usdAttrName)
+{
+    TfToken               usdPortName;


Considers a constructor node to be part of the set of MaterialX nodes that define a Maya node.

JGamache-autodesk · 2022-03-24T20:34:40Z

lib/usd/translators/shading/mtlxBaseWriter.cpp

@@ -460,6 +499,24 @@ UsdAttribute MtlxUsd_BaseWriter::AddNormalMapping(UsdAttribute normalInput)
    return mapInput;
 }

+UsdAttribute MtlxUsd_BaseWriter::PreserveNodegraphBoundaries(UsdAttribute input)
+{
+    UsdShadeNodeGraph nodeGraph(GetNodeGraph());


Top-level shader nodes like lambert and phong require connecting to ancillary nodes via a node graph boundary port. This check and adds such a port if required.

JGamache-autodesk · 2022-03-24T20:37:40Z

lib/usd/translators/shading/mtlxConverterReader.cpp

@@ -87,7 +91,7 @@ class MtlxUsd_ConverterReader : public UsdMayaShaderReader
        if (shaderId.GetString().rfind("ND_luminance_", 0) != std::string::npos) {
            // Luminance is an alpha output.
            _setAlphaIsLuminance = true;
-            _refinedOutputToken = TrMayaTokens->outAlpha;
+            _childIndex = 3;


Changes are to remove hardcoded Maya outColor subcomponent names and use a more gereric child index instead.

JGamache-autodesk · 2022-03-24T20:39:25Z

lib/usd/translators/shading/mtlxImageReader.cpp

@@ -157,6 +157,21 @@ bool MtlxUsd_ImageReader::Read(UsdMayaPrimReaderContext& context)
        UsdMayaReadUtil::SetMayaAttr(mayaAttr, VtValue(colorVal), /*unlinearizeColors*/ false);
    }

+    // Filter type:
+    mayaAttr = depFn.findPlug(TrMayaTokens->filterType.GetText(), true, &status);


Was exported in PR #2207 , but not re-imported.

JGamache-autodesk · 2022-03-24T20:42:09Z

lib/usd/translators/shading/mtlxSymmetricShaderReader.cpp

+    }
+
+    context.RegisterNewMayaNode(prim.GetPath().GetString(), mayaObject);
+    RegisterConstructorNodes(context, mayaObject);


This call is currently the only change compared to symmetricShaderReader.cpp, but I suspect handling multi-input nodes like ramp will require more code to be added.

JGamache-autodesk · 2022-03-24T20:44:30Z

lib/usd/translators/shading/mtlxSymmetricShaderWriter.cpp

+/// };
+/// \endcode
+///
+class MtlxUsd_SymmetricShaderWriter : public MtlxUsd_BaseWriter


Moved from mtlxSymmetricShaderWriter.h, which was removed. Might reappear as a separate header if we want to expose this specialization to Python, but we are in a completely different DLL, so that might require moving that code back to the mayaUsd library.

seando-adsk · 2022-04-06T14:15:14Z

@JGamache-autodesk There are conflicts to fix. Will you be able to or would you need us to do it?

…ort_import

JGamache-autodesk · 2022-04-06T14:59:42Z

Fixed the conflicts. Ready to merge as soon as preflight succeeds.

JGamache-autodesk requested a review from boudrey March 24, 2022 20:20

JGamache-autodesk assigned ecp-maya-devops-adsk Mar 24, 2022

JGamache-autodesk added import-export Related to Import and/or Export vp2renderdelegate Related to VP2RenderDelegate labels Mar 24, 2022

JGamache-autodesk commented Mar 24, 2022

View reviewed changes

JGamache-autodesk unassigned ecp-maya-devops-adsk Mar 25, 2022

boudrey previously approved these changes Mar 25, 2022

View reviewed changes

Base automatically changed from t_gamaj/MAYA-121534/expose_lookdevkit_color_correct to dev April 6, 2022 14:09

Merge branch 'dev' into t_gamaj/MAYA-121534/mtlx_subcomponent_cnx_exp…

89d6dff

…ort_import

JGamache-autodesk dismissed boudrey’s stale review via 89d6dff April 6, 2022 14:57

JGamache-autodesk added the ready-for-merge Development process is finished, PR is ready for merge label Apr 6, 2022

JGamache-autodesk assigned ecp-maya-devops-adsk Apr 6, 2022

clang-format

1f1a34b

JGamache-autodesk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Apr 6, 2022

iFix *nix builds

dc45afd

JGamache-autodesk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Apr 6, 2022

seando-adsk merged commit bc49205 into dev Apr 6, 2022

seando-adsk deleted the t_gamaj/MAYA-121534/mtlx_subcomponent_cnx_export_import branch April 6, 2022 21:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MAYA-121534 Mtlx subcomponent connections export #2211

MAYA-121534 Mtlx subcomponent connections export #2211

JGamache-autodesk commented Mar 24, 2022

JGamache-autodesk Mar 24, 2022

JGamache-autodesk Mar 24, 2022

JGamache-autodesk Mar 24, 2022

JGamache-autodesk Mar 24, 2022

JGamache-autodesk Mar 24, 2022

JGamache-autodesk Mar 24, 2022

JGamache-autodesk Mar 24, 2022

JGamache-autodesk Mar 24, 2022

JGamache-autodesk Mar 24, 2022

JGamache-autodesk Mar 24, 2022

seando-adsk commented Apr 6, 2022

JGamache-autodesk commented Apr 6, 2022

MAYA-121534 Mtlx subcomponent connections export #2211

MAYA-121534 Mtlx subcomponent connections export #2211

Conversation

JGamache-autodesk commented Mar 24, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

seando-adsk commented Apr 6, 2022

JGamache-autodesk commented Apr 6, 2022