Tremblp/maya 112824/pull push 01 to dev

lib/mayaUsd/commands/baseExportCommand.cpp

@@ -319,8 +319,7 @@ MStatus MayaUSDExportCommand::doIt(const MArgList& args)
             std::string rootPath = tmpArgList.asString(0).asChar();
 
             if (!rootPath.empty()) {
-                MDagPath rootDagPath;
-                UsdMayaUtil::GetDagPathByName(rootPath, rootDagPath);
+                MDagPath rootDagPath = UsdMayaUtil::nameToDagPath(rootPath);
                 if (!rootDagPath.isValid()) {
                     MGlobal::displayError(
                         MString("Invalid dag path provided for exportRoot: ")

lib/mayaUsd/fileio/CMakeLists.txt

@@ -12,9 +12,6 @@ target_sources(${PROJECT_NAME}
         primReaderArgs.cpp
         primReaderContext.cpp
         primReaderRegistry.cpp
-        primUpdater.cpp
-        primUpdaterContext.cpp
-        primUpdaterRegistry.cpp
         primWriter.cpp
         primWriterArgs.cpp
         primWriterContext.cpp
@@ -28,6 +25,19 @@ target_sources(${PROJECT_NAME}
         writeJobContext.cpp
 )
 
+# Edit as Maya requires UFE path mapping.
+if(CMAKE_UFE_V3_FEATURES_AVAILABLE)
+    target_sources(${PROJECT_NAME}
+        PRIVATE
+            fallbackPrimUpdater.cpp
+            primUpdater.cpp
+            primUpdaterArgs.cpp
+            primUpdaterContext.cpp
+            primUpdaterRegistry.cpp
+            primUpdaterManager.cpp
+    )
+endif()
+
 set(HEADERS
     fallbackPrimReader.h
     functorPrimReader.h
@@ -38,9 +48,6 @@ set(HEADERS
     primReaderArgs.h
     primReaderContext.h
     primReaderRegistry.h
-    primUpdater.h
-    primUpdaterContext.h
-    primUpdaterRegistry.h
     primWriter.h
     primWriterArgs.h
     primWriterContext.h
@@ -54,6 +61,17 @@ set(HEADERS
     writeJobContext.h
 )
 
+if(CMAKE_UFE_V3_FEATURES_AVAILABLE)
+    list(APPEND HEADERS
+        fallbackPrimUpdater.h
+        primUpdater.h
+        primUpdaterArgs.h
+        primUpdaterContext.h
+        primUpdaterRegistry.h
+        primUpdaterManager.h
+    )
+endif()
+
 # -----------------------------------------------------------------------------
 # promoted headers
 # -----------------------------------------------------------------------------

lib/mayaUsd/fileio/fallbackPrimUpdater.cpp

@@ -0,0 +1,25 @@
+//
+// Copyright 2021 Autodesk
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#include "fallbackPrimUpdater.h"
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+FallbackPrimUpdater::FallbackPrimUpdater(const MFnDependencyNode& depNodeFn, const Ufe::Path& path)
+    : UsdMayaPrimUpdater(depNodeFn, path)
+{
+}
+
+PXR_NAMESPACE_CLOSE_SCOPE

lib/mayaUsd/fileio/fallbackPrimUpdater.h

@@ -0,0 +1,42 @@
+//
+// Copyright 2021 Autodesk
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#ifndef PXRUSDMAYA_FALLBACK_PRIMUPDATER_H
+#define PXRUSDMAYA_FALLBACK_PRIMUPDATER_H
+
+#include <mayaUsd/base/api.h>
+#include <mayaUsd/fileio/primUpdater.h>
+
+PXR_NAMESPACE_OPEN_SCOPE
+
+class FallbackPrimUpdater : public UsdMayaPrimUpdater
+{
+public:
+    MAYAUSD_CORE_PUBLIC
+    FallbackPrimUpdater(const MFnDependencyNode& depNodeFn, const Ufe::Path& path);
+
+    // clang errors if you use "= default" here, due to const SdfPath member
+    //    see: http://open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#253
+    // ...which it seems clang only implements if using newer version + cpp std
+    FallbackPrimUpdater() { }
+
+    virtual ~FallbackPrimUpdater() = default;
+
+private:
+};
+
+PXR_NAMESPACE_CLOSE_SCOPE
+
+#endif

lib/mayaUsd/fileio/jobs/jobArgs.cpp

@@ -309,8 +309,7 @@ static PcpMapFunction::PathMap _ExportRootsMap(
     const std::vector<std::string> exportRoots = _Vector<std::string>(userArgs, key);
     for (const std::string& rootPath : exportRoots) {
         if (!rootPath.empty()) {
-            MDagPath rootDagPath;
-            UsdMayaUtil::GetDagPathByName(rootPath, rootDagPath);
+            MDagPath rootDagPath = UsdMayaUtil::nameToDagPath(rootPath);
             addExportRootPathPairFn(rootDagPath);
         } else {
             includeEntireSelection = true;

lib/mayaUsd/fileio/jobs/readJob.cpp

@@ -589,6 +589,11 @@ const MDagPath& UsdMaya_ReadJob::GetMayaRootDagPath() const { return mMayaRootDa
 
 double UsdMaya_ReadJob::timeSampleMultiplier() const { return mTimeSampleMultiplier; }
 
+const UsdMayaPrimReaderContext::ObjectRegistry& UsdMaya_ReadJob::GetNewNodeRegistry() const
+{
+    return mNewNodeRegistry;
+}
+
 double UsdMaya_ReadJob::_setTimeSampleMultiplierFrom(const double layerFPS)
 {
     double sceneFPS = UsdMayaUtil::GetSceneMTimeUnitAsDouble();

lib/mayaUsd/fileio/jobs/readJob.h

@@ -69,6 +69,9 @@ class UsdMaya_ReadJob
     MAYAUSD_CORE_PUBLIC
     double timeSampleMultiplier() const;
 
+    MAYAUSD_CORE_PUBLIC
+    const UsdMayaPrimReaderContext::ObjectRegistry& GetNewNodeRegistry() const;
+
 protected:
     // Types
     using _PrimReaderMap = std::unordered_map<SdfPath, UsdMayaPrimReaderSharedPtr, SdfPath::Hash>;

lib/mayaUsd/fileio/jobs/writeJob.cpp

@@ -78,6 +78,14 @@ UsdMaya_WriteJob::UsdMaya_WriteJob(const UsdMayaJobExportArgs& iArgs)
 
 UsdMaya_WriteJob::~UsdMaya_WriteJob() { }
 
+SdfPath UsdMaya_WriteJob::MapDagPathToSdfPath(const MDagPath& dagPath) const
+{
+    SdfPath usdPrimPath;
+    TfMapLookup(mDagPathToUsdPathMap, dagPath, &usdPrimPath);
+
+    return usdPrimPath;
+}
+
 /// Generates a name for a temporary usdc file in \p dir.
 /// Unless you are very, very unlucky, the stage name is unique because it's
 /// generated from a UUID.
@@ -819,4 +827,9 @@ bool UsdMaya_WriteJob::_CheckNameClashes(const SdfPath& path, const MDagPath& da
     return true;
 }
 
+const UsdMayaUtil::MDagPathMap<SdfPath>& UsdMaya_WriteJob::GetDagPathToUsdPathMap() const
+{
+    return mDagPathToUsdPathMap;
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE

lib/mayaUsd/fileio/jobs/writeJob.h

@@ -49,6 +49,12 @@ class UsdMaya_WriteJob
     MAYAUSD_CORE_PUBLIC
     bool Write(const std::string& fileName, bool append);
 
+    MAYAUSD_CORE_PUBLIC
+    SdfPath MapDagPathToSdfPath(const MDagPath& dagPath) const;
+
+    MAYAUSD_CORE_PUBLIC
+    const UsdMayaUtil::MDagPathMap<SdfPath>& GetDagPathToUsdPathMap() const;
+
 private:
     /// Begins constructing the USD stage, writing out the values at the default
     /// time. Returns \c true if the stage can be created successfully.