Implement and test setMatrixCmd() for single matrix op prims.

lib/mayaUsd/python/wrapUsdUndoManager.cpp

@@ -16,7 +16,6 @@
 
 #include <mayaUsd/undo/UsdUndoBlock.h>
 #include <mayaUsd/undo/UsdUndoManager.h>
-#include <mayaUsd/undo/UsdUndoableItem.h>
 
 #include <pxr/base/tf/pyContainerConversions.h>
 #include <pxr/base/tf/pyNoticeWrapper.h>

lib/mayaUsd/ufe/UsdTransform3dBase.cpp

@@ -99,15 +99,22 @@ Ufe::Vector3d UsdTransform3dBase::scalePivotTranslation() const { return Ufe::Ve
 #ifdef UFE_V2_FEATURES_AVAILABLE
 Ufe::SetMatrix4dUndoableCommand::Ptr UsdTransform3dBase::setMatrixCmd(const Ufe::Matrix4d& m)
 {
-    // TODO: HS Aug25,2020 dummy code to pass the compiler errors
     return nullptr;
 }
 
 Ufe::Matrix4d UsdTransform3dBase::matrix() const
 {
-    // TODO: HS Aug25,2020 dummy code to pass the compiler errors
-    Ufe::Matrix4d m {};
-    return m;
+    UsdGeomXformable xformable(prim());
+    bool             unused;
+    auto             ops = xformable.GetOrderedXformOps(&unused);
+
+    GfMatrix4d m(1);
+    if (!UsdGeomXformable::GetLocalTransformation(&m, ops, getTime(path()))) {
+        TF_FATAL_ERROR(
+            "Local transformation computation for prim %s failed.", prim().GetPath().GetText());
+    }
+
+    return toUfe(m);
 }
 #endif
 

lib/mayaUsd/ufe/UsdTransform3dMatrixOp.cpp

@@ -17,6 +17,8 @@
 
 #include <mayaUsd/ufe/UsdSceneItem.h>
 #include <mayaUsd/ufe/Utils.h>
+#include <mayaUsd/undo/UsdUndoBlock.h>
+#include <mayaUsd/undo/UsdUndoableItem.h>
 
 #include <pxr/base/gf/rotation.h>
 #include <pxr/base/gf/transform.h>
@@ -30,6 +32,7 @@
 
 namespace {
 
+using namespace MayaUsd;
 using namespace MayaUsd::ufe;
 
 VtValue getValue(const UsdAttribute& attr, const UsdTimeCode& time)
@@ -76,6 +79,42 @@ computeLocalTransform(const UsdPrim& prim, const UsdGeomXformOp& op, const UsdTi
 auto computeLocalInclusiveTransform = computeLocalTransform<true>;
 auto computeLocalExclusiveTransform = computeLocalTransform<false>;
 
+// Class for setMatrixCmd() implementation.  UsdUndoBlock data member and
+// undo() / redo() should be factored out into a future command base class.
+class UsdSetMatrix4dUndoableCmd : public Ufe::SetMatrix4dUndoableCommand
+{
+public:
+    UsdSetMatrix4dUndoableCmd(const Ufe::Path& path, const Ufe::Matrix4d& newM)
+        : Ufe::SetMatrix4dUndoableCommand(path)
+        , _newM(newM)
+    {
+    }
+
+    ~UsdSetMatrix4dUndoableCmd() override { }
+
+    bool set(const Ufe::Matrix4d&) override
+    {
+        // No-op: Maya does not set matrices through interactive manipulation.
+        TF_WARN("Illegal call to UsdSetMatrix4dUndoableCmd::set()");
+        return true;
+    }
+
+    void execute() override
+    {
+        UsdUndoBlock undoBlock(&_undoableItem);
+
+        auto t3d = Ufe::Transform3d::transform3d(sceneItem());
+        t3d->setMatrix(_newM);
+    }
+
+    void undo() override { _undoableItem.undo(); }
+    void redo() override { _undoableItem.redo(); }
+
+private:
+    UsdUndoableItem     _undoableItem;
+    const Ufe::Matrix4d _newM;
+};
+
 // Helper class to factor out common code for translate, rotate, scale
 // undoable commands.
 class UsdTRSUndoableCmdBase
@@ -351,7 +390,7 @@ Ufe::ScaleUndoableCommand::Ptr UsdTransform3dMatrixOp::scaleCmd(double x, double
 
 Ufe::SetMatrix4dUndoableCommand::Ptr UsdTransform3dMatrixOp::setMatrixCmd(const Ufe::Matrix4d& m)
 {
-    return nullptr;
+    return std::make_shared<UsdSetMatrix4dUndoableCmd>(path(), m);
 }
 
 void UsdTransform3dMatrixOp::setMatrix(const Ufe::Matrix4d& m) { _op.Set(toUsd(m)); }
@@ -402,20 +441,39 @@ UsdTransform3dMatrixOpHandler::create(const Ufe::Transform3dHandler::Ptr& nextHa
 Ufe::Transform3d::Ptr
 UsdTransform3dMatrixOpHandler::transform3d(const Ufe::SceneItem::Ptr& item) const
 {
-    // This method can be used to edit the 3D transform of the argument, but at
-    // time of writing this is not implemented in UsdTransform3dMatrixOp, and
-    // our UsdTransform3dBaseHandler base class does not know how to edit the
-    // argument either.  Simply delegate to the next handler in the list.
-    return _nextHandler->transform3d(item);
+    // Remove code duplication with editTransform3d().  PPT, 21-Jan-2021.
+    UsdSceneItem::Ptr usdItem = std::dynamic_pointer_cast<UsdSceneItem>(item);
+    TF_AXIOM(usdItem);
+
+    auto             opName = getMatrixOp();
+    UsdGeomXformable xformable(usdItem->prim());
+    bool             unused;
+    auto             xformOps = xformable.GetOrderedXformOps(&unused);
+    auto i = std::find_if(xformOps.begin(), xformOps.end(), [opName](const UsdGeomXformOp& op) {
+        return (op.GetOpType() == UsdGeomXformOp::TypeTransform)
+            && (!opName || std::string(opName) == op.GetOpName());
+    });
+    bool foundMatrix = (i != xformOps.end());
+
+    bool moreLocalNonMatrix = foundMatrix
+        ? (std::find_if(
+               i,
+               xformOps.end(),
+               [](const UsdGeomXformOp& op) {
+                   return op.GetOpType() != UsdGeomXformOp::TypeTransform;
+               })
+           != xformOps.end())
+        : false;
+
+    return (foundMatrix && !moreLocalNonMatrix) ? UsdTransform3dMatrixOp::create(usdItem, *i)
+                                                : _nextHandler->transform3d(item);
 }
 
 Ufe::Transform3d::Ptr UsdTransform3dMatrixOpHandler::editTransform3d(
     const Ufe::SceneItem::Ptr& item UFE_V2(, const Ufe::EditTransform3dHint& hint)) const
 {
     UsdSceneItem::Ptr usdItem = std::dynamic_pointer_cast<UsdSceneItem>(item);
-#if !defined(NDEBUG)
-    assert(usdItem);
-#endif
+    TF_AXIOM(usdItem);
 
     // Beware: the default UsdGeomXformOp constructor
     // https://github.com/PixarAnimationStudios/USD/blob/71b4baace2044ea4400ba802e91667f9ebe342f0/pxr/usd/usdGeom/xformOp.h#L148

lib/mayaUsd/ufe/UsdTransform3dMayaXformStack.cpp

@@ -162,21 +162,13 @@ createTransform3d(const Ufe::SceneItem::Ptr& item, NextTransform3dFn nextTransfo
     return stackOps.empty() ? nextTransform3dFn() : UsdTransform3dMayaXformStack::create(usdItem);
 }
 
-// Class for setMatrixCmd() implementation.  Should be rolled into a future
-// command class with full undo / redo support
+// Class for setMatrixCmd() implementation.  UsdUndoBlock data member and
+// undo() / redo() should be factored out into a future command base class.
 class UsdSetMatrix4dUndoableCmd : public Ufe::SetMatrix4dUndoableCommand
 {
 public:
-    UsdSetMatrix4dUndoableCmd(
-        const Ufe::Path&     path,
-        const Ufe::Vector3d& oldT,
-        const Ufe::Vector3d& oldR,
-        const Ufe::Vector3d& oldS,
-        const Ufe::Matrix4d& newM)
+    UsdSetMatrix4dUndoableCmd(const Ufe::Path& path, const Ufe::Matrix4d& newM)
         : Ufe::SetMatrix4dUndoableCommand(path)
-        , _oldT(oldT)
-        , _oldR(oldR)
-        , _oldS(oldS)
     {
         // Decompose new matrix to extract TRS.  Neither GfMatrix4d::Factor
         // nor GfTransform decomposition provide results that match Maya,
@@ -206,23 +198,40 @@ class UsdSetMatrix4dUndoableCmd : public Ufe::SetMatrix4dUndoableCommand
         return true;
     }
 
-    void undo() override { perform(_oldT, _oldR, _oldS); }
-    void redo() override { perform(_newT, _newR, _newS); }
-
-private:
-    void perform(const Ufe::Vector3d& t, const Ufe::Vector3d& r, const Ufe::Vector3d& s)
+    void execute() override
     {
+        UsdUndoBlock undoBlock(&_undoableItem);
+
         auto t3d = Ufe::Transform3d::transform3d(sceneItem());
-        t3d->translate(t.x(), t.y(), t.z());
-        t3d->rotate(r.x(), r.y(), r.z());
-        t3d->scale(s.x(), s.y(), s.z());
+        t3d->translate(_newT.x(), _newT.y(), _newT.z());
+        t3d->rotate(_newR.x(), _newR.y(), _newR.z());
+        t3d->scale(_newS.x(), _newS.y(), _newS.z());
+
+#if !defined(REMOVE_PR122_WORKAROUND_MAYA_109685)
+        _executeCalled = true;
+#endif
     }
-    Ufe::Vector3d _oldT;
-    Ufe::Vector3d _oldR;
-    Ufe::Vector3d _oldS;
-    Ufe::Vector3d _newT;
-    Ufe::Vector3d _newR;
-    Ufe::Vector3d _newS;
+
+    void undo() override { _undoableItem.undo(); }
+    void redo() override
+    {
+#if !defined(REMOVE_PR122_WORKAROUND_MAYA_109685)
+        if (!_executeCalled) {
+            execute();
+            return;
+        }
+#endif
+        _undoableItem.redo();
+    }
+
+private:
+#if !defined(REMOVE_PR122_WORKAROUND_MAYA_109685)
+    bool _executeCalled { false };
+#endif
+    UsdUndoableItem _undoableItem;
+    Ufe::Vector3d   _newT;
+    Ufe::Vector3d   _newR;
+    Ufe::Vector3d   _newS;
 };
 
 // Helper class to factor out common code for translate, rotate, scale
@@ -698,8 +707,7 @@ UsdTransform3dMayaXformStack::pivotCmd(const TfToken& pvtOpSuffix, double x, dou
 Ufe::SetMatrix4dUndoableCommand::Ptr
 UsdTransform3dMayaXformStack::setMatrixCmd(const Ufe::Matrix4d& m)
 {
-    return std::make_shared<UsdSetMatrix4dUndoableCmd>(
-        path(), translation(), rotation(), scale(), m);
+    return std::make_shared<UsdSetMatrix4dUndoableCmd>(path(), m);
 }
 
 UsdTransform3dMayaXformStack::SetXformOpOrderFn

lib/mayaUsd/ufe/UsdUndoSetKindCommand.cpp

@@ -51,7 +51,7 @@ void UsdUndoSetKindCommand::execute()
 {
     UsdUndoBlock undoBlock(&_undoableItem);
 
-    UsdModelAPI(_prim).SetKind(_kind);
+    PXR_NS::UsdModelAPI(_prim).SetKind(_kind);
 }
 
 void UsdUndoSetKindCommand::redo() { _undoableItem.redo(); }

lib/mayaUsd/ufe/UsdUndoSetKindCommand.h

@@ -52,9 +52,9 @@ class MAYAUSD_CORE_PUBLIC UsdUndoSetKindCommand : public Ufe::UndoableCommand
     void redo() override;
 
 private:
-    UsdPrim _prim;
+    PXR_NS::UsdPrim _prim;
 
-    TfToken _kind;
+    PXR_NS::TfToken _kind;
 
     UsdUndoableItem _undoableItem;
 

lib/mayaUsd/undo/UsdUndoBlock.h

@@ -17,9 +17,8 @@
 #ifndef MAYAUSD_UNDO_UNDOBLOCK_H
 #define MAYAUSD_UNDO_UNDOBLOCK_H
 
-#include "UsdUndoableItem.h"
-
 #include <mayaUsd/base/api.h>
+#include <mayaUsd/undo/UsdUndoableItem.h>
 
 #include <pxr/base/tf/declarePtrs.h>
 

lib/mayaUsd/undo/UsdUndoableItem.cpp

@@ -16,7 +16,7 @@
 
 #include "UsdUndoableItem.h"
 
-#include "UsdUndoBlock.h"
+#include <mayaUsd/undo/UsdUndoBlock.h>
 
 #include <pxr/usd/sdf/changeBlock.h>
 
@@ -44,4 +44,4 @@ void UsdUndoableItem::doInvert()
     }
 }
 
-} // namespace MAYAUSD_NS_DEF
+} // namespace MAYAUSD_NS_DEF

lib/mayaUsd/undo/UsdUndoableItem.h

@@ -14,16 +14,14 @@
 // limitations under the License.
 //
 
-#ifndef MAYAUSD_UNDO_UNDOABLE_BLOCK_H
-#define MAYAUSD_UNDO_UNDOABLE_BLOCK_H
+#ifndef MAYAUSD_UNDO_UNDOABLE_ITEM_H
+#define MAYAUSD_UNDO_UNDOABLE_ITEM_H
 
 #include <mayaUsd/base/api.h>
 
 #include <functional>
 #include <vector>
 
-PXR_NAMESPACE_USING_DIRECTIVE
-
 namespace MAYAUSD_NS_DEF {
 
 //! \brief UsdUndoableItem
@@ -62,4 +60,4 @@ class MAYAUSD_CORE_PUBLIC UsdUndoableItem
 
 } // namespace MAYAUSD_NS_DEF
 
-#endif // MAYAUSD_UNDO_UNDOABLE_BLOCK_H
+#endif // MAYAUSD_UNDO_UNDOABLE_ITEM_H