Timeline Prototype

src/core/commands/TransformCommand.h

@@ -2,6 +2,7 @@
 
 #include "../CommandHistory.h"
 #include <pxr/usd/usd/stage.h>
+#include <pxr/usd/usd/timeCode.h>
 #include <pxr/usd/sdf/path.h>
 #include <pxr/usd/sdf/layer.h>
 #include <pxr/base/gf/vec3d.h>
@@ -14,8 +15,26 @@ namespace UsdLayerManager {
 /// Reverses a complete TRS edit on a single prim (from gizmo drag or
 /// Property panel field commit).  Stores the prim path, edit-target layer,
 /// and pre/post translate/rotate/scale triples.
+///
+/// When timeCode is not Default() the edit is a keyframe: values are written
+/// as time samples at that frame.  Undo removes samples this command created
+/// on ops that had no sample at that frame before the edit.
 class TransformCommand : public ICommand {
 public:
+    /// Whether each common op had an authored sample at the edit time.
+    /// Must be queried BEFORE the first live write of an interactive edit
+    /// (live writes author the sample, so querying later always finds one).
+    struct SamplePresence {
+        bool translate = false;
+        bool rotate    = false;
+        bool scale     = false;
+    };
+    static SamplePresence QuerySamplePresence(
+        pxr::UsdStageRefPtr                       stage,
+        const pxr::SdfPath&                       primPath,
+        pxr::UsdGeomXformCommonAPI::RotationOrder rotOrder,
+        pxr::UsdTimeCode                          timeCode);
+
     TransformCommand(pxr::UsdStageRefPtr       stage,
                      const pxr::SdfPath&        primPath,
                      pxr::SdfLayerHandle        editLayer,
@@ -26,6 +45,8 @@ public:
                      const pxr::GfVec3f&        newRotate,
                      const pxr::GfVec3f&        newScale,
                      pxr::UsdGeomXformCommonAPI::RotationOrder rotOrder,
+                     pxr::UsdTimeCode           timeCode,
+                     SamplePresence             preEditSamples,
                      std::string                description = "Transform");
 
     void Execute() override;
@@ -36,6 +57,9 @@ private:
     void Apply(const pxr::GfVec3d& t,
                const pxr::GfVec3f& r,
                const pxr::GfVec3f& s);
+    /// Remove the time samples Execute created on ops that previously had
+    /// no sample at m_timeCode (no-op when m_timeCode is Default).
+    void ClearCreatedSamples();
 
     pxr::UsdStageRefPtr  m_stage;
     pxr::SdfPath         m_primPath;
@@ -50,7 +74,12 @@ private:
     pxr::GfVec3f  m_newScale;
 
     pxr::UsdGeomXformCommonAPI::RotationOrder m_rotOrder;
+    pxr::UsdTimeCode m_timeCode;
     std::string   m_description;
+
+    // Whether each op already had a sample at m_timeCode before the edit
+    // (only meaningful when m_timeCode is not Default).
+    SamplePresence m_preEditSamples;
 };
 
 } // namespace UsdLayerManager