Pixar Mesh write translator/utilities refactoring

lib/mayaUsd/fileio/primUpdater.cpp

@@ -22,56 +22,13 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-static
-MDagPath
-_GetDagPath(const MFnDependencyNode& depNodeFn, const bool reportError = true)
-{
-    try {
-        const MFnDagNode& dagNodeFn =
-            dynamic_cast<const MFnDagNode&>(depNodeFn);
-
-        MStatus status;
-        const MDagPath dagPath = dagNodeFn.dagPath(&status);
-        if (status == MS::kSuccess) {
-            const bool dagPathIsValid = dagPath.isValid(&status);
-            if (status == MS::kSuccess && dagPathIsValid) {
-                return dagPath;
-            }
-        }
-
-        if (reportError) {
-            TF_CODING_ERROR(
-                "Invalid MDagPath for MFnDagNode '%s'. Verify that it was "
-                "constructed using an MDagPath.",
-                dagNodeFn.fullPathName().asChar());
-        }
-    }
-    catch (const std::bad_cast& /* e */) {
-        // This is not a DAG node, so it can't have a DAG path.
-    }
-
-    return MDagPath();
-}
-
-static
-UsdMayaUtil::MDagPathMap<SdfPath>
-_GetDagPathMap(const MFnDependencyNode& depNodeFn, const SdfPath& usdPath)
-{
-    const MDagPath dagPath = _GetDagPath(depNodeFn, /* reportError = */ false);
-    if (dagPath.isValid()) {
-        return UsdMayaUtil::MDagPathMap<SdfPath>({ {dagPath, usdPath} });
-    }
-
-    return UsdMayaUtil::MDagPathMap<SdfPath>({});
-}
-
 UsdMayaPrimUpdater::UsdMayaPrimUpdater(
     const MFnDependencyNode& depNodeFn,
     const SdfPath& usdPath) :
-    _dagPath(_GetDagPath(depNodeFn)),
+    _dagPath(UsdMayaUtil::getDagPath(depNodeFn)),
     _mayaObject(depNodeFn.object()),
     _usdPath(usdPath),
-    _baseDagToUsdPaths(_GetDagPathMap(depNodeFn, usdPath))
+    _baseDagToUsdPaths(UsdMayaUtil::getDagPathMap(depNodeFn, usdPath))
 {
 }
 

lib/mayaUsd/fileio/primWriter.cpp

@@ -58,50 +58,6 @@ TF_DEFINE_PRIVATE_TOKENS(
     (USD_inheritClassNames)
 );
 
-
-static
-MDagPath
-_GetDagPath(const MFnDependencyNode& depNodeFn, const bool reportError = true)
-{
-    try {
-        const MFnDagNode& dagNodeFn =
-            dynamic_cast<const MFnDagNode&>(depNodeFn);
-
-        MStatus status;
-        const MDagPath dagPath = dagNodeFn.dagPath(&status);
-        if (status == MS::kSuccess) {
-            const bool dagPathIsValid = dagPath.isValid(&status);
-            if (status == MS::kSuccess && dagPathIsValid) {
-                return dagPath;
-            }
-        }
-
-        if (reportError) {
-            TF_CODING_ERROR(
-                "Invalid MDagPath for MFnDagNode '%s'. Verify that it was "
-                "constructed using an MDagPath.",
-                dagNodeFn.fullPathName().asChar());
-        }
-    }
-    catch (const std::bad_cast& /* e */) {
-        // This is not a DAG node, so it can't have a DAG path.
-    }
-
-    return MDagPath();
-}
-
-static
-UsdMayaUtil::MDagPathMap<SdfPath>
-_GetDagPathMap(const MFnDependencyNode& depNodeFn, const SdfPath& usdPath)
-{
-    const MDagPath dagPath = _GetDagPath(depNodeFn, /* reportError = */ false);
-    if (dagPath.isValid()) {
-        return UsdMayaUtil::MDagPathMap<SdfPath>({{dagPath, usdPath}});
-    }
-
-    return UsdMayaUtil::MDagPathMap<SdfPath>({});
-}
-
 static
 bool
 _IsAnimated(const UsdMayaJobExportArgs& args, const MObject& obj)
@@ -118,10 +74,10 @@ UsdMayaPrimWriter::UsdMayaPrimWriter(
         const SdfPath& usdPath,
         UsdMayaWriteJobContext& jobCtx) :
     _writeJobCtx(jobCtx),
-    _dagPath(_GetDagPath(depNodeFn)),
+    _dagPath(UsdMayaUtil::getDagPath(depNodeFn)),
     _mayaObject(depNodeFn.object()),
     _usdPath(usdPath),
-    _baseDagToUsdPaths(_GetDagPathMap(depNodeFn, usdPath)),
+    _baseDagToUsdPaths(UsdMayaUtil::getDagPathMap(depNodeFn, usdPath)),
     _exportVisibility(jobCtx.GetArgs().exportVisibility),
     _hasAnimCurves(_IsAnimated(jobCtx.GetArgs(), depNodeFn.object()))
 {
@@ -219,10 +175,10 @@ UsdMayaPrimWriter::Write(const UsdTimeCode& usdTime)
                     UsdGeomTokens->inherited :
                     UsdGeomTokens->invisible);
 
-            _SetAttribute(
-                imageable.CreateVisibilityAttr(VtValue(), true),
-                visibilityTok,
-                usdTime);
+            UsdMayaWriteUtil::SetAttribute(imageable.CreateVisibilityAttr(VtValue(), true),
+                                           visibilityTok,
+                                           usdTime,
+                                           _GetSparseValueWriter());
         }
     }
 

lib/mayaUsd/fileio/primWriter.h

