Returning last keypose when entering a new one.

Author: cheind

examples/deform_trajectory.cpp

@@ -30,8 +30,6 @@
 
 
 const std::vector<int> handles = { 4,5,7,11,14,15,16,17,18,19,26,27,38,39,45,46,48,49,50,51,52,53,54,55,56,76,77,131,132,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,240,241,257,307,308,324,325,327,328,329,330,331,332,333,334,354,355 };
-
-
 const std::vector<int> anchors = {0,1,2,3,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385};
 
 
@@ -64,11 +62,11 @@ int main(int argc, char **argv) {
  // Setup trajectory
  Trajectory trajectory;
 
- trajectory.addKeyPose(Trajectory::Transform::Identity());
- trajectory.addKeyPose(Trajectory::Transform::Identity() * Eigen::Translation3f(1.f,0.f,0.f));
- trajectory.addKeyPose(Trajectory::Transform::Identity() * Eigen::Translation3f(2.f, 0.f, 0.f));
- trajectory.addKeyPose(Trajectory::Transform::Identity() * Eigen::AngleAxisf((float)M_PI / 2.f, Eigen::Vector3f::UnitZ()) * Eigen::AngleAxisf((float)M_PI / 4.f, Eigen::Vector3f::UnitX()) * Eigen::Translation3f(2.f, 0.f, 0.f));
- 
+ Trajectory::Transform prev;
+ prev = trajectory.addKeyPose(Trajectory::Transform::Identity());
+ prev = trajectory.addKeyPose(prev * Eigen::Translation3f(1.f, 0.f, 0.f));
+ prev = trajectory.addKeyPose(prev * Eigen::Translation3f(2.f, 0.f, 0.f));
+ prev = trajectory.addKeyPose(prev * Eigen::AngleAxisf((float)M_PI / 2.f, Eigen::Vector3f::UnitX())); 
 
  DeformationUtil dutil(ma, handles.begin(), handles.end(), trajectory(0.0));
 

inc/deform/deformation_util.h

@@ -8,8 +8,8 @@
  of the BSD license.See the LICENSE file for details.
  */
 
-#ifndef DEFORM_DEFORMATION_PATH_H
-#define DEFORM_DEFORMATION_PATH_H
+#ifndef DEFORM_DEFORMATION_UTIL_H
+#define DEFORM_DEFORMATION_UTIL_H
 
 #include <deform/trajectory.h>
 #include <deform/arap.h>

inc/deform/trajectory.h

@@ -52,9 +52,10 @@ namespace deform {
  :_dirty(false)
  {}
 
- void addKeyPose(const Transform &transform) {
+ Transform addKeyPose(const Transform &transform) {
  _transforms.push_back(transform);
  _dirty = true;
+ return transform;
  }
 
  Transform operator()(Scalar time) {