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()))
 {

lib/mayaUsd/fileio/writeJobContext.cpp

@@ -476,16 +476,10 @@ UsdMayaWriteJobContext::CreatePrimWriter(
     SdfPath writePath = usdPath;
 
     try {
-        const MFnDagNode& dagNodeFn =
-            dynamic_cast<const MFnDagNode&>(depNodeFn);
+        const MDagPath dagPath =
+            UsdMayaUtil::getDagPath(depNodeFn, /* reportError = */ false);
 
-        MStatus status;
-        const MDagPath dagPath = dagNodeFn.dagPath(&status);
-        if (status != MS::kSuccess || !dagPath.isValid()) {
-            TF_CODING_ERROR(
-                "Invalid MDagPath for MFnDagNode '%s'. Verify that it was "
-                "constructed using an MDagPath.",
-                dagNodeFn.fullPathName().asChar());
+        if (!dagPath.isValid()) {
             return nullptr;
         }
 
@@ -498,6 +492,7 @@ UsdMayaWriteJobContext::CreatePrimWriter(
             writePath = ConvertDagToUsdPath(dagPath);
         }
 
+        const MFnDagNode dagNodeFn(dagPath);
         const bool instanced = dagNodeFn.isInstanced(/* indirect = */ false);
         if (mArgs.exportInstances && instanced && !forceUninstance) {
             // Deal with instances -- we use a special internal writer for them.

lib/mayaUsd/utils/util.cpp

@@ -2029,3 +2029,44 @@ UsdMayaUtil::convert(const std::string& str)
 {
     return MString(str.data(), static_cast<int>(str.size()));
 }
+
+MDagPath 
+UsdMayaUtil::getDagPath(const MFnDependencyNode& depNodeFn, const bool reportError)
+{
+    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();
+}
+
+UsdMayaUtil::MDagPathMap<SdfPath> 
+UsdMayaUtil::getDagPathMap(const MFnDependencyNode& depNodeFn, const SdfPath& usdPath)
+{
+    const MDagPath dagPath = UsdMayaUtil::getDagPath(depNodeFn, /* reportError = */ false);
+    if (dagPath.isValid()) {
+        return UsdMayaUtil::MDagPathMap<SdfPath>({{dagPath, usdPath}});
+    }
+
+    return UsdMayaUtil::MDagPathMap<SdfPath>({});
+}

lib/mayaUsd/utils/util.h

@@ -556,10 +556,14 @@ MString convert(const TfToken& token);
 MAYAUSD_CORE_PUBLIC
 std::string convert(const MString&);
 
-} // namespace UsdMayaUtil
+MAYAUSD_CORE_PUBLIC
+MDagPath getDagPath(const MFnDependencyNode& depNodeFn, const bool reportError = true);
+
+MAYAUSD_CORE_PUBLIC
+MDagPathMap<SdfPath> getDagPathMap(const MFnDependencyNode& depNodeFn, const SdfPath& usdPath);
 
+} // namespace UsdMayaUtil
 
 PXR_NAMESPACE_CLOSE_SCOPE
 
-
 #endif