manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added check in MCSimplify 

if the mesh does not have straight edges, it cannot be simplified "guessing" the error because it is not a MC-generated mesh.
Before, when it fould no straigth edges, it was crashing :)
This commit is contained in:
Marco Callieri 2018-04-03 13:06:26 +02:00
parent 7fdb93f773
commit ce1f23a37b
1 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vcg/complex/algorithms/create/plymc/plymc.h
View File

@ -59,7 +59,7 @@ namespace tri {
// Simple prototype for later use... // Simple prototype for later use...
template<class MeshType> template<class MeshType>
void MCSimplify( MeshType &m, float perc, bool preserveBB=true, vcg::CallBackPos *cb=0); int MCSimplify( MeshType &m, float perc, bool preserveBB=true, vcg::CallBackPos *cb=0);
/** Surface Reconstruction /** Surface Reconstruction
@ -550,7 +550,7 @@ template < class MeshType, class VertexPair>
template< class MeshType> template< class MeshType>
void MCSimplify( MeshType &m, float absoluteError, bool preserveBB, vcg::CallBackPos *cb) int MCSimplify( MeshType &m, float absoluteError, bool preserveBB, vcg::CallBackPos *cb)
{ {
typedef PlyMCTriEdgeCollapse<MeshType,BasicVertexPair<typename MeshType::VertexType> > MyColl; typedef PlyMCTriEdgeCollapse<MeshType,BasicVertexPair<typename MeshType::VertexType> > MyColl;
@ -578,10 +578,11 @@ void MCSimplify( MeshType &m, float absoluteError, bool preserveBB, vcg::CallBac
CoordType v1=(*fi).V(1)->P(); CoordType v1=(*fi).V(1)->P();
CoordType v2=(*fi).V(2)->P(); CoordType v2=(*fi).V(2)->P();
if(v0[2]==v1[2] && v0[1]!=v1[1] && v0[0]!=v1[0]) ZSet.push_back(v0[2]); if(v0[2]==v1[2] && v0[1]!=v1[1] && v0[0]!=v1[0]) ZSet.push_back(v0[2]);
if(v0[2]==v2[2] && v0[1]!=v1[1] && v2[0]!=v2[0]) ZSet.push_back(v0[2]); if(v0[2]==v2[2] && v0[1]!=v2[1] && v0[0]!=v2[0]) ZSet.push_back(v0[2]);
if(v1[2]==v2[2] && v1[1]!=v1[1] && v2[0]!=v2[0]) ZSet.push_back(v0[2]); if(v1[2]==v2[2] && v1[1]!=v2[1] && v1[0]!=v2[0]) ZSet.push_back(v1[2]);
if(ZSet.size()>100) break; if(ZSet.size()>100) break;
} }
if (ZSet.size() == 0) return -1; //no straight edges found. exit with error
std::sort(ZSet.begin(),ZSet.end()); std::sort(ZSet.begin(),ZSet.end());
std::vector<float>::iterator lastV = std::unique(ZSet.begin(),ZSet.end()); std::vector<float>::iterator lastV = std::unique(ZSet.begin(),ZSet.end());
ZSet.resize(lastV-ZSet.begin()); ZSet.resize(lastV-ZSet.begin());
@ -607,6 +608,8 @@ void MCSimplify( MeshType &m, float absoluteError, bool preserveBB, vcg::CallBac
sprintf(buf,"Simplyfing %7i err %9g \r",m.fn,DeciSession.currMetric); sprintf(buf,"Simplyfing %7i err %9g \r",m.fn,DeciSession.currMetric);
if (cb) cb(int(100.0f*DeciSession.currMetric/TargetError),buf); if (cb) cb(int(100.0f*DeciSession.currMetric/TargetError),buf);
} }
return 1; //success
} }