@@ -171,32 +171,6 @@ class UsdMayaPrimWriter
     MAYAUSD_CORE_PUBLIC
     const UsdMayaJobExportArgs& _GetExportArgs() const;
 
-    /// Sets the value of \p attr to \p value at \p time with value
-    /// compression. When this method is used to write attribute values,
-    /// any redundant authoring of the default value or of time-samples
-    /// are avoided (by using the utility class UsdUtilsSparseValueWriter).
-    template <typename T>
-    bool _SetAttribute(
-            const UsdAttribute& attr,
-            const T& value,
-            const UsdTimeCode time = UsdTimeCode::Default()) {
-        VtValue val(value);
-        return _valueWriter.SetAttribute(attr, &val, time);
-    }
-
-    /// \overload
-    /// This overload takes the value by pointer and hence avoids a copy
-    /// of the value.
-    /// However, it swaps out the value held in \p value for efficiency,
-    /// leaving it in default-constructed state (value-initialized).
-    template <typename T>
-    bool _SetAttribute(
-            const UsdAttribute& attr,
-            T* value,
-            const UsdTimeCode time = UsdTimeCode::Default()) {
-        return _valueWriter.SetAttribute(attr, VtValue::Take(*value), time);
-    }
-
     /// Get the attribute value-writer object to be used when writing
     /// attributes. Access to this is provided so that attribute authoring
     /// happening inside non-member functions can make use of it.

lib/mayaUsd/fileio/translators/translatorMesh.cpp

@@ -38,7 +38,8 @@
 #include <maya/MPointArray.h>
 #include <maya/MString.h>
 
-#include <mayaUsd/fileio/utils/meshUtil.h>
+#include <mayaUsd/fileio/utils/meshReadUtils.h>
+#include <mayaUsd/fileio/utils/meshWriteUtils.h>
 #include <mayaUsd/fileio/utils/readUtil.h>
 #include <mayaUsd/nodes/pointBasedDeformerNode.h>
 #include <mayaUsd/nodes/stageNode.h>
@@ -211,11 +212,11 @@ TranslatorMeshRead::TranslatorMeshRead(const UsdGeomMesh& mesh,
     if (mesh.GetSubdivisionSchemeAttr().Get(&subdScheme) && subdScheme == UsdGeomTokens->none) {
          if (normals.size() == static_cast<size_t>(meshFn.numFaceVertices()) &&
                  mesh.GetNormalsInterpolation() == UsdGeomTokens->faceVarying) {
-             UsdMayaMeshUtil::SetEmitNormalsTag(meshFn, true);
+             UsdMayaMeshReadUtils::setEmitNormalsTag(meshFn, true);
          }
     } 
     else {
-        stat = UsdMayaMeshUtil::assignSubDivTagsToMesh(mesh, m_meshObj, meshFn);
+        stat = UsdMayaMeshReadUtils::assignSubDivTagsToMesh(mesh, m_meshObj, meshFn);
     }
 
     // Copy UsdGeomMesh schema attrs into Maya if they're authored.
@@ -485,6 +486,33 @@ TranslatorMeshRead::shapePath() const
     return m_shapePath;
 }
 
+TranslatorMeshWrite::TranslatorMeshWrite(const MFnDependencyNode& depNodeFn,
+                                         const UsdStageRefPtr& stage,
+                                         const SdfPath& usdPath,
+                                         const MDagPath& dagPath)
+{
+    if (!TF_VERIFY(dagPath.isValid())) {
+        return;
+    }
+
+    if (!UsdMayaMeshWriteUtils::isMeshValid(dagPath)) {
+        return;
+    }
+
+    m_usdMesh = UsdGeomMesh::Define(stage, usdPath);
+    if (!TF_VERIFY(
+            m_usdMesh,
+            "Could not define UsdGeomMesh at path '%s'\n",
+            usdPath.GetText())) {
+        return;
+    }
+}
+
+UsdGeomMesh 
+TranslatorMeshWrite::usdMesh() const
+{
+    return m_usdMesh;
+}
 
 } // namespace MayaUsd
 

lib/mayaUsd/fileio/translators/translatorMesh.h

@@ -74,4 +74,25 @@ class MAYAUSD_CORE_PUBLIC TranslatorMeshRead
     SdfPath m_shapePath;
 };
 
+class MAYAUSD_CORE_PUBLIC TranslatorMeshWrite
+{
+public:
+    TranslatorMeshWrite(const MFnDependencyNode&,
+                        const UsdStageRefPtr&,
+                        const SdfPath&,
+                        const MDagPath&);
+
+    ~TranslatorMeshWrite() = default;
+
+    TranslatorMeshWrite(const TranslatorMeshWrite&) = delete;
+    TranslatorMeshWrite& operator=(const TranslatorMeshWrite&) = delete;
+    TranslatorMeshWrite(TranslatorMeshWrite&&) = delete;
+    TranslatorMeshWrite& operator=(TranslatorMeshWrite&&) = delete;
+
+    UsdGeomMesh usdMesh() const;
+
+private:
+    UsdGeomMesh m_usdMesh;
+};
+
 } // namespace MayaUsd

lib/mayaUsd/fileio/utils/CMakeLists.txt

@@ -4,7 +4,9 @@
 target_sources(${PROJECT_NAME} 
     PRIVATE
         adaptor.cpp
-        meshUtil.cpp
+        jointWriteUtils.cpp
+        meshReadUtils.cpp
+        meshWriteUtils.cpp
         readUtil.cpp
         roundTripUtil.cpp
         shadingUtil.cpp
@@ -15,7 +17,9 @@ target_sources(${PROJECT_NAME}
 
 set(headers
     adaptor.h
-    meshUtil.h
+    jointWriteUtils.h
+    meshReadUtils.h
+    meshWriteUtils.h
     readUtil.h
     roundTripUtil.h
     shadingUtil.h