Merge pull request #2883 from Autodesk/vlasovi/MAYA-125724

MAYA-125724 - Implement display layer's wireframe mode for instanced geometry
Autodesk · Feb 21, 2023 · 7be51e9 · 7be51e9
2 parents b3e5586 + 5d5b4ba
commit 7be51e9
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 7 deletions.
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp
@@ -339,9 +339,11 @@ HdReprSharedPtr MayaUsdRPrim::_InitReprCommon(
 
         // Instanced primitives with instances in display layers use 'forced' representations to
         // draw those specific instances, so the 'forced' representations should be inited alongside
-        if (reprToken != HdVP2ReprTokens->forcedBbox) {
+        if (reprToken != HdVP2ReprTokens->forcedBbox && reprToken != HdVP2ReprTokens->forcedWire) {
             refThis.InitRepr(
                 drawScene.GetUsdImagingDelegate(), HdVP2ReprTokens->forcedBbox, dirtyBits);
+            refThis.InitRepr(
+                drawScene.GetUsdImagingDelegate(), HdVP2ReprTokens->forcedWire, dirtyBits);
         }
     } else {
         // Sync display layer modes for non-instanced prims.
@@ -769,7 +771,7 @@ void MayaUsdRPrim::_SyncDisplayLayerModesInstanced(SdfPath const& id, unsigned i
 
     _displayLayerModesInstancedFrame = drawScene.GetFrameCounter();
 
-    _needForcedBBox = false;
+    _forcedReprFlags = 0;
     _requiredModFlagsBitset.reset();
     if (drawScene.SupportPerInstanceDisplayLayers(id)) {
         _displayLayerModesInstanced.resize(instanceCount);
@@ -779,7 +781,9 @@ void MayaUsdRPrim::_SyncDisplayLayerModesInstanced(SdfPath const& id, unsigned i
             _PopulateDisplayLayerModes(usdPath, displayLayerModes, drawScene);
 
             if (displayLayerModes._reprOverride == kBBox) {
-                _needForcedBBox = true;
+                _forcedReprFlags |= kForcedBBox;
+            } else if (displayLayerModes._reprOverride == kWire) {
+                _forcedReprFlags |= kForcedWire;
             }
 
             int requiredModFlags = 0;
@@ -1041,6 +1045,13 @@ bool MayaUsdRPrim::_FilterInstanceByDisplayLayer(
         return true;
     }
 
+    // Match item's wire mode against instance's wire mode
+    const bool forcedWireItem = (reprToken == HdVP2ReprTokens->forcedWire);
+    const bool overrideWireInstance = displayLayerModes._reprOverride == kWire;
+    if (forcedWireItem != overrideWireInstance) {
+        return true;
+    }
+
     // Match item's hide-on-playback mode against that of the instance
     const bool hideOnPlaybackItem = (modFlags & HdVP2DrawItem::kHideOnPlayback);
     if (displayLayerModes._hideOnPlayback != hideOnPlaybackItem) {
@@ -1107,11 +1118,17 @@ void MayaUsdRPrim::_SyncForcedReprs(
         }
     };
 
-    if (_needForcedBBox) {
+    if (_forcedReprFlags & kForcedBBox) {
         refThis.Sync(delegate, renderParam, dirtyBits, HdVP2ReprTokens->forcedBbox);
     } else {
         _ForEachRenderItemInRepr(_FindRepr(reprs, HdVP2ReprTokens->forcedBbox), hideDrawItem);
     }
+
+    if (_forcedReprFlags & kForcedWire) {
+        refThis.Sync(delegate, renderParam, dirtyBits, HdVP2ReprTokens->forcedWire);
+    } else {
+        _ForEachRenderItemInRepr(_FindRepr(reprs, HdVP2ReprTokens->forcedWire), hideDrawItem);
+    }
 }
 
 PXR_NAMESPACE_CLOSE_SCOPE
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.h b/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.h
@@ -186,6 +186,12 @@ class MayaUsdRPrim
         kWire = 2
     };
 
+    enum ForcedReprFlags
+    {
+        kForcedBBox = 1 << 0,
+        kForcedWire = 1 << 1
+    };
+
     struct DisplayLayerModes
     {
         //! Requested display layer visibility
@@ -368,7 +374,7 @@ class MayaUsdRPrim
     std::bitset<HdVP2DrawItem::kModFlagsBitsetSize> _requiredModFlagsBitset;
 
     // forced representations runtime state
-    bool     _needForcedBBox = false;
+    int      _forcedReprFlags { 0 };
     uint64_t _forcedReprsFrame { 0 };
 
     //! HideOnPlayback status of the Rprim

diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
@@ -1263,13 +1263,19 @@ void HdVP2Mesh::_AddNewRenderItem(
             drawItem->SetUsage(HdVP2DrawItem::kSelectionHighlight);
         }
         // The item is used for wireframe display and selection highlight.
-        else if (reprToken == HdReprTokens->wire) {
+        else if (reprToken == HdReprTokens->wire || reprToken == HdVP2ReprTokens->forcedWire) {
             renderItem = _CreateWireframeRenderItem(
                 renderItemName,
                 kOpaqueBlue,
                 MSelectionMask::kSelectMeshes,
                 MHWRender::MFrameContext::kExcludeMeshes);
             drawItem->AddUsage(HdVP2DrawItem::kSelectionHighlight);
+            if (reprToken == HdVP2ReprTokens->forcedWire) {
+                renderItem->enable(false);
+                constexpr int sDrawModeAllButBBox
+                    = MHWRender::MGeometry::kAll & ~MHWRender::MGeometry::kBoundingBox;
+                renderItem->setDrawMode((MHWRender::MGeometry::DrawMode)sDrawModeAllButBBox);
+            }
         }
         // The item is used for bbox display and selection highlight.
         else if (reprToken == HdVP2ReprTokens->bbox || reprToken == HdVP2ReprTokens->forcedBbox) {

diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
@@ -279,6 +279,13 @@ void _ConfigureReprs()
         /*flatShadingEnabled=*/false,
         /*blendWireframeColor=*/false);
 
+    const HdMeshReprDesc reprDescWire(
+        HdMeshGeomStyleHullEdgeOnly,
+        HdCullStyleDontCare,
+        HdMeshReprDescTokens->surfaceShader,
+        /*flatShadingEnabled=*/false,
+        /*blendWireframeColor=*/true);
+
     // Hull desc for shaded display, edge desc for selection highlight.
     HdMesh::ConfigureRepr(HdReprTokens->smoothHull, reprDescHull, reprDescEdge);
     HdMesh::ConfigureRepr(HdVP2ReprTokens->smoothHullUntextured, reprDescHull, reprDescEdge);
@@ -294,6 +301,7 @@ void _ConfigureReprs()
 
     // Forced representations are used for instanced geometry with display layer overrides
     HdMesh::ConfigureRepr(HdVP2ReprTokens->forcedBbox, reprDescEdge);
+    HdMesh::ConfigureRepr(HdVP2ReprTokens->forcedWire, reprDescWire);
 
     // smooth hull for untextured display
     HdBasisCurves::ConfigureRepr(

diff --git a/lib/mayaUsd/render/vp2RenderDelegate/tokens.h b/lib/mayaUsd/render/vp2RenderDelegate/tokens.h
@@ -26,7 +26,8 @@ PXR_NAMESPACE_OPEN_SCOPE
     (bbox) \
     (defaultMaterial) \
     (smoothHullUntextured) \
-    (forcedBbox)
+    (forcedBbox) \
+    (forcedWire)
 
 #define HDVP2_TOKENS \
     (displayColorAndOpacity) \