From f0639e259ca7fd973e4c6f9b47d23e2e835620d6 Mon Sep 17 00:00:00 2001 From: Ivan Vlasov Date: Tue, 6 Jun 2023 12:06:42 -0400 Subject: [PATCH] Using MHWRender::MGeometry::kSelectionHighlighting flag to hide selection when required --- lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp | 11 ++++++++++- .../baseline/selectionHighlightDisabled.png | Bin 0 -> 11693 bytes .../baseline/selectionHighlightEnabled.png | Bin 0 -> 13946 bytes .../testVP2RenderDelegateSelection.py | 9 +++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/selectionHighlightDisabled.png create mode 100644 test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/selectionHighlightEnabled.png diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp index 63372836fa..a3d1f9f0eb 100644 --- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp +++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp @@ -60,6 +60,14 @@ namespace { const TfTokenVector sFallbackShaderPrimvars = { HdTokens->displayColor, HdTokens->displayOpacity, HdTokens->normals }; +// Proper support for selection highlighting on/off switch in +// MRenderItem starts only beyond Maya 2024.1 +#if MAYA_API_VERSION > 20240100 +constexpr int sDrawModeSelectionHighlighting = MHWRender::MGeometry::kSelectionHighlighting; +#else +constexpr int sDrawModeSelectionHighlighting = 0; +#endif + //! Helper utility function to fill primvar data to vertex buffer. template void _FillPrimvarData( @@ -2696,7 +2704,8 @@ MHWRender::MRenderItem* HdVP2Mesh::_CreateSelectionHighlightRenderItem(const MSt name, MHWRender::MRenderItem::DecorationItem, MHWRender::MGeometry::kLines); constexpr MHWRender::MGeometry::DrawMode drawMode = static_cast( - MHWRender::MGeometry::kShaded | MHWRender::MGeometry::kTextured); + MHWRender::MGeometry::kShaded | MHWRender::MGeometry::kTextured + | sDrawModeSelectionHighlighting); renderItem->setDrawMode(drawMode); renderItem->depthPriority(MHWRender::MRenderItem::sActiveWireDepthPriority); renderItem->castsShadows(false); diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/selectionHighlightDisabled.png b/test/lib/mayaUsd/render/vp2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/selectionHighlightDisabled.png new file mode 100644 index 0000000000000000000000000000000000000000..e03ab92d967017645a85cce22153d85365082133 GIT binary patch literal 11693 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 literal 0 HcmV?d00001 diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateSelection.py b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateSelection.py index f66ba870ae..c846a9a312 100644 --- a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateSelection.py +++ b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateSelection.py @@ -130,6 +130,15 @@ def testSelection(self): cmds.modelEditor('modelPanel4', e=True, wireframeOnShaded=False, displayLights='default') self._selectionTest('', usdCube, usdCylinder, proxyDagPath, 'smoothShaded') + # Test selection highlighting enabled/disabled + if (mayaUtils.mayaMajorMinorVersions() > (2024, 1)): + cmds.select(proxyDagPath) + self.assertSnapshotClose('selectionHighlightEnabled.png') + cmds.modelEditor('modelPanel4', e=True, selectionHiliteDisplay=False) + self.assertSnapshotClose('selectionHighlightDisabled.png') + cmds.modelEditor('modelPanel4', e=True, selectionHiliteDisplay=True) + cmds.select(clear=True) + # Test wireframe on shaded cmds.modelEditor('modelPanel4', e=True, displayAppearance='smoothShaded', displayLights='default') cmds.modelEditor('modelPanel4', e=True, wireframeOnShaded=True, displayLights='default')