Fixing double-rendering of USD prims + autotest

Autodesk · Feb 29, 2024 · ac82798 · ac82798
1 parent 5c4eac3
commit ac82798
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 17 deletions.
diff --git a/lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTestFixture.cpp b/lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTestFixture.cpp
@@ -25,6 +25,7 @@
 #include <pxr/base/gf/vec3f.h>
 #include <pxr/base/vt/array.h>
 #include <pxr/base/vt/value.h>
+#include <pxr/imaging/hd/tokens.h>
 
 #include <gtest/gtest.h>
 
@@ -90,6 +91,60 @@ void AdskHydraSceneBrowserTestFixture::SetReferenceSceneIndex(
     sceneIndex = referenceSceneIndex;
 }
 
+void AdskHydraSceneBrowserTestFixture::VerifySceneCorrectness()
+{
+    // Traverse prim hierarchy
+    QTreeWidgetItemIterator itPrimsTreeWidget = GetIteratorForTree(_primHierarchyWidget);
+    for (; *itPrimsTreeWidget; itPrimsTreeWidget++) {
+        QTreeWidgetItem* primQtItem = *itPrimsTreeWidget;
+        _primHierarchyWidget->setCurrentItem(primQtItem);
+
+        // Traverse data source hierarchy
+        QTreeWidgetItemIterator itDataSourceTreeWidget = GetIteratorForTree(_dataSourceHierarchyWidget);
+        for (; *itDataSourceTreeWidget; itDataSourceTreeWidget++) {
+            QTreeWidgetItem* dataSourceQtItem = *itDataSourceTreeWidget;
+
+            // Verify representation selector's correctness
+            if (dataSourceQtItem->text(0) == "reprSelector") {
+                _dataSourceHierarchyWidget->setCurrentItem(dataSourceQtItem);
+
+                int numPointReprs = 0;
+                int numWireReprs  = 0;
+                int numSurfReprs  = 0;
+
+                // Count representations in use 
+                _dataSourceValueView->expandAll();
+                QAbstractItemModel* dataSourceItemModel = _dataSourceValueView->model();
+                for (int row = 0; row < dataSourceItemModel->rowCount(); ++row) {
+                    QModelIndex  valueIndex = dataSourceItemModel->index(row, 0);
+                    QVariant     valueData = dataSourceItemModel->data(valueIndex, Qt::DisplayRole);
+                    pxr::TfToken reprName(valueData.toString().toStdString());
+
+                    if (reprName == pxr::HdReprTokens->hull || 
+                        reprName == pxr::HdReprTokens->smoothHull || 
+                        reprName == pxr::HdReprTokens->refined) {
+                        ++numSurfReprs;
+                    } else if (reprName == pxr::HdReprTokens->refinedWire ||
+                               reprName == pxr::HdReprTokens->wire) {
+                        ++numWireReprs;
+                    } else if (reprName == pxr::HdReprTokens->refinedWireOnSurf ||
+                               reprName == pxr::HdReprTokens->wireOnSurf) {
+                        ++numWireReprs;
+                        ++numSurfReprs;
+                    } else if (reprName == pxr::HdReprTokens->points) {
+                        ++numPointReprs;
+                    }
+                }
+
+                // Verify that we don't draw the same geometry more than once
+                EXPECT_LE(numPointReprs, 1);
+                EXPECT_LE(numWireReprs, 1);
+                EXPECT_LE(numSurfReprs, 1);
+            }
+        }
+    }
+}
+
 void AdskHydraSceneBrowserTestFixture::ComparePrimHierarchy(
     bool compareDataSourceHierarchy,
     bool compareDataSourceValues)

diff --git a/lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTestFixture.h b/lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTestFixture.h
@@ -53,6 +53,8 @@ class AdskHydraSceneBrowserTestFixture : public ::testing::Test
         bool compareDataSourceHierarchy = false,
         bool compareDataSourceValues = false);
 
+    void VerifySceneCorrectness();
+
     void
     CompareDataSourceHierarchy(DataSourceEntry rootDataSourceEntry, bool compareValues = false);
 

diff --git a/lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTesting.cpp b/lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTesting.cpp
@@ -43,6 +43,11 @@ bool RunFullSceneIndexComparisonTest(pxr::HdSceneIndexBasePtr referenceSceneInde
     AdskHydraSceneBrowserTestFixture::SetReferenceSceneIndex(referenceSceneIndex);
     return RunTestsWithFilter("AdskHydraSceneBrowserTestFixture.FullSceneIndexComparison");
 }
+bool RunSceneCorrectnessTest(pxr::HdSceneIndexBasePtr referenceSceneIndex)
+{
+    AdskHydraSceneBrowserTestFixture::SetReferenceSceneIndex(referenceSceneIndex);
+    return RunTestsWithFilter("AdskHydraSceneBrowserTestFixture.VerifySceneCorrectness");
+}
 } // namespace AdskHydraSceneBrowserTesting
 
 TEST_F(AdskHydraSceneBrowserTestFixture, FullSceneIndexComparison)
@@ -52,3 +57,8 @@ TEST_F(AdskHydraSceneBrowserTestFixture, FullSceneIndexComparison)
     bool compareDataSourceValues = true;
     ComparePrimHierarchy(compareDataSourceHierarchy, compareDataSourceValues);
 }
