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-112643 Detect and save a pointer to the cardsUv primvar reader rather than #1558

Merged
merged 2 commits into from
Jul 7, 2021
Merged

MAYA-112643 Detect and save a pointer to the cardsUv primvar reader rather than #1558

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4951b86
Detect and save a pointer to the cardsUv primvar reader rather than A…
Jul 7, 2021
45b6a49
Clang format.
Jul 7, 2021
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
19 changes: 10 additions & 9 deletions lib/mayaUsd/render/vp2RenderDelegate/material.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,7 @@ void HdVP2Material::_ApplyVP2Fixes(HdMaterialNetwork& outNet, const HdMaterialNe
// HdMaterialNetwork. Keep track of the existence of some key nodes to help
// with performance.
HdMaterialNode* usdDrawModeCardsNode = nullptr;
HdMaterialNode* stPrimvarReader = nullptr;
HdMaterialNode* cardsUvPrimvarReader = nullptr;

// Get the shader registry so I can look up the real names of shading nodes.
SdrRegistry& shaderReg = SdrRegistry::GetInstance();
Expand Down Expand Up @@ -1437,9 +1437,10 @@ void HdVP2Material::_ApplyVP2Fixes(HdMaterialNetwork& outNet, const HdMaterialNe
usdDrawModeCardsNode = &outNode;
}

if (_IsUsdFloat2PrimvarReader(outNode)) {
TF_VERIFY(!stPrimvarReader); // I haven't thought about what to do for multiple UV sets!
stPrimvarReader = &outNode;
if (_IsUsdFloat2PrimvarReader(outNode)
&& outNode.parameters[_tokens->varname] == _tokens->cardsUv) {
TF_VERIFY(!cardsUvPrimvarReader);
cardsUvPrimvarReader = &outNode;
}

outNode.path = SdfPath(outNode.identifier.GetString() + std::to_string(++nodeCounter));
Expand Down Expand Up @@ -1470,24 +1471,24 @@ void HdVP2Material::_ApplyVP2Fixes(HdMaterialNetwork& outNet, const HdMaterialNe
if (_IsUsdUVTexture(node) && usdDrawModeCardsNode) {
// the DrawModeCardsFragment has UsdUVtexture nodes without primvar readers.
// Add a primvar reader to each UsdUVTexture which doesn't already have one.
if (!stPrimvarReader) {
if (!cardsUvPrimvarReader) {
HdMaterialNode stReader;
stReader.identifier = UsdImagingTokens->UsdPrimvarReader_float2;
stReader.path
= SdfPath(stReader.identifier.GetString() + std::to_string(++nodeCounter));
stReader.parameters[_tokens->varname] = _tokens->cardsUv;
outNet.nodes.push_back(stReader);
stPrimvarReader = &outNet.nodes.back();
cardsUvPrimvarReader = &outNet.nodes.back();
// Specifically looking for the cardsUv primvar
outNet.primvars.push_back(_tokens->cardsUv);
}

// search for an existing relationship between stPrimvarReader & node.
// search for an existing relationship between cardsUvPrimvarReader & node.
// TODO: if there are multiple UV sets this can fail, it is looking for
// a connection to a specific UsdPrimvarReader_float2.
bool hasRelationship = false;
for (const HdMaterialRelationship& rel : tmpNet.relationships) {
if (rel.inputId == stPrimvarReader->path && rel.inputName == _tokens->result
if (rel.inputId == cardsUvPrimvarReader->path && rel.inputName == _tokens->result
&& rel.outputId == node.path && rel.outputName == _tokens->st) {
hasRelationship = true;
break;
Expand All @@ -1502,7 +1503,7 @@ void HdVP2Material::_ApplyVP2Fixes(HdMaterialNetwork& outNet, const HdMaterialNe
TF_VERIFY(usdDrawModeCardsNode);

HdMaterialRelationship newRel
= { stPrimvarReader->path, _tokens->result, node.path, _tokens->st };
= { cardsUvPrimvarReader->path, _tokens->result, node.path, _tokens->st };
outNet.relationships.push_back(newRel);
}
}
Expand Down