HYDRA-834 : Add support for text-based data source dump comparisons i…

…n tests (#88)

* HYDRA-834 : Add support for text dump data source comparison

* HYDRA-834 : Add utils to get a depend node from its name and to set node attributes

* HYDRA-834 : Add test for some nurbs surfaces

* HYDRA-834 : Add reference files generated on Windows with default float stream settings (will fail on other platforms)

* HYDRA-834 : Add util to override float/double streaming setings and update reference dumps

* HYDRA-834 : Add compile definition for configurable decimal streaming

* HYDRA-834 : Formatting change

* HYDRA-834 : Remove carriage returns when reading reference files

* Fixup order

* Fix testNurbsSurface

* Re-add missing line

* Fix function not used on Linux when data source comparison is unavailable

CMakeLists.txt

@@ -124,6 +124,21 @@ if (CMAKE_WANT_MATERIALX_BUILD)
 endif()
 include(cmake/usd.cmake)
 
+set(CONFIGURABLE_DECIMAL_STREAMING_AVAILABLE FALSE)
+if (DEFINED PXR_USD_LOCATION)
+    file(GLOB_RECURSE STRING_UTILS_HEADER_PATH
+        LIST_DIRECTORIES FALSE
+        "${PXR_USD_LOCATION}/include/**stringUtils.h")
+
+    file(READ ${STRING_UTILS_HEADER_PATH} STRING_UTILS_HEADER_CONTENTS)
+
+    string(REGEX MATCH "struct TfDecimalToStringConfig" DECIMAL_TO_STRING_MATCH ${STRING_UTILS_HEADER_CONTENTS})
+
+    if (DECIMAL_TO_STRING_MATCH)
+        set(CONFIGURABLE_DECIMAL_STREAMING_AVAILABLE TRUE)
+    endif()
+endif()
+
 option(BUILD_MAYAHYDRALIB "Build the Maya-To-Hydra plugin and scene delegate." ON)
 
 find_package(UFE REQUIRED)

cmake/compiler_config.cmake

@@ -220,5 +220,6 @@ function(mayaHydra_compile_config TARGET)
         PRIVATE
             TBB_SUPPRESS_DEPRECATED_MESSAGES # Remove TBB deprecation warnings
             BOOST_ALL_NO_LIB # Avoid Boost autolinking libraries
+            $<$<BOOL:${CONFIGURABLE_DECIMAL_STREAMING_AVAILABLE}>:CONFIGURABLE_DECIMAL_STREAMING_AVAILABLE>
     )
 endfunction()

lib/mayaHydra/hydraExtensions/mayaUtils.cpp

@@ -71,6 +71,16 @@ MStatus GetDagPathFromNodeName(const MString& nodeName, MDagPath& outDagPath)
     return status;
 }
 
