Merge remote-tracking branch 'origin/master'

Author: cheind

CMakeLists.txt

@@ -24,6 +24,7 @@ target_sources(deform INTERFACE
  ${CMAKE_CURRENT_SOURCE_DIR}/inc/deform/arap.h
  ${CMAKE_CURRENT_SOURCE_DIR}/inc/deform/openmesh_adapter.h
  ${CMAKE_CURRENT_SOURCE_DIR}/inc/deform/trajectory.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/inc/deform/deformation_util.h
 )
 
 add_executable(deform_tests

examples/deform_trajectory.cpp

@@ -18,6 +18,7 @@
 #include <deform/arap.h>
 #include <deform/openmesh_adapter.h>
 #include <deform/trajectory.h>
+#include <deform/deformation_util.h>
 
 #include "osg_viewer.h"
 #include "example_config.h"
@@ -29,24 +30,14 @@
 
 
 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};
 
 
 typedef OpenMesh::TriMesh_ArrayKernelT<> Mesh;
 typedef deform::OpenMeshAdapter<> Adapter;
 typedef deform::AsRigidAsPossibleDeformation<Adapter, double> ARAP;
 typedef deform::TrajectorySE3<float> Trajectory;
-
-
-void applyTransformationToHandles(const Eigen::Affine3f &delta, Mesh &mesh, ARAP &arap) {
- for (auto h : handles) {
- Mesh::VertexHandle vh = mesh.vertex_handle(h);
- Eigen::Vector3f v = delta * deform::convert::toEigen(mesh.point(vh));
- arap.setConstraint(vh.idx(), v);
- }
-}
+typedef deform::DeformationUtil<Adapter> DeformationUtil;
 
 
 int main(int argc, char **argv) {
@@ -70,22 +61,14 @@ 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.addKeyPose(Trajectory::Transform::Identity());
- trajectory.addKeyPose(Eigen::AngleAxisf((float)0.2f, Eigen::Vector3f::UnitY()) * Trajectory::Transform::Identity());
- trajectory.addKeyPose(Eigen::AngleAxisf((float)0.4f, Eigen::Vector3f::UnitY()) * Trajectory::Transform::Identity());
- trajectory.addKeyPose(Eigen::AngleAxisf((float)0.6f, Eigen::Vector3f::UnitY()) * Trajectory::Transform::Identity());
- trajectory.addKeyPose(Eigen::AngleAxisf((float)1.57f, Eigen::Vector3f::UnitY()) * Trajectory::Transform::Identity());
+ 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())); 
 
-
-
- Eigen::Affine3f prev = trajectory(0.f);
+ DeformationUtil dutil(ma, handles.begin(), handles.end(), trajectory(0.0));
 
  // Create an OSG viewer to visualize incremental deformation.
  double duration = 10.f;
@@ -98,11 +81,9 @@ int main(int argc, char **argv) {
  if (t > 1.f)
  return false;
 
- Trajectory::Transform transform = trajectory((float)t);
- applyTransformationToHandles(transform * prev.inverse(Eigen::Isometry), mesh, arap);
- prev = transform;
+ dutil.updateConstraints(trajectory((float)t), arap);
 
- arap.deform(40);
+ arap.deform(20);
 
  return true;
  });

inc/deform/deformation_util.h

@@ -0,0 +1,67 @@
+/**
+ This file is part of mesh-deform.
+ 
+ Copyright(C) 2016 Christoph Heindl
+ All rights reserved.
+ 
+ This software may be modified and distributed under the terms
+ of the BSD license.See the LICENSE file for details.
+ */
+
+#ifndef DEFORM_DEFORMATION_UTIL_H
+#define DEFORM_DEFORMATION_UTIL_H
+
+#include <deform/trajectory.h>
+#include <deform/arap.h>
+
+namespace deform {
+ 
+ template<class MeshType>
+ class DeformationUtil {
+ public:
+
+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
+
+ typedef MeshType Mesh;
+
+ /** Floating point precision used in calculations. */
+ typedef typename MeshType::Scalar Scalar;
+ 
+ /** Transformation matrix type. */
+ typedef Eigen::Transform<Scalar, 3, Eigen::Affine> Transform;
+ 
+
+ template<class HandleIterator>
+ DeformationUtil(const Mesh &mesh, HandleIterator handlesBegin, HandleIterator handlesEnd, const Transform &origin = Transform::Identity())
+ :_origin(origin)
+ {
+ _originInv = origin.inverse(Eigen::Isometry);
+ _handles.insert(_handles.begin(), handlesBegin, handlesEnd);
+ _points.resize(3, _handles.size());
+ 
+ for (size_t i = 0; i < _handles.size(); ++i) {
+ _points.col(i) = mesh.vertexLocation(_handles[i]);
+ }
+
+ }
+
+ template<class ARAP>
+ void updateConstraints(const Transform &t, ARAP &arap)
+ {
+ Transform tabs = _origin * t * _originInv;
+
+ for (size_t i = 0; i < _handles.size(); ++i) {
+ arap.setConstraint(_handles[i], tabs * _points.col(i));
+ }
+ 
+ }
+ 
+ private:
+ std::vector<int> _handles;
+ Eigen::Matrix<Scalar, 3, Eigen::Dynamic> _points;
+ Transform _origin;
+ Transform _originInv;
+ };
+}
+
+#endif

inc/deform/trajectory.h

@@ -28,8 +28,6 @@
 #pragma warning (pop)
 #endif
 
-#include <iostream>
-
 namespace deform {
 
  template<class PrecisionType>
@@ -54,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) {