+
+TEST_F(AdskHydraSceneBrowserTestFixture, VerifySceneCorrectness)
+{
+    VerifySceneCorrectness();
+}
diff --git a/lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTesting.h b/lib/adskHydraSceneBrowser/test/adskHydraSceneBrowserTesting.h
@@ -23,6 +23,9 @@
 namespace AdskHydraSceneBrowserTesting {
 HDUITEST_API
 bool RunFullSceneIndexComparisonTest(pxr::HdSceneIndexBasePtr referenceSceneIndex);
+
+HDUITEST_API
+bool RunSceneCorrectnessTest(pxr::HdSceneIndexBasePtr referenceSceneIndex);
 } // namespace AdskHydraSceneBrowserTesting
 
 #endif // ADSK_HYDRA_SCENE_BROWSER_TESTING_H
diff --git a/lib/flowViewport/sceneIndex/fvpWireframeSelectionHighlightSceneIndex.cpp b/lib/flowViewport/sceneIndex/fvpWireframeSelectionHighlightSceneIndex.cpp
@@ -33,15 +33,7 @@ const HdRetainedContainerDataSourceHandle sSelectedDisplayStyleDataSource
         HdRetainedContainerDataSource::New(
             HdLegacyDisplayStyleSchemaTokens->reprSelector,
             HdRetainedTypedSampledDataSource<VtArray<TfToken>>::New(
-                { HdReprTokens->refinedWireOnSurf, HdReprTokens->wireOnSurf, TfToken() })));
-
-const HdRetainedContainerDataSourceHandle sUnselectedDisplayStyleDataSource
-    = HdRetainedContainerDataSource::New(
-        HdLegacyDisplayStyleSchemaTokens->displayStyle,
-        HdRetainedContainerDataSource::New(
-            HdLegacyDisplayStyleSchemaTokens->reprSelector,
-            HdRetainedTypedSampledDataSource<VtArray<TfToken>>::New(
-                { HdReprTokens->refined, HdReprTokens->refined, TfToken() })));
+                { HdReprTokens->refinedWireOnSurf, TfToken(), TfToken() })));
 
 const HdDataSourceLocator reprSelectorLocator(
         HdLegacyDisplayStyleSchemaTokens->displayStyle,
@@ -88,10 +80,10 @@ WireframeSelectionHighlightSceneIndex::GetPrim(const SdfPath &primPath) const
     // index to convert implicit surfaces (e.g. USD cube / cone / sphere /
     // capsule primitive types) to meshes.
     if (!isExcluded(primPath) && prim.primType == HdPrimTypeTokens->mesh) {
-        prim.dataSource = HdOverlayContainerDataSource::New(
-            { prim.dataSource, _selection->HasFullySelectedAncestorInclusive(primPath) ? 
-                sSelectedDisplayStyleDataSource : 
-                sUnselectedDisplayStyleDataSource });
+        if (_selection->HasFullySelectedAncestorInclusive(primPath)) {
+            prim.dataSource = HdOverlayContainerDataSource::New(
+                { prim.dataSource, sSelectedDisplayStyleDataSource });
+        }
     }
     return prim;
 }

diff --git a/plugin/mayaHydraSceneBrowserTest/mayaHydraSceneBrowserTestCmd.cpp b/plugin/mayaHydraSceneBrowserTest/mayaHydraSceneBrowserTestCmd.cpp
@@ -31,6 +31,14 @@ using namespace MAYAHYDRA_NS;
 
 const MString mayaHydraSceneBrowserTestCmd::name("mayaHydraSceneBrowserTest");
 
+namespace {
+void DisplayResult(bool didTestSucceed, const char* testDisplayName)
+{
+    MString testResultString = didTestSucceed ? MString(" test result : PASS") : MString(" test result : FAIL");
+    MGlobal::displayInfo(testDisplayName + testResultString);    
+}
+} // namespace
+
 MStatus mayaHydraSceneBrowserTestCmd::doIt(const MArgList& args)
 {
     // Retrieve the scene index
@@ -44,13 +52,17 @@ MStatus mayaHydraSceneBrowserTestCmd::doIt(const MArgList& args)
     // Run comparison test
     bool didTestSucceed
         = AdskHydraSceneBrowserTesting::RunFullSceneIndexComparisonTest(sceneIndices.front());
+    bool didAllTestsSucceed = didTestSucceed;
+    DisplayResult(didTestSucceed, "Hydra Scene Browser comparison");
 
-    // Display result
-    MString testResultString = didTestSucceed ? MString("PASS") : MString("FAIL");
-    MGlobal::displayInfo("Hydra Scene Browser comparison test result : " + testResultString);
+    // Run correctness test
+    didTestSucceed
+        = AdskHydraSceneBrowserTesting::RunSceneCorrectnessTest(sceneIndices.front());
+    didAllTestsSucceed |= didTestSucceed;
+    DisplayResult(didTestSucceed, "Hydra Scene correctness");
 
     // Return result
-    return didTestSucceed ? MS::kSuccess : MS::kFailure;
+    return didAllTestsSucceed ? MS::kSuccess : MS::kFailure;
 }
 
 MStatus initializePlugin(MObject obj)