+MStatus GetDependNodeFromNodeName(const MString& nodeName, MObject& outDependNode)
+{
+    MSelectionList selectionList;
+    MStatus        status = selectionList.add(nodeName);
+    if (status) {
+        status = selectionList.getDependNode(0, outDependNode);
+    }
+    return status;
+}
+
 MStatus GetMayaMatrixFromDagPath(const MDagPath& dagPath, MMatrix& outMatrix)
 {
     MStatus status;

lib/mayaHydra/hydraExtensions/mayaUtils.h

@@ -21,6 +21,8 @@
 #include <mayaHydraLib/mayaHydra.h>
 
 #include <maya/MApiNamespace.h>
+#include <maya/MFnDependencyNode.h>
+#include <maya/MPlug.h>
 
 #include <string>
 
@@ -60,6 +62,17 @@ MStatus GetObjectsFromNodeNames(const MStringArray& nodeNames, MObjectArray & ou
 MAYAHYDRALIB_API
 MStatus GetDagPathFromNodeName(const MString& nodeName, MDagPath& outDagPath);
 
+/**
+ * @brief Get a node from the Maya dependency graph using its name
+ *
+ * @param[in] nodeName is the name of the node to get.
+ * @param[out] outDependNode is the node in the Maya dependency graph.
+ *
+ * @return The resulting status of the operation.
+ */
+MAYAHYDRALIB_API
+MStatus GetDependNodeFromNodeName(const MString& nodeName, MObject& outDependNode);
+
 /**
  * @brief Get the Maya transform matrix of a node from its DAG path
  *
@@ -130,6 +143,31 @@ bool IsAMayaTransformAttributeName(const MString& attrName);
 //Is it a maya node visibility attribute ? 
 bool IsAMayaVisibilityAttribute(const MPlug& plug, bool& outVal);
 
+/**
+ * @brief Set the value of a DG node attribute.
+ *
+ * @param[in] node The Maya node for which to modify the attribute
+ * @param[in] attrName The attribute name to modify
+ * @param[in] newValue The value to set the attribute to
+ *
+ * @return True if the attribute was successfully modified, false otherwise.
+ */
+template <typename AttrType>
+bool SetNodeAttribute(MObject node, std::string attrName, AttrType newValue)
+{
+    MStatus           dependencyNodeStatus;
+    MFnDependencyNode dependencyNode(node, &dependencyNodeStatus);
+    if (!dependencyNodeStatus) {
+        return false;
+    }
+    MStatus plugStatus;
+    MPlug   plug = dependencyNode.findPlug(attrName.c_str(), true, &plugStatus);
+    if (!plugStatus) {
+        return false;
+    }
+    return plug.setValue(newValue);
+}
+
 } // namespace MAYAHYDRA_NS_DEF
 
 #endif // MAYAHYDRALIB_MAYA_UTILS_H

test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt

@@ -58,6 +58,7 @@ set(INTERACTIVE_TEST_SCRIPT_FILES
     cpp/testUsdPointInstancePicking.py
     cpp/testUsdNativeInstancePicking.py
     cpp/testUsdPickKind.py
+    cpp/testNurbsSurfaces.py
 )
 
 #Add this test only if the MayaUsd_FOUND (so also MAYAUSDAPI_LIBRARY) has been found during compile time.

test/lib/mayaUsd/render/mayaToHydra/cpp/CMakeLists.txt

@@ -39,6 +39,7 @@ target_sources(${TARGET_NAME}
         testUsdAnim.cpp
         testUsdPointInstancePicking.cpp
         testUsdPicking.cpp
+        testNurbsSurfaces.cpp
 )
 
 # -----------------------------------------------------------------------------

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/circle_points_fresh.txt

@@ -0,0 +1,6 @@
+[interpolation]
+	vertex
+[primvarValue]
+	[(0.00000, 1.00000, 0.00000), (-0.15611, 0.98727, 0.00000), (-0.30855, 0.95009, 0.00000), (-0.45364, 0.89000, 0.00000), (-0.58772, 0.80849, 0.00000), (-0.70711, 0.70711, 0.00000), (-0.80849, 0.58772, 0.00000), (-0.89000, 0.45364, 0.00000), (-0.95009, 0.30855, 0.00000), (-0.98727, 0.15611, 0.00000), (-1.00000, 0.00000, 0.00000), (-0.98727, -0.15611, 0.00000), (-0.95009, -0.30855, 0.00000), (-0.89000, -0.45364, 0.00000), (-0.80849, -0.58772, 0.00000), (-0.70711, -0.70711, 0.00000), (-0.58772, -0.80849, 0.00000), (-0.45364, -0.89000, 0.00000), (-0.30855, -0.95009, 0.00000), (-0.15611, -0.98727, 0.00000), (0.00000, -1.00000, 0.00000), (0.15611, -0.98727, 0.00000), (0.30855, -0.95009, 0.00000), (0.45364, -0.89000, 0.00000), (0.58772, -0.80849, 0.00000), (0.70711, -0.70711, 0.00000), (0.80849, -0.58772, 0.00000), (0.89000, -0.45364, 0.00000), (0.95009, -0.30855, 0.00000), (0.98727, -0.15611, 0.00000), (1.00000, 0.00000, 0.00000), (0.98727, 0.15611, 0.00000), (0.95009, 0.30855, 0.00000), (0.89000, 0.45364, 0.00000), (0.80849, 0.58772, 0.00000), (0.70711, 0.70711, 0.00000), (0.58772, 0.80849, 0.00000), (0.45364, 0.89000, 0.00000), (0.30855, 0.95009, 0.00000), (0.15611, 0.98727, 0.00000), (0.00000, 1.00000, 0.00000)]
+[role]
+	point

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/circle_points_modified.txt

@@ -0,0 +1,6 @@
+[interpolation]
+	vertex
+[primvarValue]
+	[(3.84143, 6.68285, 4.93095), (2.90231, 6.53668, 5.34144), (2.25733, 5.97876, 5.92839), (2.07929, 5.15857, 6.53452), (2.41590, 4.29590, 6.99743), (3.17697, 3.62189, 7.19308), (4.15857, 3.31715, 7.06905), (5.09768, 3.46332, 6.65856), (5.74267, 4.02124, 6.07161), (5.92071, 4.84143, 5.46548), (5.58410, 5.70410, 5.00257), (4.82303, 6.37811, 4.80692), (3.84143, 6.68285, 4.93095)]
+[role]
+	point

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/circle_points_tolerance.txt

@@ -0,0 +1,6 @@
+[interpolation]
+	vertex
+[primvarValue]
+	[(3.84143, 6.68285, 4.93095), (3.25566, 6.64949, 5.14845), (2.74274, 6.45466, 5.44931), (2.35290, 6.11744, 5.80407), (2.12429, 5.67084, 6.17801), (2.07929, 5.15857, 6.53452), (2.22229, 4.63078, 6.83871), (2.53932, 4.13913, 7.06081), (2.99932, 3.73175, 7.17906), (3.55728, 3.44851, 7.18190), (4.15857, 3.31715, 7.06905), (4.74435, 3.35051, 6.85155), (5.25726, 3.54534, 6.55069), (5.64710, 3.88256, 6.19593), (5.87571, 4.32916, 5.82199), (5.92071, 4.84143, 5.46548), (5.77771, 5.36922, 5.16129), (5.46068, 5.86087, 4.93919), (5.00068, 6.26825, 4.82094), (4.44272, 6.55149, 4.81810), (3.84143, 6.68285, 4.93095)]
+[role]
+	point

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/circle_points_unfixedCenter.txt

@@ -0,0 +1,6 @@
+[interpolation]
+	vertex
+[primvarValue]
+	[(0.84143, 3.68285, 1.93096), (0.25565, 3.64949, 2.14845), (-0.25726, 3.45466, 2.44931), (-0.64710, 3.11744, 2.80407), (-0.87571, 2.67084, 3.17801), (-0.92071, 2.15857, 3.53452), (-0.77771, 1.63078, 3.83871), (-0.46068, 1.13913, 4.06081), (-0.00068, 0.73175, 4.17906), (0.55728, 0.44851, 4.18190), (1.15857, 0.31715, 4.06905), (1.74435, 0.35051, 3.85155), (2.25726, 0.54534, 3.55069), (2.64710, 0.88256, 3.19593), (2.87571, 1.32916, 2.82199), (2.92071, 1.84143, 2.46548), (2.77771, 2.36922, 2.16129), (2.46068, 2.86087, 1.93919), (2.00068, 3.26825, 1.82094), (1.44272, 3.55149, 1.81810), (0.84143, 3.68285, 1.93096)]
+[role]
+	point

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/circle_topology_fresh.txt

@@ -0,0 +1,10 @@
+[basis]
+
+[curveIndices]
+	[0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38, 39, 39, 40]
+[curveVertexCounts]
+	[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]
+[type]
+	linear
+[wrap]
+	segmented

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/circle_topology_modified.txt

@@ -0,0 +1,10 @@
+[basis]
+
+[curveIndices]
+	[0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12]
+[curveVertexCounts]
+	[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]
+[type]
+	linear
+[wrap]
+	segmented

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/circle_topology_tolerance.txt

@@ -0,0 +1,10 @@
+[basis]
+
+[curveIndices]
+	[0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20]
+[curveVertexCounts]
+	[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]
+[type]
+	linear
+[wrap]
+	segmented

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/circle_topology_unfixedCenter.txt

@@ -0,0 +1,10 @@
+[basis]
+
+[curveIndices]
+	[0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20]
+[curveVertexCounts]
+	[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]
+[type]
+	linear
+[wrap]
+	segmented

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/cube_backnurbsCubeShape1_points_fresh.txt

@@ -0,0 +1,6 @@
+[interpolation]
+	vertex
+[primvarValue]
+	[(-0.50000, -0.50000, 0.50000), (-0.25000, -0.50000, 0.50000), (0.00000, -0.50000, 0.50000), (0.25000, -0.50000, 0.50000), (0.50000, -0.50000, 0.50000), (-0.50000, -0.25000, 0.50000), (-0.25000, -0.25000, 0.50000), (0.00000, -0.25000, 0.50000), (0.25000, -0.25000, 0.50000), (0.50000, -0.25000, 0.50000), (-0.50000, 0.00000, 0.50000), (-0.25000, 0.00000, 0.50000), (0.00000, 0.00000, 0.50000), (0.25000, 0.00000, 0.50000), (0.50000, 0.00000, 0.50000), (-0.50000, 0.25000, 0.50000), (-0.25000, 0.25000, 0.50000), (0.00000, 0.25000, 0.50000), (0.25000, 0.25000, 0.50000), (0.50000, 0.25000, 0.50000), (-0.50000, 0.50000, 0.50000), (-0.25000, 0.50000, 0.50000), (0.00000, 0.50000, 0.50000), (0.25000, 0.50000, 0.50000), (0.50000, 0.50000, 0.50000)]
+[role]
+	point

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/cube_backnurbsCubeShape1_points_modified.txt

@@ -0,0 +1,6 @@
+[interpolation]
+	vertex
+[primvarValue]
+	[(-12.00000, -10.00000, 2.00000), (-9.00000, -10.00000, 2.00000), (-6.00000, -10.00000, 2.00000), (-3.00000, -10.00000, 2.00000), (0.00000, -10.00000, 2.00000), (3.00000, -10.00000, 2.00000), (6.00000, -10.00000, 2.00000), (9.00000, -10.00000, 2.00000), (12.00000, -10.00000, 2.00000), (-12.00000, -8.33333, 2.00000), (-9.00000, -8.33333, 2.00000), (-6.00000, -8.33333, 2.00000), (-3.00000, -8.33333, 2.00000), (0.00000, -8.33333, 2.00000), (3.00000, -8.33333, 2.00000), (6.00000, -8.33333, 2.00000), (9.00000, -8.33333, 2.00000), (12.00000, -8.33333, 2.00000), (-12.00000, -6.66667, 2.00000), (-9.00000, -6.66667, 2.00000), (-6.00000, -6.66667, 2.00000), (-3.00000, -6.66667, 2.00000), (0.00000, -6.66667, 2.00000), (3.00000, -6.66667, 2.00000), (6.00000, -6.66667, 2.00000), (9.00000, -6.66667, 2.00000), (12.00000, -6.66667, 2.00000), (-12.00000, -5.00000, 2.00000), (-9.00000, -5.00000, 2.00000), (-6.00000, -5.00000, 2.00000), (-3.00000, -5.00000, 2.00000), (0.00000, -5.00000, 2.00000), (3.00000, -5.00000, 2.00000), (6.00000, -5.00000, 2.00000), (9.00000, -5.00000, 2.00000), (12.00000, -5.00000, 2.00000), (-12.00000, -3.33333, 2.00000), (-9.00000, -3.33333, 2.00000), (-6.00000, -3.33333, 2.00000), (-3.00000, -3.33333, 2.00000), (0.00000, -3.33333, 2.00000), (3.00000, -3.33333, 2.00000), (6.00000, -3.33333, 2.00000), (9.00000, -3.33333, 2.00000), (12.00000, -3.33333, 2.00000), (-12.00000, -1.66667, 2.00000), (-9.00000, -1.66667, 2.00000), (-6.00000, -1.66667, 2.00000), (-3.00000, -1.66667, 2.00000), (0.00000, -1.66667, 2.00000), (3.00000, -1.66667, 2.00000), (6.00000, -1.66667, 2.00000), (9.00000, -1.66667, 2.00000), (12.00000, -1.66667, 2.00000), (-12.00000, 0.00000, 2.00000), (-9.00000, 0.00000, 2.00000), (-6.00000, 0.00000, 2.00000), (-3.00000, 0.00000, 2.00000), (0.00000, 0.00000, 2.00000), (3.00000, 0.00000, 2.00000), (6.00000, 0.00000, 2.00000), (9.00000, 0.00000, 2.00000), (12.00000, 0.00000, 2.00000), (-12.00000, 1.66667, 2.00000), (-9.00000, 1.66667, 2.00000), (-6.00000, 1.66667, 2.00000), (-3.00000, 1.66667, 2.00000), (0.00000, 1.66667, 2.00000), (3.00000, 1.66667, 2.00000), (6.00000, 1.66667, 2.00000), (9.00000, 1.66667, 2.00000), (12.00000, 1.66667, 2.00000), (-12.00000, 3.33333, 2.00000), (-9.00000, 3.33333, 2.00000), (-6.00000, 3.33333, 2.00000), (-3.00000, 3.33333, 2.00000), (0.00000, 3.33333, 2.00000), (3.00000, 3.33333, 2.00000), (6.00000, 3.33333, 2.00000), (9.00000, 3.33333, 2.00000), (12.00000, 3.33333, 2.00000), (-12.00000, 5.00000, 2.00000), (-9.00000, 5.00000, 2.00000), (-6.00000, 5.00000, 2.00000), (-3.00000, 5.00000, 2.00000), (0.00000, 5.00000, 2.00000), (3.00000, 5.00000, 2.00000), (6.00000, 5.00000, 2.00000), (9.00000, 5.00000, 2.00000), (12.00000, 5.00000, 2.00000), (-12.00000, 6.66667, 2.00000), (-9.00000, 6.66667, 2.00000), (-6.00000, 6.66667, 2.00000), (-3.00000, 6.66667, 2.00000), (0.00000, 6.66667, 2.00000), (3.00000, 6.66667, 2.00000), (6.00000, 6.66667, 2.00000), (9.00000, 6.66667, 2.00000), (12.00000, 6.66667, 2.00000), (-12.00000, 8.33333, 2.00000), (-9.00000, 8.33333, 2.00000), (-6.00000, 8.33333, 2.00000), (-3.00000, 8.33333, 2.00000), (0.00000, 8.33333, 2.00000), (3.00000, 8.33333, 2.00000), (6.00000, 8.33333, 2.00000), (9.00000, 8.33333, 2.00000), (12.00000, 8.33333, 2.00000), (-12.00000, 10.00000, 2.00000), (-9.00000, 10.00000, 2.00000), (-6.00000, 10.00000, 2.00000), (-3.00000, 10.00000, 2.00000), (0.00000, 10.00000, 2.00000), (3.00000, 10.00000, 2.00000), (6.00000, 10.00000, 2.00000), (9.00000, 10.00000, 2.00000), (12.00000, 10.00000, 2.00000)]
+[role]
+	point

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/cube_backnurbsCubeShape1_topology_fresh.txt

@@ -0,0 +1,6 @@
+[faceVertexCounts]
+	[3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3]
+[faceVertexIndices]
+	[0, 1, 6, 6, 5, 0, 1, 2, 7, 7, 6, 1, 2, 3, 8, 8, 7, 2, 3, 4, 9, 9, 8, 3, 5, 6, 11, 11, 10, 5, 6, 7, 12, 12, 11, 6, 7, 8, 13, 13, 12, 7, 8, 9, 14, 14, 13, 8, 10, 11, 16, 16, 15, 10, 11, 12, 17, 17, 16, 11, 12, 13, 18, 18, 17, 12, 13, 14, 19, 19, 18, 13, 15, 16, 21, 21, 20, 15, 16, 17, 22, 22, 21, 16, 17, 18, 23, 23, 22, 17, 18, 19, 24, 24, 23, 18]
+[orientation]
+	rightHanded

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/cube_backnurbsCubeShape1_topology_modified.txt

@@ -0,0 +1,6 @@
+[faceVertexCounts]
+	[3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3]
+[faceVertexIndices]
+	[0, 1, 10, 10, 9, 0, 1, 2, 11, 11, 10, 1, 2, 3, 12, 12, 11, 2, 3, 4, 13, 13, 12, 3, 4, 5, 14, 14, 13, 4, 5, 6, 15, 15, 14, 5, 6, 7, 16, 16, 15, 6, 7, 8, 17, 17, 16, 7, 9, 10, 19, 19, 18, 9, 10, 11, 20, 20, 19, 10, 11, 12, 21, 21, 20, 11, 12, 13, 22, 22, 21, 12, 13, 14, 23, 23, 22, 13, 14, 15, 24, 24, 23, 14, 15, 16, 25, 25, 24, 15, 16, 17, 26, 26, 25, 16, 18, 19, 28, 28, 27, 18, 19, 20, 29, 29, 28, 19, 20, 21, 30, 30, 29, 20, 21, 22, 31, 31, 30, 21, 22, 23, 32, 32, 31, 22, 23, 24, 33, 33, 32, 23, 24, 25, 34, 34, 33, 24, 25, 26, 35, 35, 34, 25, 27, 28, 37, 37, 36, 27, 28, 29, 38, 38, 37, 28, 29, 30, 39, 39, 38, 29, 30, 31, 40, 40, 39, 30, 31, 32, 41, 41, 40, 31, 32, 33, 42, 42, 41, 32, 33, 34, 43, 43, 42, 33, 34, 35, 44, 44, 43, 34, 36, 37, 46, 46, 45, 36, 37, 38, 47, 47, 46, 37, 38, 39, 48, 48, 47, 38, 39, 40, 49, 49, 48, 39, 40, 41, 50, 50, 49, 40, 41, 42, 51, 51, 50, 41, 42, 43, 52, 52, 51, 42, 43, 44, 53, 53, 52, 43, 45, 46, 55, 55, 54, 45, 46, 47, 56, 56, 55, 46, 47, 48, 57, 57, 56, 47, 48, 49, 58, 58, 57, 48, 49, 50, 59, 59, 58, 49, 50, 51, 60, 60, 59, 50, 51, 52, 61, 61, 60, 51, 52, 53, 62, 62, 61, 52, 54, 55, 64, 64, 63, 54, 55, 56, 65, 65, 64, 55, 56, 57, 66, 66, 65, 56, 57, 58, 67, 67, 66, 57, 58, 59, 68, 68, 67, 58, 59, 60, 69, 69, 68, 59, 60, 61, 70, 70, 69, 60, 61, 62, 71, 71, 70, 61, 63, 64, 73, 73, 72, 63, 64, 65, 74, 74, 73, 64, 65, 66, 75, 75, 74, 65, 66, 67, 76, 76, 75, 66, 67, 68, 77, 77, 76, 67, 68, 69, 78, 78, 77, 68, 69, 70, 79, 79, 78, 69, 70, 71, 80, 80, 79, 70, 72, 73, 82, 82, 81, 72, 73, 74, 83, 83, 82, 73, 74, 75, 84, 84, 83, 74, 75, 76, 85, 85, 84, 75, 76, 77, 86, 86, 85, 76, 77, 78, 87, 87, 86, 77, 78, 79, 88, 88, 87, 78, 79, 80, 89, 89, 88, 79, 81, 82, 91, 91, 90, 81, 82, 83, 92, 92, 91, 82, 83, 84, 93, 93, 92, 83, 84, 85, 94, 94, 93, 84, 85, 86, 95, 95, 94, 85, 86, 87, 96, 96, 95, 86, 87, 88, 97, 97, 96, 87, 88, 89, 98, 98, 97, 88, 90, 91, 100, 100, 99, 90, 91, 92, 101, 101, 100, 91, 92, 93, 102, 102, 101, 92, 93, 94, 103, 103, 102, 93, 94, 95, 104, 104, 103, 94, 95, 96, 105, 105, 104, 95, 96, 97, 106, 106, 105, 96, 97, 98, 107, 107, 106, 97, 99, 100, 109, 109, 108, 99, 100, 101, 110, 110, 109, 100, 101, 102, 111, 111, 110, 101, 102, 103, 112, 112, 111, 102, 103, 104, 113, 113, 112, 103, 104, 105, 114, 114, 113, 104, 105, 106, 115, 115, 114, 105, 106, 107, 116, 116, 115, 106]
+[orientation]
+	rightHanded

test/lib/mayaUsd/render/mayaToHydra/cpp/NurbsSurfacesTest/cube_bottomnurbsCubeShape1_points_fresh.txt

@@ -0,0 +1,6 @@
+[interpolation]
+	vertex
+[primvarValue]
+	[(-0.50000, -0.50000, 0.50000), (-0.50000, -0.25000, 0.50000), (-0.50000, 0.00000, 0.50000), (-0.50000, 0.25000, 0.50000), (-0.50000, 0.50000, 0.50000), (-0.50000, -0.50000, 0.25000), (-0.50000, -0.25000, 0.25000), (-0.50000, 0.00000, 0.25000), (-0.50000, 0.25000, 0.25000), (-0.50000, 0.50000, 0.25000), (-0.50000, -0.50000, 0.00000), (-0.50000, -0.25000, 0.00000), (-0.50000, 0.00000, 0.00000), (-0.50000, 0.25000, 0.00000), (-0.50000, 0.50000, 0.00000), (-0.50000, -0.50000, -0.25000), (-0.50000, -0.25000, -0.25000), (-0.50000, 0.00000, -0.25000), (-0.50000, 0.25000, -0.25000), (-0.50000, 0.50000, -0.25000), (-0.50000, -0.50000, -0.50000), (-0.50000, -0.25000, -0.50000), (-0.50000, 0.00000, -0.50000), (-0.50000, 0.25000, -0.50000), (-0.50000, 0.50000, -0.50000)]
+[role]
+	point