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

Query UV primvar name from bound material #296

Merged
merged 2 commits into from
Jun 11, 2020
Merged

Query UV primvar name from bound material #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8230280
Query UV primvar name from bound material
hshakula Jun 9, 2020
3395d69
Merge branch 'develop' into custom-st-name
hshakula Jun 11, 2020
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
1 change: 1 addition & 0 deletions pxr/imaging/plugin/hdRpr/material.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ void HdRprMaterial::Sync(HdSceneDelegate* sceneDelegate,
}

MaterialAdapter matAdapter(surfaceType, *surface, displacement ? *displacement : HdMaterialNetwork{});
m_stName = matAdapter.GetStName();
m_rprMaterial = rprApi->CreateMaterial(matAdapter);
} else {
TF_CODING_WARNING("Material type not supported");
Expand Down
3 changes: 3 additions & 0 deletions pxr/imaging/plugin/hdRpr/material.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ class HdRprMaterial final : public HdMaterial {
/// In case material сreation failure return nullptr
HdRprApiMaterial const* GetRprMaterialObject() const;

TfToken const& GetStName() const { return m_stName; }

private:
HdRprApiMaterial* m_rprMaterial = nullptr;
TfToken m_stName;
};

PXR_NAMESPACE_CLOSE_SCOPE
Expand Down
13 changes: 11 additions & 2 deletions pxr/imaging/plugin/hdRpr/materialAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void GetParameters(const HdMaterialNetwork& materialNetwork, const HdMaterialNo
out_materialParams.insert(previewNode.parameters.begin(), previewNode.parameters.end());
}

void GetTextures(const HdMaterialNetwork& materialNetwork, MaterialTextures& out_materialTextures) {
void GetTextures(const HdMaterialNetwork& materialNetwork, MaterialTextures& out_materialTextures, TfToken* stName) {
out_materialTextures.clear();

auto stToken = UsdUtilsGetPrimaryUVSetName();
Expand Down Expand Up @@ -161,6 +161,14 @@ void GetTextures(const HdMaterialNetwork& materialNetwork, MaterialTextures& ou
TF_RUNTIME_ERROR("Invalid material network. Relationship %s does not match to any node", stRel.outputName.GetText());
continue;
}

if (stName->IsEmpty()) {
if (GetParam(HdRprMaterialTokens->varname, *stNodeIter, param) &&
param.IsHolding<TfToken>()) {
*stName = param.UncheckedGet<TfToken>();
}
}

// Actually some much more complex node graph could exists
// But we support only direct UsdUvTexture<->UsdTransform2d relationship for now
if (stNodeIter->identifier == HdRprMaterialTokens->UsdTransform2d) {
Expand Down Expand Up @@ -314,13 +322,14 @@ MaterialAdapter::MaterialAdapter(EMaterialType type, const HdMaterialNetwork& su
setFallbackValue(HdRprMaterialTokens->opacityThreshold, VtValue(0.0f));

MaterialTextures materialTextures;
GetTextures(surfaceNetwork, materialTextures);
GetTextures(surfaceNetwork, materialTextures, &m_stName);

PopulateUsdPreviewSurface(materialParameters, materialTextures);
break;
}
case EMaterialType::HOUDINI_PRINCIPLED_SHADER: {
PopulateHoudiniPrincipledShader(surfaceNetwork, displacementNetwork);
m_stName = UsdUtilsGetPrimaryUVSetName();
break;
}
default:
Expand Down
8 changes: 8 additions & 0 deletions pxr/imaging/plugin/hdRpr/materialAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ PXR_NAMESPACE_OPEN_SCOPE
(transparency) \
(rotation) \
(translation) \
(varname) \
((shadowCatcher, "rpr:shadowCatcher")) \
((reflectionCatcher, "rpr:reflectionCatcher"))

Expand Down Expand Up @@ -151,6 +152,10 @@ class MaterialAdapter {
return m_doublesided;
}

TfToken GetStName() const {
return m_stName;
}

bool IsShadowCatcher() const {
return m_isShadowCatcher;
}
Expand All @@ -176,6 +181,9 @@ class MaterialAdapter {

MaterialTexture m_displacementTexture;
bool m_doublesided = false;

TfToken m_stName;

bool m_isShadowCatcher = false;
bool m_isReflectionCatcher = false;
};
Expand Down
16 changes: 9 additions & 7 deletions pxr/imaging/plugin/hdRpr/mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,17 +214,19 @@ void HdRprMesh::Sync(HdSceneDelegate* sceneDelegate,
newMesh = true;
}

auto stToken = UsdUtilsGetPrimaryUVSetName();
if (HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, stToken)) {
GetPrimvarData(stToken, sceneDelegate, primvarDescsPerInterpolation, m_uvs, m_uvIndices);

newMesh = true;
}

if (*dirtyBits & HdChangeTracker::DirtyMaterialId) {
m_cachedMaterialId = sceneDelegate->GetMaterialId(id);
}

auto material = static_cast<const HdRprMaterial*>(sceneDelegate->GetRenderIndex().GetSprim(HdPrimTypeTokens->material, m_cachedMaterialId));
if (material) {
if (HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, material->GetStName())) {
GetPrimvarData(material->GetStName(), sceneDelegate, primvarDescsPerInterpolation, m_uvs, m_uvIndices);

newMesh = true;
}
}

if (*dirtyBits & HdChangeTracker::DirtyVisibility) {
_sharedData.visible = sceneDelegate->GetVisible(id);
}
Expand Down