phynexis-deps/igl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more robust weight computation in skeleton poser example

Browse Source 
Former-commit-id: 8309c73bd9
This commit is contained in:
Alec Jacobson
2014-09-09 01:43:45 -04:00
parent 9c9f1de3e4
commit b4eee2bc3d
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/skeleton-posing/example.cpp
+22 -8
View File
@@ -42,6 +42,7 @@
#include <igl/writeOFF.h>
#include <igl/writeTGF.h>
#include <igl/next_filename.h>
#include <igl/volume.h>
#include <Eigen/Core>
#include <Eigen/Geometry>
@@ -710,7 +711,6 @@ bool clean(
MatrixXd oldCV = CV;
MatrixXi oldCF = CF;
remove_unreferenced(oldCV,oldCF,CV,CF,IM);
writeOBJ("remesh.obj",CV,CF);
}
MatrixXd TV;
MatrixXi TT;
@@ -727,7 +727,6 @@ bool clean(
cout<<REDRUM("CDT failed.")<<endl;
return false;
}
writeMESH("tetrahedralize-1.mesh",TV,TT,MatrixXi());
}
{
MatrixXd BC;
@@ -737,8 +736,6 @@ bool clean(
cout<<"winding_number"<<endl;
#endif
winding_number(V,F,BC,W);
writeDMAT("W.dmat",W);
writeDMAT("BC.dmat",BC);
W = W.array().abs();
const double thresh = 0.5;
const int count = (W.array()>thresh).cast<int>().sum();
@@ -753,7 +750,6 @@ bool clean(
}
assert(c==count);
boundary_facets(CT,CF);
writeOBJ("boundary_facets.obj",CV,CF);
}
return true;
}
@@ -783,14 +779,32 @@ bool robust_weights(
#ifdef VERBOSE
cout<<"mesh_with_skeleton"<<endl;
#endif
writeOBJ("before.obj",CV,CF);
if(!mesh_with_skeleton(CV,CF,C,{},BE,{},10,TV,TT,_1))
if(!mesh_with_skeleton(CV,CF,C,{},BE,{},10,"pq1.5Y",TV,TT,_1))
{
cout<<REDRUM("tetgen failed.")<<endl;
return false;
}
writeMESH("after.mesh",TV,TT,MatrixXi());
}
// Finally, tetgen may have still included some insanely small tets.
// Just ignore these during weight computation (and hope they don't isolate
// any vertices).
{
const MatrixXi oldTT = TT;
VectorXd vol;
volume(TV,TT,vol);
const double thresh = 1e-17;
const int count = (vol.array()>thresh).cast<int>().sum();
TT.resize(count,oldTT.cols());
int c = 0;
for(int t = 0;t<oldTT.rows();t++)
{
if(vol(t)>thresh)
{
TT.row(c++) = oldTT.row(t);
}
}
}
// compute weights
VectorXi b;
MatrixXd bc;
include/igl/tetgen/mesh_with_skeleton.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ IGL_INLINE bool igl::mesh_with_skeleton(
// * has consistent orientation
// * has no self-intersections
// * has no 0-volume pieces
writeOBJ("mesh_with_skeleton.obj",VS,F);
//writeOBJ("mesh_with_skeleton.obj",VS,F);
cerr<<"tetgen begin()"<<endl;
int status = tetrahedralize( VS,F,eff_tetgen_flags,VV,TT,FF);
cerr<<"tetgen end()"<<endl;
include/igl/volume.cpp
+5 -4
View File
@@ -22,10 +22,10 @@ IGL_INLINE void igl::volume(
vol.resize(m,1);
for(int t = 0;t<m;t++)
{
const auto & a = V.row(T(t,0));
const auto & b = V.row(T(t,1));
const auto & c = V.row(T(t,2));
const auto & d = V.row(T(t,3));
const RowVector3d & a = V.row(T(t,0));
const RowVector3d & b = V.row(T(t,1));
const RowVector3d & c = V.row(T(t,2));
const RowVector3d & d = V.row(T(t,3));
vol(t) = -(a-d).dot((b-d).cross(c-d))/6.;
}
}
@@ -111,4 +111,5 @@ template void igl::volume<Eigen::Matrix<double, -1, 6, 0, -1, 6>, Eigen::Matrix<
template Eigen::Matrix<double, 1, 3, 1, 1, 3>::Scalar igl::volume_single<Eigen::Matrix<double, 1, 3, 1, 1, 3>, Eigen::Matrix<double, 1, 3, 1, 1, 3>, Eigen::Matrix<double, 1, 3, 1, 1, 3>, Eigen::Matrix<double, 1, 3, 1, 1, 3> >(Eigen::Matrix<double, 1, 3, 1, 1, 3> const&, Eigen::Matrix<double, 1, 3, 1, 1, 3> const&, Eigen::Matrix<double, 1, 3, 1, 1, 3> const&, Eigen::Matrix<double, 1, 3, 1, 1, 3> const&);
template Eigen::Matrix<double, 3, 1, 0, 3, 1>::Scalar igl::volume_single<Eigen::Matrix<double, 3, 1, 0, 3, 1>, Eigen::Matrix<double, 3, 1, 0, 3, 1>, Eigen::Matrix<double, 3, 1, 0, 3, 1>, Eigen::Matrix<double, 3, 1, 0, 3, 1> >(Eigen::Matrix<double, 3, 1, 0, 3, 1> const&, Eigen::Matrix<double, 3, 1, 0, 3, 1> const&, Eigen::Matrix<double, 3, 1, 0, 3, 1> const&, Eigen::Matrix<double, 3, 1, 0, 3, 1> const&);
template void igl::volume<Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, 1, 0, -1, 1> >(Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&);
template void igl::volume<Eigen::Matrix<double, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<double, -1, 1, 0, -1, 1> >(Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, 1, 0, -1, 1> >&);
#endif