Autodesk · kxl-adsk · Jan 12, 2022 · Jan 10, 2022 · Jan 11, 2022
diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt b/test/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND TEST_SCRIPT_FILES
 if(CMAKE_UFE_V2_FEATURES_AVAILABLE)
     list(APPEND TEST_SCRIPT_FILES
     	testVP2RenderDelegateDuplicateProxy.py
-	testVP2RenderDelegateInteractiveWorkflows.py
+        testVP2RenderDelegateInteractiveWorkflows.py
     )
 endif()
 
@@ -46,6 +46,12 @@ if (MAYA_APP_VERSION VERSION_GREATER_EQUAL 2022)
     endif()
 endif()
 
+if (MAYA_APP_VERSION VERSION_GREATER 2022)
+    list(APPEND TEST_SCRIPT_FILES
+        testVP2RenderDelegateSelection.py
+    )
+endif()
+
 if (CMAKE_WANT_MATERIALX_BUILD)
     list(APPEND TEST_SCRIPT_FILES
         testVP2RenderDelegateMaterialX.py

diff --git a/...p2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/clear_smoothShaded.png b/...p2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/clear_smoothShaded.png
diff --git a/...r/vp2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/clear_wireframe.png b/...r/vp2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/clear_wireframe.png
diff --git a/...derDelegate/VP2RenderDelegateSelectionTest/baseline/clear_wireframeOnShaded.png b/...derDelegate/VP2RenderDelegateSelectionTest/baseline/clear_wireframeOnShaded.png
diff --git a/...erDelegate/VP2RenderDelegateSelectionTest/baseline/gatewayNode_smoothShaded.png b/...erDelegate/VP2RenderDelegateSelectionTest/baseline/gatewayNode_smoothShaded.png
diff --git a/...enderDelegate/VP2RenderDelegateSelectionTest/baseline/gatewayNode_wireframe.png b/...enderDelegate/VP2RenderDelegateSelectionTest/baseline/gatewayNode_wireframe.png
diff --git a/...egate/VP2RenderDelegateSelectionTest/baseline/gatewayNode_wireframeOnShaded.png b/...egate/VP2RenderDelegateSelectionTest/baseline/gatewayNode_wireframeOnShaded.png
diff --git a/...elegate/VP2RenderDelegateSelectionTest/baseline/instance_clear_smoothShaded.png b/...elegate/VP2RenderDelegateSelectionTest/baseline/instance_clear_smoothShaded.png
diff --git a/...erDelegate/VP2RenderDelegateSelectionTest/baseline/instance_clear_wireframe.png b/...erDelegate/VP2RenderDelegateSelectionTest/baseline/instance_clear_wireframe.png
diff --git a/...te/VP2RenderDelegateSelectionTest/baseline/instance_clear_wireframeOnShaded.png b/...te/VP2RenderDelegateSelectionTest/baseline/instance_clear_wireframeOnShaded.png
diff --git a/...e/VP2RenderDelegateSelectionTest/baseline/instance_gatewayNode_smoothShaded.png b/...e/VP2RenderDelegateSelectionTest/baseline/instance_gatewayNode_smoothShaded.png
diff --git a/...gate/VP2RenderDelegateSelectionTest/baseline/instance_gatewayNode_wireframe.png b/...gate/VP2RenderDelegateSelectionTest/baseline/instance_gatewayNode_wireframe.png
diff --git a/...RenderDelegateSelectionTest/baseline/instance_gatewayNode_wireframeOnShaded.png b/...RenderDelegateSelectionTest/baseline/instance_gatewayNode_wireframeOnShaded.png
diff --git a/...derDelegateSelectionTest/baseline/instance_objectA_and_objectB_smoothShaded.png b/...derDelegateSelectionTest/baseline/instance_objectA_and_objectB_smoothShaded.png
diff --git a/...RenderDelegateSelectionTest/baseline/instance_objectA_and_objectB_wireframe.png b/...RenderDelegateSelectionTest/baseline/instance_objectA_and_objectB_wireframe.png
diff --git a/...legateSelectionTest/baseline/instance_objectA_and_objectB_wireframeOnShaded.png b/...legateSelectionTest/baseline/instance_objectA_and_objectB_wireframeOnShaded.png
diff --git a/...egate/VP2RenderDelegateSelectionTest/baseline/instance_objectA_smoothShaded.png b/...egate/VP2RenderDelegateSelectionTest/baseline/instance_objectA_smoothShaded.png
diff --git a/...Delegate/VP2RenderDelegateSelectionTest/baseline/instance_objectA_wireframe.png b/...Delegate/VP2RenderDelegateSelectionTest/baseline/instance_objectA_wireframe.png
diff --git a/.../VP2RenderDelegateSelectionTest/baseline/instance_objectA_wireframeOnShaded.png b/.../VP2RenderDelegateSelectionTest/baseline/instance_objectA_wireframeOnShaded.png
diff --git a/...e/VP2RenderDelegateSelectionTest/baseline/instance_redoObjectB_smoothShaded.png b/...e/VP2RenderDelegateSelectionTest/baseline/instance_redoObjectB_smoothShaded.png
diff --git a/...gate/VP2RenderDelegateSelectionTest/baseline/instance_redoObjectB_wireframe.png b/...gate/VP2RenderDelegateSelectionTest/baseline/instance_redoObjectB_wireframe.png
diff --git a/...RenderDelegateSelectionTest/baseline/instance_redoObjectB_wireframeOnShaded.png b/...RenderDelegateSelectionTest/baseline/instance_redoObjectB_wireframeOnShaded.png
diff --git a/...e/VP2RenderDelegateSelectionTest/baseline/instance_undoObjectB_smoothShaded.png b/...e/VP2RenderDelegateSelectionTest/baseline/instance_undoObjectB_smoothShaded.png
diff --git a/...gate/VP2RenderDelegateSelectionTest/baseline/instance_undoObjectB_wireframe.png b/...gate/VP2RenderDelegateSelectionTest/baseline/instance_undoObjectB_wireframe.png
diff --git a/...RenderDelegateSelectionTest/baseline/instance_undoObjectB_wireframeOnShaded.png b/...RenderDelegateSelectionTest/baseline/instance_undoObjectB_wireframeOnShaded.png
diff --git a/...te/VP2RenderDelegateSelectionTest/baseline/instance_unselected_smoothShaded.png b/...te/VP2RenderDelegateSelectionTest/baseline/instance_unselected_smoothShaded.png
diff --git a/...egate/VP2RenderDelegateSelectionTest/baseline/instance_unselected_wireframe.png b/...egate/VP2RenderDelegateSelectionTest/baseline/instance_unselected_wireframe.png
diff --git a/...2RenderDelegateSelectionTest/baseline/instance_unselected_wireframeOnShaded.png b/...2RenderDelegateSelectionTest/baseline/instance_unselected_wireframeOnShaded.png
diff --git a/...te/VP2RenderDelegateSelectionTest/baseline/objectA_and_objectB_smoothShaded.png b/...te/VP2RenderDelegateSelectionTest/baseline/objectA_and_objectB_smoothShaded.png
diff --git a/...egate/VP2RenderDelegateSelectionTest/baseline/objectA_and_objectB_wireframe.png b/...egate/VP2RenderDelegateSelectionTest/baseline/objectA_and_objectB_wireframe.png
diff --git a/...2RenderDelegateSelectionTest/baseline/objectA_and_objectB_wireframeOnShaded.png b/...2RenderDelegateSelectionTest/baseline/objectA_and_objectB_wireframeOnShaded.png
diff --git a/...RenderDelegate/VP2RenderDelegateSelectionTest/baseline/objectA_smoothShaded.png b/...RenderDelegate/VP2RenderDelegateSelectionTest/baseline/objectA_smoothShaded.png
diff --git a/...vp2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/objectA_wireframe.png b/...vp2RenderDelegate/VP2RenderDelegateSelectionTest/baseline/objectA_wireframe.png
diff --git a/...rDelegate/VP2RenderDelegateSelectionTest/baseline/objectA_wireframeOnShaded.png b/...rDelegate/VP2RenderDelegateSelectionTest/baseline/objectA_wireframeOnShaded.png
diff --git a/...erDelegate/VP2RenderDelegateSelectionTest/baseline/redoObjectB_smoothShaded.png b/...erDelegate/VP2RenderDelegateSelectionTest/baseline/redoObjectB_smoothShaded.png
diff --git a/...enderDelegate/VP2RenderDelegateSelectionTest/baseline/redoObjectB_wireframe.png b/...enderDelegate/VP2RenderDelegateSelectionTest/baseline/redoObjectB_wireframe.png
diff --git a/...egate/VP2RenderDelegateSelectionTest/baseline/redoObjectB_wireframeOnShaded.png b/...egate/VP2RenderDelegateSelectionTest/baseline/redoObjectB_wireframeOnShaded.png
diff --git a/...erDelegate/VP2RenderDelegateSelectionTest/baseline/undoObjectB_smoothShaded.png b/...erDelegate/VP2RenderDelegateSelectionTest/baseline/undoObjectB_smoothShaded.png
diff --git a/...enderDelegate/VP2RenderDelegateSelectionTest/baseline/undoObjectB_wireframe.png b/...enderDelegate/VP2RenderDelegateSelectionTest/baseline/undoObjectB_wireframe.png
diff --git a/...egate/VP2RenderDelegateSelectionTest/baseline/undoObjectB_wireframeOnShaded.png b/...egate/VP2RenderDelegateSelectionTest/baseline/undoObjectB_wireframeOnShaded.png
diff --git a/...derDelegate/VP2RenderDelegateSelectionTest/baseline/unselected_smoothShaded.png b/...derDelegate/VP2RenderDelegateSelectionTest/baseline/unselected_smoothShaded.png
diff --git a/...RenderDelegate/VP2RenderDelegateSelectionTest/baseline/unselected_wireframe.png b/...RenderDelegate/VP2RenderDelegateSelectionTest/baseline/unselected_wireframe.png
diff --git a/...legate/VP2RenderDelegateSelectionTest/baseline/unselected_wireframeOnShaded.png b/...legate/VP2RenderDelegateSelectionTest/baseline/unselected_wireframeOnShaded.png
diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateSelection.py b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegateSelection.py
@@ -0,0 +1,173 @@
+#!/usr/bin/env mayapy
+#
+# Copyright 2021 Autodesk
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import fixturesUtils
+import imageUtils
+import mayaUtils
+import unittest
+import usdUtils
+import testUtils
+
+from mayaUsd import lib as mayaUsdLib
+from mayaUsd import ufe as mayaUsdUfe
+
+from maya import cmds
+import maya.api.OpenMayaRender as omr
+
+from pxr import Usd
+
+import ufe
+
+import os
+
+
+class testVP2RenderDelegateSelection(imageUtils.ImageDiffingTestCase):
+    """
+    Tests imaging using the Viewport 2.0 render delegate when using per-instance
+    inherited data on instances.
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        inputPath = fixturesUtils.setUpClass(__file__,
+            initializeStandalone=False, loadPlugin=False)
+
+        cls._baselineDir = os.path.join(inputPath,
+            'VP2RenderDelegateSelectionTest', 'baseline')
+
+        cls._testDir = os.path.abspath('.')
+
+    @classmethod
+    def tearDownClass(cls):
+        panel = mayaUtils.activeModelPanel()
+        cmds.modelEditor(panel, edit=True, useDefaultMaterial=False)
+
+    def assertSnapshotClose(self, imageName):
+        cmds.undoInfo(stateWithoutFlush=False) # disable the undo queue during the snapshot
+        baselineImage = os.path.join(self._baselineDir, imageName)
+        snapshotImage = os.path.join(self._testDir, imageName)
+        imageUtils.snapshot(snapshotImage, width=960, height=540)
+        retVal = self.assertImagesClose(baselineImage, snapshotImage)
+        cmds.undoInfo(stateWithoutFlush=True)
+        return retVal
+
+    def _stringToUfeItem(self, pathString):
+        ufePath = ufe.PathString.path(pathString)
+        ufeItem = ufe.Hierarchy.createItem(ufePath)
+        return ufeItem
+
+    def _createPrim(self, underItem, primType, expectedPath):
+        '''
+        Helper that creates a prim of the given type under the given item, and return its item.
+        '''
+        # create a proxy shape and add a Cone prim
+
+        proxyShapeContextOps = ufe.ContextOps.contextOps(underItem)
+        proxyShapeContextOps.doOp(['Add New Prim', primType])
+
+        primPath = ufe.Path([
+            ufe.PathString.path("|stage|stageShape").segments[0],
+            ufe.PathSegment(expectedPath, mayaUsdUfe.getUsdRunTimeId(), "/")
+            ])
+        return ufe.PathString.string(primPath)
+
+    def _selectionTest(self, scene, objectA, objectB, proxyDagPath, displayMode):
+
+        globalSelection = ufe.GlobalSelection.get()
+        globalSelection.clear()
+        self.assertSnapshotClose('%sunselected_%s.png' % (scene, displayMode))
+
+        # Select cube
+        cmds.select(objectA)
+        self.assertSnapshotClose('%sobjectA_%s.png' % (scene, displayMode))
+
+        # Select cylinder
+        cmds.select(objectB, add=True)
+        self.assertSnapshotClose('%sobjectA_and_objectB_%s.png' % (scene, displayMode))
+
+        # Undo, Redo
+        cmds.undo() # Undo remove capsule from isolate select
+        self.assertSnapshotClose('%sundoObjectB_%s.png' % (scene, displayMode))
+        cmds.redo() # Redo remove capsule from isolate select
+        self.assertSnapshotClose('%sredoObjectB_%s.png' % (scene, displayMode))
+
+        # Proxy
+        cmds.select(proxyDagPath)
+        self.assertSnapshotClose('%sgatewayNode_%s.png' % (scene, displayMode))
+
+        cmds.select(clear=True)
+        self.assertSnapshotClose('%sclear_%s.png' % (scene, displayMode))
+
+    def testSelection(self):
+        cmds.file(force=True, new=True)
+        mayaUtils.loadPlugin("mayaUsdPlugin")
+        panel = mayaUtils.activeModelPanel()
+        usdaFile = testUtils.getTestScene("setsCmd", "5prims.usda")
+        proxyDagPath, sphereStage = mayaUtils.createProxyFromFile(usdaFile)
+
+        cmds.move(-4, -24, 0, "persp")
+        cmds.rotate(90, 0, 0, "persp")
+
+        usdCube = proxyDagPath + ",/Cube1"
+        usdCylinder = proxyDagPath + ",/Cylinder1"
+
+        # Test smooth shaded
+        cmds.modelEditor('modelPanel4', e=True, displayAppearance='smoothShaded', displayLights='default')
+        cmds.modelEditor('modelPanel4', e=True, wireframeOnShaded=False, displayLights='default')
+        self._selectionTest('', usdCube, usdCylinder, proxyDagPath, 'smoothShaded')
+
+        # Test smooth shaded
+        cmds.modelEditor('modelPanel4', e=True, displayAppearance='smoothShaded', displayLights='default')
+        cmds.modelEditor('modelPanel4', e=True, wireframeOnShaded=True, displayLights='default')
+        self._selectionTest('', usdCube, usdCylinder, proxyDagPath, 'wireframeOnShaded')
+
+        # Test smooth shaded
+        cmds.modelEditor('modelPanel4', e=True, displayAppearance='wireframe', displayLights='default')
+        cmds.modelEditor('modelPanel4', e=True, wireframeOnShaded=False, displayLights='default')
+        self._selectionTest('', usdCube, usdCylinder, proxyDagPath, 'wireframe')
+
+    def testInstancedSelection(self):
+        cmds.file(force=True, new=True)
+        mayaUtils.loadPlugin("mayaUsdPlugin")
+        panel = mayaUtils.activeModelPanel()
+        usdaFile = testUtils.getTestScene("instances", "perInstanceInheritedData.usda")
+        proxyDagPath, sphereStage = mayaUtils.createProxyFromFile(usdaFile)
+        usdball01 = proxyDagPath + ",/root/group/ball_01"
+        usdball03 = proxyDagPath + ",/root/group/ball_03"
+
+        cmds.move(8.5, -20, 0, "persp")
+        cmds.rotate(90, 0, 0, "persp")
+
+        # Test smooth shaded
+        cmds.modelEditor('modelPanel4', e=True, displayAppearance='smoothShaded', displayLights='default')
+        cmds.modelEditor('modelPanel4', e=True, wireframeOnShaded=False, displayLights='default')
+        self._selectionTest('instance_', usdball01, usdball03, proxyDagPath, 'smoothShaded')
+
+        # Test smooth shaded
+        cmds.modelEditor('modelPanel4', e=True, displayAppearance='smoothShaded', displayLights='default')
+        cmds.modelEditor('modelPanel4', e=True, wireframeOnShaded=True, displayLights='default')
+        self._selectionTest('instance_', usdball01, usdball03, proxyDagPath, 'wireframeOnShaded')
+
+        # Test smooth shaded
+        cmds.modelEditor('modelPanel4', e=True, displayAppearance='wireframe', displayLights='default')
+        cmds.modelEditor('modelPanel4', e=True, wireframeOnShaded=False, displayLights='default')
+        self._selectionTest('instance_', usdball01, usdball03, proxyDagPath, 'wireframe')
+
+
+
+if __name__ == '__main__':
+    fixturesUtils.runTests(globals())