Merge pull request #1292 from Autodesk/chenh/MAYA-110596/switch-to-vertex-selection-level-for-point-snapping

MAYA-110596 MAYA-110576 faster point snapping

Author: Krystian Ligenza

lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp

@@ -709,7 +709,7 @@ void HdVP2BasisCurves::_UpdateDrawItem(
     HdVP2DrawItem*               drawItem,
     HdBasisCurvesReprDesc const& desc)
 {
-    const MHWRender::MRenderItem* renderItem = drawItem->GetRenderItem();
+    MHWRender::MRenderItem* renderItem = drawItem->GetRenderItem();
     if (ARCH_UNLIKELY(!renderItem)) {
         return;
     }
@@ -745,7 +745,13 @@ void HdVP2BasisCurves::_UpdateDrawItem(
     // doesn't need to extract index data from topology. Points use non-indexed
     // draw.
     const bool isBoundingBoxItem = (drawMode == MHWRender::MGeometry::kBoundingBox);
+
+#ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT
+    constexpr bool isPointSnappingItem = false;
+#else
     const bool isPointSnappingItem = (renderItem->primitive() == MHWRender::MGeometry::kPoints);
+#endif
+
     const bool requiresIndexUpdate = !isBoundingBoxItem && !isPointSnappingItem;
 
     // Prepare index buffer.
@@ -1298,6 +1304,20 @@ void HdVP2BasisCurves::_UpdateDrawItem(
               | HdChangeTracker::DirtyPrimvar | HdChangeTracker::DirtyTopology
               | DirtySelectionHighlight));
 
+#ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT
+    if ((itemDirtyBits & DirtySelectionHighlight) && !isBoundingBoxItem) {
+        MSelectionMask selectionMask(MSelectionMask::kSelectNurbsCurves);
+
+        // Only unselected Rprims can be used for point snapping.
+        if (_selectionStatus == kUnselected) {
+            selectionMask.addMask(MSelectionMask::kSelectPointsForGravity);
+        }
+
+        // The function is thread-safe, thus called in place to keep simple.
+        renderItem->setSelectionMask(selectionMask);
+    }
+#endif
+
     // Reset dirty bits because we've prepared commit state for this draw item.
     drawItem->ResetDirtyBits();
 
@@ -1637,9 +1657,11 @@ void HdVP2BasisCurves::_InitRepr(TfToken const& reprToken, HdDirtyBits* dirtyBit
                 drawItem->AddUsage(HdVP2DrawItem::kSelectionHighlight);
             }
             break;
+#ifndef MAYA_NEW_POINT_SNAPPING_SUPPORT
         case HdBasisCurvesGeomStylePoints:
             renderItem = _CreatePointsRenderItem(renderItemName);
             break;
+#endif
         default: TF_WARN("Unsupported geomStyle"); break;
         }
 
