HYDRA-703 : Reuse MayaSceneFlattening test for MeshAdapter transform …

…test
Autodesk · Nov 24, 2023 · 204d7d1 · 204d7d1
1 parent 6f5d521
commit 204d7d1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt b/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
@@ -29,6 +29,7 @@ set(TEST_SCRIPT_FILES
 # both versions of the test in parallel will conflict.
 set(TEST_SCRIPT_FILES_MESH_ADAPTER
     testMeshes.py
+    cpp/testMayaSceneFlattening.py
 )
 
 foreach(script ${TEST_SCRIPT_FILES})

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testMayaSceneFlattening.cpp b/test/lib/mayaUsd/render/mayaToHydra/cpp/testMayaSceneFlattening.cpp
@@ -18,6 +18,8 @@
 #include <mayaHydraLib/hydraUtils.h>
 #include <mayaHydraLib/mayaUtils.h>
 
+#include <pxr/base/tf/envSetting.h>
+#include <pxr/base/tf/getenv.h>
 #include <pxr/imaging/hd/tokens.h>
 
 #include <maya/MViewport2Renderer.h>
@@ -28,6 +30,29 @@ PXR_NAMESPACE_USING_DIRECTIVE
 
 using namespace MayaHydra;
 
+namespace {
+
+const std::string kChildCubePrimName = "childCubeShape";
+
+FindPrimPredicate findCubePrimPredicateRenderItem
+    = [](const HdSceneIndexBasePtr& sceneIndex, const SdfPath& primPath) -> bool {
+    HdSceneIndexPrim prim = sceneIndex->GetPrim(primPath);
+    if (prim.primType != HdPrimTypeTokens->mesh) {
+        return false;
+    }
+    bool parentIsCube
+        = MakeRelativeToParentPath(primPath.GetParentPath()).GetAsString() == kChildCubePrimName;
+    return parentIsCube;
+};
+
+FindPrimPredicate findCubePrimPredicateMeshAdapter
+    = [](const HdSceneIndexBasePtr& sceneIndex, const SdfPath& primPath) -> bool {
+    HdSceneIndexPrim prim = sceneIndex->GetPrim(primPath);
+    return prim.primType == HdPrimTypeTokens->mesh && primPath.GetName() == kChildCubePrimName;
+};
+
+} // namespace
+
 TEST(MayaSceneFlattening, childHasFlattenedTransform)
 {
     // Setup inspector for the first scene index
@@ -36,16 +61,9 @@ TEST(MayaSceneFlattening, childHasFlattenedTransform)
     SceneIndexInspector inspector(sceneIndices.front());
 
     // Retrieve the child cube prim
+    bool isMeshAdapterEnabled = TfGetenvBool("MAYA_HYDRA_USE_MESH_ADAPTER", false);
     FindPrimPredicate findCubePrimPredicate
-        = [](const HdSceneIndexBasePtr& sceneIndex, const SdfPath& primPath) -> bool {
-        HdSceneIndexPrim prim = sceneIndex->GetPrim(primPath);
-        if (prim.primType != HdPrimTypeTokens->mesh) {
-            return false;
-        }
-        bool parentIsCube
-            = MakeRelativeToParentPath(primPath.GetParentPath()).GetAsString() == "childCubeShape";
-        return parentIsCube;
-    };
+        = isMeshAdapterEnabled ? findCubePrimPredicateMeshAdapter : findCubePrimPredicateRenderItem;
     PrimEntriesVector foundPrims = inspector.FindPrims(findCubePrimPredicate, 1);
     ASSERT_EQ(foundPrims.size(), static_cast<size_t>(1));
     HdSceneIndexPrim cubePrim = foundPrims.front().prim;