Merge pull request #1028 from dgovil/resolve_final_filename_issue972

Fix texture writer path resolver to work relative to final export path
Autodesk · Jan 6, 2021 · d379bfc · d379bfc
2 parents 4ab1eb7 + ab1aece
commit d379bfc
Show file tree

Hide file tree

Showing 7 changed files with 396 additions and 15 deletions.
diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.cpp b/lib/mayaUsd/fileio/jobs/jobArgs.cpp
@@ -32,6 +32,7 @@
 #include <pxr/usdImaging/usdImaging/tokens.h>
 
 #include <maya/MDagPath.h>
+#include <maya/MFileObject.h>
 #include <maya/MGlobal.h>
 #include <maya/MNodeClass.h>
 #include <maya/MTypeId.h>
@@ -321,6 +322,7 @@ UsdMayaJobExportArgs::UsdMayaJobExportArgs(
           UsdMayaJobExportArgsTokens->none,
           { UsdMayaJobExportArgsTokens->auto_, UsdMayaJobExportArgsTokens->explicit_ }))
     , exportVisibility(_Boolean(userArgs, UsdMayaJobExportArgsTokens->exportVisibility))
+    , file(_String(userArgs, UsdMayaJobExportArgsTokens->file))
     , materialCollectionsPath(
           _AbsolutePath(userArgs, UsdMayaJobExportArgsTokens->materialCollectionsPath))
     , materialsScopeName(
@@ -387,6 +389,7 @@ std::ostream& operator<<(std::ostream& out, const UsdMayaJobExportArgs& exportAr
         << "exportSkels: " << TfStringify(exportArgs.exportSkels) << std::endl
         << "exportSkin: " << TfStringify(exportArgs.exportSkin) << std::endl
         << "exportVisibility: " << TfStringify(exportArgs.exportVisibility) << std::endl
+        << "file: " << exportArgs.file << std::endl
         << "materialCollectionsPath: " << exportArgs.materialCollectionsPath << std::endl
         << "materialsScopeName: " << exportArgs.materialsScopeName << std::endl
         << "mergeTransformAndShape: " << TfStringify(exportArgs.mergeTransformAndShape) << std::endl
@@ -470,6 +473,7 @@ const VtDictionary& UsdMayaJobExportArgs::GetDefaultDictionary()
         d[UsdMayaJobExportArgsTokens->exportSkels] = UsdMayaJobExportArgsTokens->none.GetString();
         d[UsdMayaJobExportArgsTokens->exportUVs] = true;
         d[UsdMayaJobExportArgsTokens->exportVisibility] = true;
+        d[UsdMayaJobExportArgsTokens->file] = std::string();
         d[UsdMayaJobExportArgsTokens->kind] = std::string();
         d[UsdMayaJobExportArgsTokens->materialCollectionsPath] = std::string();
         d[UsdMayaJobExportArgsTokens->materialsScopeName]
@@ -541,6 +545,22 @@ void UsdMayaJobExportArgs::AddFilteredTypeName(const MString& typeName)
     }
 }
 
+std::string UsdMayaJobExportArgs::GetResolvedFileName() const
+{
+    MFileObject fileObj;
+    fileObj.setRawFullName(file.c_str());
+
+    // Make sure it's an absolute path
+    fileObj.setRawFullName(fileObj.resolvedFullName());
+    const std::string resolvedFileName = fileObj.resolvedFullName().asChar();
+
+    if (!resolvedFileName.empty()) {
+        return resolvedFileName;
+    }
+
+    return file;
+}
+
 UsdMayaJobImportArgs::UsdMayaJobImportArgs(
     const VtDictionary& userArgs,
     const bool          importWithProxyShapes,

diff --git a/lib/mayaUsd/fileio/jobs/jobArgs.h b/lib/mayaUsd/fileio/jobs/jobArgs.h
@@ -70,6 +70,7 @@ TF_DECLARE_PUBLIC_TOKENS(
     (exportSkin) \
     (exportUVs) \
     (exportVisibility) \
+    (file) \
     (kind) \
     (materialCollectionsPath) \
     (materialsScopeName) \
@@ -141,19 +142,20 @@ struct UsdMayaJobExportArgs
     /// material-collections are created and bindings are made to the
     /// collections at \p materialCollectionsPath, instead of direct
     /// per-gprim bindings.
-    const bool    exportCollectionBasedBindings;
-    const bool    exportColorSets;
-    const bool    exportDefaultCameras;
-    const bool    exportDisplayColor;
-    const bool    exportInstances;
-    const bool    exportMaterialCollections;
-    const bool    exportMeshUVs;
-    const bool    exportNurbsExplicitUV;
-    const bool    exportReferenceObjects;
-    const bool    exportRefsAsInstanceable;
-    const TfToken exportSkels;
-    const TfToken exportSkin;
-    const bool    exportVisibility;
+    const bool        exportCollectionBasedBindings;
+    const bool        exportColorSets;
+    const bool        exportDefaultCameras;
+    const bool        exportDisplayColor;
+    const bool        exportInstances;
+    const bool        exportMaterialCollections;
+    const bool        exportMeshUVs;
+    const bool        exportNurbsExplicitUV;
+    const bool        exportReferenceObjects;
+    const bool        exportRefsAsInstanceable;
+    const TfToken     exportSkels;
+    const TfToken     exportSkin;
+    const bool        exportVisibility;
+    const std::string file;
 
     /// If this is not empty, then a set of collections are exported on the
     /// prim pointed to by the path, each representing the collection of
@@ -223,6 +225,10 @@ struct UsdMayaJobExportArgs
     MAYAUSD_CORE_PUBLIC
     void AddFilteredTypeName(const MString& typeName);
 
+    /// Returns the resolved file name of the final export location
+    MAYAUSD_CORE_PUBLIC
+    std::string GetResolvedFileName() const;
+
     const std::set<unsigned int>& GetFilteredTypeIds() const { return _filteredTypeIds; }
 
     void ClearFilteredTypeIds() { _filteredTypeIds.clear(); }

diff --git a/lib/usd/translators/shading/usdFileTextureWriter.cpp b/lib/usd/translators/shading/usdFileTextureWriter.cpp
@@ -279,8 +279,11 @@ void PxrUsdTranslators_FileTextureWriter::Write(const UsdTimeCode& usdTime)
     //          minimal interop. It will be replaced by proper use of Maya and
     //          USD asset resolvers. For package files, the exporter needs full
     //          paths.
-    const std::string& fileName = GetUsdStage()->GetRootLayer()->GetRealPath();
-    TfToken            fileExt(TfGetExtension(fileName));
+
+    // We use the ExportArgs fileName here instead of the USD root layer path
+    // to make sure that we are basing logic of the final export location
+    const std::string fileName = _GetExportArgs().GetResolvedFileName();
+    TfToken           fileExt(TfGetExtension(fileName));
     if (fileExt != UsdMayaTranslatorTokens->UsdFileExtensionPackage) {
         boost::filesystem::path usdDir(fileName);
         usdDir = usdDir.parent_path();

diff --git a/test/lib/usd/translators/CMakeLists.txt b/test/lib/usd/translators/CMakeLists.txt
@@ -22,6 +22,7 @@ set(TEST_SCRIPT_FILES
     testUsdExportNurbsCurve.py
     testUsdExportOpenLayer.py
     testUsdExportOverImport.py
+    testUsdExportPackage.py
     testUsdExportParentScope.py
     # To investigate: following test asserts in MFnParticleSystem, but passes.
     # PPT, 17-Jun-20.