@@ -1802,7 +1824,14 @@ MHWRender::MRenderItem* HdVP2BasisCurves::_CreateWireRenderItem(const MString& n
     renderItem->castsShadows(false);
     renderItem->receivesShadows(false);
     renderItem->setShader(_delegate->Get3dSolidShader(kOpaqueGray));
+
+#ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT
+    MSelectionMask selectionMask(MSelectionMask::kSelectNurbsCurves);
+    selectionMask.addMask(MSelectionMask::kSelectPointsForGravity);
+    renderItem->setSelectionMask(selectionMask);
+#else
     renderItem->setSelectionMask(MSelectionMask::kSelectNurbsCurves);
+#endif
 
 #if MAYA_API_VERSION >= 20220000
     renderItem->setObjectTypeExclusionFlag(MHWRender::MFrameContext::kExcludeNurbsCurves);
@@ -1847,7 +1876,14 @@ MHWRender::MRenderItem* HdVP2BasisCurves::_CreatePatchRenderItem(const MString&
     renderItem->castsShadows(false);
     renderItem->receivesShadows(false);
     renderItem->setShader(_delegate->Get3dSolidShader(kOpaqueGray));
+
+#ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT
+    MSelectionMask selectionMask(MSelectionMask::kSelectNurbsCurves);
+    selectionMask.addMask(MSelectionMask::kSelectPointsForGravity);
+    renderItem->setSelectionMask(selectionMask);
+#else
     renderItem->setSelectionMask(MSelectionMask::kSelectNurbsCurves);
+#endif
 
 #if MAYA_API_VERSION >= 20220000
     renderItem->setObjectTypeExclusionFlag(MHWRender::MFrameContext::kExcludeNurbsCurves);
@@ -1858,6 +1894,7 @@ MHWRender::MRenderItem* HdVP2BasisCurves::_CreatePatchRenderItem(const MString&
     return renderItem;
 }
 
+#ifndef MAYA_NEW_POINT_SNAPPING_SUPPORT
 /*! \brief  Create render item for points repr.
  */
 MHWRender::MRenderItem* HdVP2BasisCurves::_CreatePointsRenderItem(const MString& name) const
@@ -1883,5 +1920,6 @@ MHWRender::MRenderItem* HdVP2BasisCurves::_CreatePointsRenderItem(const MString&
 
     return renderItem;
 }
+#endif
 
 PXR_NAMESPACE_CLOSE_SCOPE

lib/mayaUsd/render/vp2RenderDelegate/basisCurves.h

@@ -147,7 +147,10 @@ class HdVP2BasisCurves final : public HdBasisCurves
     MHWRender::MRenderItem* _CreatePatchRenderItem(const MString& name) const;
     MHWRender::MRenderItem* _CreateWireRenderItem(const MString& name) const;
     MHWRender::MRenderItem* _CreateBBoxRenderItem(const MString& name) const;
+
+#ifndef MAYA_NEW_POINT_SNAPPING_SUPPORT
     MHWRender::MRenderItem* _CreatePointsRenderItem(const MString& name) const;
+#endif
 
     enum DirtyBits : HdDirtyBits
     {

lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp

@@ -1300,7 +1300,9 @@ void HdVP2Mesh::_InitRepr(const TfToken& reprToken, HdDirtyBits* dirtyBits)
                 drawItem->AddUsage(HdVP2DrawItem::kSelectionHighlight);
             }
             break;
+#ifndef MAYA_NEW_POINT_SNAPPING_SUPPORT
         case HdMeshGeomStylePoints: renderItem = _CreatePointsRenderItem(renderItemName); break;
+#endif
         default: TF_WARN("Unsupported geomStyle"); break;
         }
 
@@ -1509,7 +1511,13 @@ void HdVP2Mesh::_UpdateDrawItem(
     // doesn't need to extract index data from topology. Points use non-indexed
     // draw.
     const bool isBBoxItem = (renderItem->drawMode() == MHWRender::MGeometry::kBoundingBox);
+
+#ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT
+    constexpr bool isPointSnappingItem = false;
+#else
     const bool isPointSnappingItem = (renderItem->primitive() == MHWRender::MGeometry::kPoints);
+#endif
+
 #ifdef HDVP2_ENABLE_GPU_OSD
     const bool isLineItem = (renderItem->primitive() == MHWRender::MGeometry::kLines);
     // when we do OSD we don't bother creating indexing until after we have a smooth mesh
@@ -1865,6 +1873,21 @@ void HdVP2Mesh::_UpdateDrawItem(
            & (HdChangeTracker::DirtyPoints | HdChangeTracker::DirtyNormals
               | HdChangeTracker::DirtyPrimvar | HdChangeTracker::DirtyTopology));
 
+#ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT
+    if (!isBBoxItem && !isDedicatedSelectionHighlightItem
+        && (itemDirtyBits & DirtySelectionHighlight)) {
+        MSelectionMask selectionMask(MSelectionMask::kSelectMeshes);
+
+        // Only unselected Rprims can be used for point snapping.
+        if (_selectionStatus == kUnselected) {
+            selectionMask.addMask(MSelectionMask::kSelectPointsForGravity);
+        }
+
+        // The function is thread-safe, thus called in place to keep simple.
+        renderItem->setSelectionMask(selectionMask);
+    }
+#endif
+
     // Capture buffers we need
     MHWRender::MIndexBuffer* indexBuffer = drawItemData._indexBuffer.get();
     PrimvarInfoMap*          primvarInfo = &_meshSharedData->_primvarInfo;
@@ -2244,6 +2267,7 @@ void HdVP2Mesh::_UpdatePrimvarSources(
     }
 }
 
+#ifndef MAYA_NEW_POINT_SNAPPING_SUPPORT
 /*! \brief  Create render item for points repr.
  */
 MHWRender::MRenderItem* HdVP2Mesh::_CreatePointsRenderItem(const MString& name) const
@@ -2269,6 +2293,7 @@ MHWRender::MRenderItem* HdVP2Mesh::_CreatePointsRenderItem(const MString& name)
 
     return renderItem;
 }
+#endif
 
 /*! \brief  Create render item for wireframe repr.
  */
