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-125149 - When "Enable Overrides" is unchecked for a Display Layer USD Data still uses Bounding Box #2611

Merged
merged 3 commits into from
Sep 20, 2022
Merged

MAYA-125149 - When "Enable Overrides" is unchecked for a Display Layer USD Data still uses Bounding Box #2611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e24e50
- properly handle display layer's attribute "enable"
vlasovi Sep 19, 2022
9b30284
clang-format
vlasovi Sep 19, 2022
02c5371
Fixing the build
vlasovi Sep 19, 2022
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
14 changes: 5 additions & 9 deletions lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,14 +447,10 @@ void HdVP2BasisCurves::Sync(
const SdfPath& id = GetId();
if (HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, HdTokens->normals)
|| HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, HdTokens->primvar)) {
const HdVP2Material* material = static_cast<const HdVP2Material*>(
renderIndex.GetSprim(HdPrimTypeTokens->material, GetMaterialId()));

TfToken materialNetworkToken = _GetMaterialNetworkToken(reprToken);
const TfTokenVector& requiredPrimvars
= (material && material->GetSurfaceShader(materialNetworkToken))
? material->GetRequiredPrimvars(materialNetworkToken)
: sFallbackShaderPrimvars;
TfTokenVector requiredPrimvars;
if (!_GetMaterialPrimvars(renderIndex, GetMaterialId(), requiredPrimvars)) {
requiredPrimvars = sFallbackShaderPrimvars;
}
Comment on lines +450 to +453
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since primvars (and their vertex buffers) are shared among all representations, we need to include here all required primvars from all available material networks, which is done inside _GetMaterialPrimvars method.


_UpdatePrimvarSources(delegate, *dirtyBits, requiredPrimvars);
}
Expand Down Expand Up @@ -906,7 +902,7 @@ void HdVP2BasisCurves::_UpdateDrawItem(
const GfRange3d& range = _sharedData.bounds.GetRange();

_UpdateTransform(stateToCommit, _sharedData, itemDirtyBits, isBoundingBoxItem);
MMatrix& worldMatrix = drawItemData._worldMatrix;
const MMatrix& worldMatrix = drawItemData._worldMatrix;

// If the prim is instanced, create one new instance per transform.
// The current instancer invalidation tracking makes it hard for
Expand Down
63 changes: 46 additions & 17 deletions lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,21 +177,20 @@ void MayaUsdRPrim::_UpdateTransform(
}

// Local-to-world transformation
MMatrix& worldMatrix = drawItemData._worldMatrix;
sharedData.bounds.GetMatrix().Get(worldMatrix.matrix);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving this call inside if-statements fixes an issue with bound box dimensions when a display layer is switched to bound box mode in multi-viewport


// The bounding box draw item uses a globally-shared unit wire cube as the
// geometry and transfers scale and offset of the bounds to world matrix.
if (isBoundingBoxItem) {
if ((itemDirtyBits & (HdChangeTracker::DirtyExtent | HdChangeTracker::DirtyTransform))
&& !range.IsEmpty()) {
sharedData.bounds.GetMatrix().Get(drawItemData._worldMatrix.matrix);

const GfVec3d midpoint = range.GetMidpoint();
const GfVec3d size = range.GetSize();

MPoint midp(midpoint[0], midpoint[1], midpoint[2]);
midp *= worldMatrix;
midp *= drawItemData._worldMatrix;

auto& m = worldMatrix.matrix;
auto& m = drawItemData._worldMatrix.matrix;
m[0][0] *= size[0];
m[0][1] *= size[0];
m[0][2] *= size[0];
Expand All @@ -212,6 +211,7 @@ void MayaUsdRPrim::_UpdateTransform(
stateToCommit._worldMatrix = &drawItemData._worldMatrix;
}
} else if (itemDirtyBits & HdChangeTracker::DirtyTransform) {
sharedData.bounds.GetMatrix().Get(drawItemData._worldMatrix.matrix);
stateToCommit._worldMatrix = &drawItemData._worldMatrix;
}
}
Expand Down Expand Up @@ -724,14 +724,18 @@ void MayaUsdRPrim::_SyncDisplayLayerModes(const HdRprim&
for (unsigned int i = 0; i < ancestorDisplayLayers.length(); i++) {
MFnDependencyNode displayLayerNodeFn(ancestorDisplayLayers[i]);
MPlug layerEnabled = displayLayerNodeFn.findPlug("enabled");
MPlug layerVisible = displayLayerNodeFn.findPlug("visibility");
MPlug layerHidesOnPlayback = displayLayerNodeFn.findPlug("hideOnPlayback");
MPlug layerDisplayType = displayLayerNodeFn.findPlug("displayType");
MPlug levelOfDetail = displayLayerNodeFn.findPlug("levelOfDetail");
MPlug shading = displayLayerNodeFn.findPlug("shading");
MPlug texturing = displayLayerNodeFn.findPlug("texturing");

_displayLayerModes._visibility &= layerEnabled.asBool() ? layerVisible.asBool() : true;
if (!layerEnabled.asBool()) {
continue;
}
Comment on lines +727 to +729
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Properly handle display layer's attribute "enable"


MPlug layerVisible = displayLayerNodeFn.findPlug("visibility");
MPlug layerHidesOnPlayback = displayLayerNodeFn.findPlug("hideOnPlayback");
MPlug layerDisplayType = displayLayerNodeFn.findPlug("displayType");
MPlug levelOfDetail = displayLayerNodeFn.findPlug("levelOfDetail");
MPlug shading = displayLayerNodeFn.findPlug("shading");
MPlug texturing = displayLayerNodeFn.findPlug("texturing");

_displayLayerModes._visibility &= layerVisible.asBool();
_displayLayerModes._hideOnPlayback |= layerHidesOnPlayback.asBool();
_displayLayerModes._texturing = texturing.asBool();
if (levelOfDetail.asShort() != 0) {
Expand Down Expand Up @@ -767,13 +771,13 @@ void MayaUsdRPrim::_SyncSharedData(
}

if (HdChangeTracker::IsVisibilityDirty(*dirtyBits, id)) {
bool usdVisibility = delegate->GetVisible(id);
sharedData.visible = delegate->GetVisible(id) && _displayLayerModes._visibility;

// Invisible rprims don't get calls to Sync or _PropagateDirtyBits while
// they are invisible. This means that when a prim goes from visible to
// invisible that we must update every repr, because if we switch reprs while
// invisible we'll get no chance to update!
if (!usdVisibility)
if (!sharedData.visible)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes an issue with visibility when a display layer is switched into invisible state while in multi-viewport

_MakeOtherReprRenderItemsInvisible(reprToken, reprs);

// Update "hide on playback" status
Expand All @@ -788,8 +792,6 @@ void MayaUsdRPrim::_SyncSharedData(
_ForEachRenderItem(reprs, setHideOnPlayback);
#endif
}

sharedData.visible = usdVisibility && _displayLayerModes._visibility;
}

#if PXR_VERSION > 2111
Expand Down Expand Up @@ -914,4 +916,31 @@ SdfPath MayaUsdRPrim::_GetUpdatedMaterialId(HdRprim* rprim, HdSceneDelegate* del
return materialId;
}

bool MayaUsdRPrim::_GetMaterialPrimvars(
HdRenderIndex& renderIndex,
const SdfPath& materialId,
TfTokenVector& primvars)
{
const HdVP2Material* material = static_cast<const HdVP2Material*>(
renderIndex.GetSprim(HdPrimTypeTokens->material, materialId));
if (!material || !material->GetSurfaceShader(TfToken())) {
return false;
}

// Get basic primvars
primvars = material->GetRequiredPrimvars(TfToken());

// Get extra primvars
if (material->GetSurfaceShader(HdReprTokens->smoothHull)) {
const auto& extraPrimvars = material->GetRequiredPrimvars(HdReprTokens->smoothHull);
for (const auto& extraPrimvar : extraPrimvars) {
if (std::find(primvars.begin(), primvars.end(), extraPrimvar) == primvars.end()) {
primvars.push_back(extraPrimvar);
}
}
}

return true;
}

PXR_NAMESPACE_CLOSE_SCOPE
4 changes: 3 additions & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ struct MayaUsdCommitState
PrimvarBufferDataMap _primvarBufferDataMap;

//! If valid, world matrix to set on the render item
MMatrix* _worldMatrix { nullptr };
const MMatrix* _worldMatrix { nullptr };

//! If valid, bounding box to set on the render item
MBoundingBox* _boundingBox { nullptr };
Expand Down Expand Up @@ -271,6 +271,8 @@ class MayaUsdRPrim
//! Helper utility function to adapt Maya API changes.
static void _SetWantConsolidation(MHWRender::MRenderItem& renderItem, bool state);

static bool _GetMaterialPrimvars(HdRenderIndex&, const SdfPath&, TfTokenVector&);

void _InitRenderItemCommon(MHWRender::MRenderItem* renderItem) const;

HdVP2DrawItem::RenderItemData& _AddRenderItem(
Expand Down
13 changes: 5 additions & 8 deletions lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,13 +882,10 @@ void HdVP2Mesh::Sync(
|| HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, HdTokens->primvar) || instancerDirty) {

auto addRequiredPrimvars = [&](const SdfPath& materialId) {
const HdVP2Material* material = static_cast<const HdVP2Material*>(
renderIndex.GetSprim(HdPrimTypeTokens->material, materialId));
TfToken materialNetworkToken = _GetMaterialNetworkToken(reprToken);
const TfTokenVector& requiredPrimvars
= material && material->GetSurfaceShader(materialNetworkToken)
? material->GetRequiredPrimvars(materialNetworkToken)
: sFallbackShaderPrimvars;
TfTokenVector requiredPrimvars;
if (!_GetMaterialPrimvars(renderIndex, materialId, requiredPrimvars)) {
requiredPrimvars = sFallbackShaderPrimvars;
}
Comment on lines +885 to +888
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since primvars (and their vertex buffers) are shared among all representations, we need to include here all required primvars from all available material networks, which is done inside _GetMaterialPrimvars method.


for (const auto& requiredPrimvar : requiredPrimvars) {
if (!_PrimvarIsRequired(requiredPrimvar)) {
Expand Down Expand Up @@ -1697,7 +1694,7 @@ void HdVP2Mesh::_UpdateDrawItem(
const GfRange3d& range = _sharedData.bounds.GetRange();

_UpdateTransform(stateToCommit, _sharedData, itemDirtyBits, isBBoxItem);
MMatrix& worldMatrix = drawItemData._worldMatrix;
const MMatrix& worldMatrix = drawItemData._worldMatrix;

// If the mesh is instanced, create one new instance per transform.
// The current instancer invalidation tracking makes it hard for
Expand Down
19 changes: 7 additions & 12 deletions lib/mayaUsd/render/vp2RenderDelegate/points.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,19 +143,14 @@ void HdVP2Points::Sync(
if (HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, HdTokens->normals)
|| HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, HdTokens->widths)
|| HdChangeTracker::IsPrimvarDirty(*dirtyBits, id, HdTokens->primvar)) {
const HdVP2Material* material = static_cast<const HdVP2Material*>(
renderIndex.GetSprim(HdPrimTypeTokens->material, GetMaterialId()));

TfTokenVector materialPrimvars;
const TfTokenVector* requiredPrimvars = &sFallbackShaderPrimvars;
TfToken materialNetworkToken = _GetMaterialNetworkToken(reprToken);
if (material && material->GetSurfaceShader(materialNetworkToken)) {
materialPrimvars = material->GetRequiredPrimvars(materialNetworkToken);
materialPrimvars.push_back(HdTokens->widths);
requiredPrimvars = &materialPrimvars;
TfTokenVector requiredPrimvars;
if (!_GetMaterialPrimvars(renderIndex, GetMaterialId(), requiredPrimvars)) {
requiredPrimvars = sFallbackShaderPrimvars;
} else {
requiredPrimvars.push_back(HdTokens->widths);
Comment on lines +146 to +150
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since primvars (and their vertex buffers) are shared among all representations, we need to include here all required primvars from all available material networks, which is done inside _GetMaterialPrimvars method.

}

_UpdatePrimvarSources(delegate, *dirtyBits, *requiredPrimvars);
_UpdatePrimvarSources(delegate, *dirtyBits, requiredPrimvars);
}

if (*dirtyBits & HdChangeTracker::DirtyDisplayStyle) {
Expand Down Expand Up @@ -589,7 +584,7 @@ void HdVP2Points::_UpdateDrawItem(
const GfRange3d& range = _sharedData.bounds.GetRange();

_UpdateTransform(stateToCommit, _sharedData, itemDirtyBits, isBoundingBoxItem);
MMatrix& worldMatrix = drawItemData._worldMatrix;
const MMatrix& worldMatrix = drawItemData._worldMatrix;

// If the prim is instanced, create one new instance per transform.
// The current instancer invalidation tracking makes it hard for
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/ufe/UsdAttributes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ _GetSdrPropertyAndType(const Ufe::SceneItem::Ptr& item, const std::string& tokNa
{
auto shaderNode = UsdShaderNodeDefHandler::usdDefinition(item);
if (shaderNode) {
auto baseNameAndType = PXR_NS::UsdShadeUtils::GetBaseNameAndType(TfToken(tokName));
auto baseNameAndType = PXR_NS::UsdShadeUtils::GetBaseNameAndType(PXR_NS::TfToken(tokName));
switch (baseNameAndType.second) {
case PXR_NS::UsdShadeAttributeType::Invalid: return { nullptr, baseNameAndType.second };
case PXR_NS::UsdShadeAttributeType::Input:
Expand Down