MAYA-114979 MAYA-114731 Fix correctness issues #1937
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes #1834 for the last correctness problems mentioned - Use a separate varnameStr for MaterialX since the type is not compatible with the varname used in UsdPreviewSurface - Shared place2dTexture nodes are now shared on MaterialX export - NodeGraph is used instead of Scope to isolate shaders by type in multi-material export - NodeGraph boundaries are not skipped anymore by shader connections - Cleaned-up code producing empty NodeGraphs
| @@ -135,6 +129,15 @@ MtlxUsd_PreviewSurfaceWriter::MtlxUsd_PreviewSurfaceWriter( | |||
|
|
|||
| // All connections go directly to the node graph: | |||
| if (attrPlug.isConnected()) { | |||
| if (!nodegraphSchema) { | |||
There was a problem hiding this comment.
Just-in-time creation to reduce number of empty NodeGraph generated.
| } | ||
| SdfPath primvarReaderPath = _GetPlace2DTexturePath(depNodeFn); | ||
|
|
||
| if (!GetUsdStage()->GetPrimAtPath(primvarReaderPath)) { |
There was a problem hiding this comment.
Mostly indentation since we now detect shared place2dTexture nodes. Similar to what was done in usdFileTextureWriter.cpp in the first PR of the series.
| // easy specialization based on UV mappings to geometries: | ||
| UsdPrim materialPrim = primvarReaderSchema.GetPrim().GetParent(); | ||
| UsdShadeMaterial materialSchema(materialPrim); | ||
| while (!materialSchema && materialPrim) { |
There was a problem hiding this comment.
Here we make sure to properly connect the NodeGraph.
| materialSchema = UsdShadeMaterial(GetUsdStage()->GetPrimAtPath(materialPath)); | ||
| UsdPrim materialPrim = primvarReaderShaderSchema.GetPrim().GetParent(); | ||
| UsdShadeMaterial materialSchema(materialPrim); | ||
| while (!materialSchema && materialPrim) { |
There was a problem hiding this comment.
Connect all intermediate NodeGraphs.
boudrey
reviewed
Jan 3, 2022
| // Connect the output of the primvar reader to the texture coordinate | ||
| // input of the UV texture. | ||
| texSchema.CreateInput(TrMtlxTokens->texcoord, SdfValueTypeNames->Float2) | ||
| .ConnectToSource(primvarReaderOutput); |
There was a problem hiding this comment.
Line 206-212 could be taken out of the if/else block instead of having a duplication of code.
boudrey
approved these changes
Jan 3, 2022
JGamache-autodesk
added
the
ready-for-merge
|
Fantastic - thank you so much! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #1834 for the last correctness problems mentioned