@@ -2282,7 +2307,14 @@ MHWRender::MRenderItem* HdVP2Mesh::_CreateWireframeRenderItem(const MString& nam
     renderItem->castsShadows(false);
     renderItem->receivesShadows(false);
     renderItem->setShader(_delegate->Get3dSolidShader(kOpaqueBlue));
+
+#ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT
+    MSelectionMask selectionMask(MSelectionMask::kSelectMeshes);
+    selectionMask.addMask(MSelectionMask::kSelectPointsForGravity);
+    renderItem->setSelectionMask(selectionMask);
+#else
     renderItem->setSelectionMask(MSelectionMask::kSelectMeshes);
+#endif
 
 #if MAYA_API_VERSION >= 20220000
     renderItem->setObjectTypeExclusionFlag(MHWRender::MFrameContext::kExcludeMeshes);
@@ -2329,7 +2361,14 @@ MHWRender::MRenderItem* HdVP2Mesh::_CreateSmoothHullRenderItem(const MString& na
     renderItem->castsShadows(true);
     renderItem->receivesShadows(true);
     renderItem->setShader(_delegate->GetFallbackShader(kOpaqueGray));
+
+#ifdef MAYA_NEW_POINT_SNAPPING_SUPPORT
+    MSelectionMask selectionMask(MSelectionMask::kSelectMeshes);
+    selectionMask.addMask(MSelectionMask::kSelectPointsForGravity);
+    renderItem->setSelectionMask(selectionMask);
+#else
     renderItem->setSelectionMask(MSelectionMask::kSelectMeshes);
+#endif
 
 #if MAYA_API_VERSION >= 20220000
     renderItem->setObjectTypeExclusionFlag(MHWRender::MFrameContext::kExcludeMeshes);

lib/mayaUsd/render/vp2RenderDelegate/mesh.h

@@ -157,9 +157,12 @@ class HdVP2Mesh final : public HdMesh
     MHWRender::MRenderItem* _CreateSelectionHighlightRenderItem(const MString& name) const;
     MHWRender::MRenderItem* _CreateSmoothHullRenderItem(const MString& name) const;
     MHWRender::MRenderItem* _CreateWireframeRenderItem(const MString& name) const;
-    MHWRender::MRenderItem* _CreatePointsRenderItem(const MString& name) const;
     MHWRender::MRenderItem* _CreateBoundingBoxRenderItem(const MString& name) const;
 
+#ifndef MAYA_NEW_POINT_SNAPPING_SUPPORT
+    MHWRender::MRenderItem* _CreatePointsRenderItem(const MString& name) const;
+#endif
+
     static void _InitGPUCompute();
 
     //! Custom dirty bits used by this mesh

lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp

@@ -701,9 +701,12 @@ void ProxyRenderDelegate::_Execute(const MHWRender::MFrameContext& frameContext)
 #endif // defined(MAYA_ENABLE_UPDATE_FOR_SELECTION)
 
     if (inSelectionPass) {
+        // The new Maya point snapping support doesn't require point snapping items any more.
+#if !defined(MAYA_NEW_POINT_SNAPPING_SUPPORT)
         if (inPointSnapping && !reprSelector.Contains(HdReprTokens->points)) {
             reprSelector = reprSelector.CompositeOver(kPointsReprSelector);
         }
+#endif
     } else {
         if (_selectionChanged) {
             _UpdateSelectionStates();
@@ -777,13 +780,20 @@ void ProxyRenderDelegate::update(MSubSceneContainer& container, const MFrameCont
     param->EndUpdate();
 }
 
-//! \brief  Switch to component-level selection for point snapping.
+//! \brief  Update selection granularity for point snapping.
 void ProxyRenderDelegate::updateSelectionGranularity(
     const MDagPath&               path,
     MHWRender::MSelectionContext& selectionContext)
 {
+    // The component level is coarse-grain, causing Maya to produce undesired face/edge selection
+    // hits, as well as vertex selection hits that are required for point snapping. Switch to the
+    // new vertex selection level if available in order to produce vertex selection hits only.
     if (pointSnappingActive()) {
+#if MAYA_API_VERSION >= 20220100
+        selectionContext.setSelectionLevel(MHWRender::MSelectionContext::kVertex);
+#else
         selectionContext.setSelectionLevel(MHWRender::MSelectionContext::kComponent);
+#endif
     }
 }
 
@@ -872,9 +882,7 @@ bool ProxyRenderDelegate::getInstancedSelectionPath(
 #if defined(MAYA_ENABLE_UPDATE_FOR_SELECTION)
     const TfToken&                   selectionKind = _selectionKind;
     const UsdPointInstancesPickMode& pointInstancesPickMode = _pointInstancesPickMode;
-#ifndef UFE_V2_FEATURES_AVAILABLE
-    const MGlobal::ListAdjustment& listAdjustment = _globalListAdjustment;
-#endif
+    const MGlobal::ListAdjustment&   listAdjustment = _globalListAdjustment;
 #else
     const TfToken selectionKind = GetSelectionKind();
     const UsdPointInstancesPickMode pointInstancesPickMode = GetPointInstancesPickMode();
@@ -953,6 +961,8 @@ bool ProxyRenderDelegate::getInstancedSelectionPath(
     }
 
 #ifdef UFE_V2_FEATURES_AVAILABLE
+    TF_UNUSED(listAdjustment);
+
     auto ufeSel = Ufe::NamedSelection::get("MayaSelectTool");
     ufeSel->append(si);
 #else

lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h

@@ -40,6 +40,11 @@
 #include <ufe/observer.h>
 #endif
 
+// The new Maya point snapping support doesn't require point snapping items any more.
+#if MAYA_API_VERSION >= 20230000
+#define MAYA_NEW_POINT_SNAPPING_SUPPORT
+#endif
+
 // Conditional compilation due to Maya API gap.
 #if MAYA_API_VERSION >= 20200000
 #define MAYA_ENABLE_UPDATE_FOR_SELECTION