|
@@ -98,7 +98,7 @@ namespace comiso {
|
|
|
|
|
|
|
|
|
const Eigen::Matrix<int, Eigen::Dynamic, 3> &Handle_MMatch;
|
|
|
-
|
|
|
+ const Eigen::Matrix<int, Eigen::Dynamic, 1> &Handle_Singular;
|
|
|
|
|
|
const Eigen::Matrix<int, Eigen::Dynamic, 3> &Handle_Seams;
|
|
|
|
|
@@ -121,7 +121,7 @@ namespace comiso {
|
|
|
|
|
|
|
|
|
const Eigen::Matrix<int, Eigen::Dynamic, 3> &_Handle_MMatch,
|
|
|
-
|
|
|
+ const Eigen::Matrix<int, Eigen::Dynamic, 1> &_Handle_Singular,
|
|
|
|
|
|
const Eigen::Matrix<int, Eigen::Dynamic, 3> &_Handle_Seams
|
|
|
);
|
|
@@ -417,7 +417,7 @@ IGL_INLINE igl::comiso::VertexIndexing<DerivedV, DerivedF>::VertexIndexing(const
|
|
|
|
|
|
|
|
|
const Eigen::Matrix<int, Eigen::Dynamic, 3> &_Handle_MMatch,
|
|
|
-
|
|
|
+ const Eigen::Matrix<int, Eigen::Dynamic, 1> &_Handle_Singular,
|
|
|
|
|
|
const Eigen::Matrix<int, Eigen::Dynamic, 3> &_Handle_Seams
|
|
|
|
|
@@ -431,7 +431,7 @@ TTi(_TTi),
|
|
|
|
|
|
|
|
|
Handle_MMatch(_Handle_MMatch),
|
|
|
-
|
|
|
+Handle_Singular(_Handle_Singular),
|
|
|
|
|
|
Handle_Seams(_Handle_Seams)
|
|
|
{
|
|
@@ -514,7 +514,7 @@ IGL_INLINE void igl::comiso::VertexIndexing<DerivedV, DerivedF>::InitSeamInfo()
|
|
|
for (unsigned int i=0;i<V.rows();i++)
|
|
|
{
|
|
|
isStartVertex[i] = false;
|
|
|
- if (VVSeam[i].size() > 0 && VVSeam[i].size() != 2)
|
|
|
+ if (VVSeam[i].size() > 0 && VVSeam[i].size() != 2 || Handle_Singular(i) == true)
|
|
|
{
|
|
|
startVertexIndices.push_back(i);
|
|
|
isStartVertex[i] = true;
|
|
@@ -1308,7 +1308,7 @@ F(F_)
|
|
|
igl::triangle_triangle_adjacency(V,F,TT,TTi);
|
|
|
|
|
|
|
|
|
- VertexIndexing<DerivedV, DerivedF> VInd(V, F, Vcut, Fcut, TT, TTi, Handle_MMatch, Handle_Seams);
|
|
|
+ VertexIndexing<DerivedV, DerivedF> VInd(V, F, Vcut, Fcut, TT, TTi, Handle_MMatch, Handle_Singular, Handle_Seams);
|
|
|
|
|
|
VInd.InitSeamInfo();
|
|
|
|