|
@@ -1,9 +1,9 @@
|
|
|
|
|
|
-
|
|
+
|
|
|
|
|
|
-
|
|
+
|
|
-
|
|
+
|
|
-
|
|
+
|
|
|
|
|
|
#include "arap.h"
|
|
#include "arap.h"
|
|
#include <igl/colon.h>
|
|
#include <igl/colon.h>
|
|
@@ -18,7 +18,6 @@
|
|
#include <igl/arap_rhs.h>
|
|
#include <igl/arap_rhs.h>
|
|
#include <igl/repdiag.h>
|
|
#include <igl/repdiag.h>
|
|
#include <igl/columnize.h>
|
|
#include <igl/columnize.h>
|
|
-#include <igl/matlab/MatlabWorkspace.h>
|
|
|
|
#include "fit_rotations.h"
|
|
#include "fit_rotations.h"
|
|
#include <cassert>
|
|
#include <cassert>
|
|
#include <iostream>
|
|
#include <iostream>
|
|
@@ -252,7 +251,7 @@ IGL_INLINE bool igl::arap_solve(
|
|
eff_R.resize(Rdim,num_rots*Rdim);
|
|
eff_R.resize(Rdim,num_rots*Rdim);
|
|
for(int r = 0;r<num_rots;r++)
|
|
for(int r = 0;r<num_rots;r++)
|
|
{
|
|
{
|
|
- eff_R.block(0,Rdim*r,Rdim,Rdim) =
|
|
+ eff_R.block(0,Rdim*r,Rdim,Rdim) =
|
|
R.block(0,Rdim*data.G(r),Rdim,Rdim);
|
|
R.block(0,Rdim*data.G(r),Rdim,Rdim);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -260,7 +259,7 @@ IGL_INLINE bool igl::arap_solve(
|
|
MatrixXd Dl;
|
|
MatrixXd Dl;
|
|
if(data.with_dynamics)
|
|
if(data.with_dynamics)
|
|
{
|
|
{
|
|
- assert(data.M.rows() == n &&
|
|
+ assert(data.M.rows() == n &&
|
|
"No mass matrix. Call arap_precomputation if changing with_dynamics");
|
|
"No mass matrix. Call arap_precomputation if changing with_dynamics");
|
|
const double h = data.h;
|
|
const double h = data.h;
|
|
assert(h != 0);
|
|
assert(h != 0);
|