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

Improved float/double consistency removing some wrong Point3f and substitued with MeshType::CoordType

This commit is contained in:
Paolo Cignoni 2014-06-19 10:26:13 +00:00
parent 3bc58b7018
commit e29b18045c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vcg/complex/algorithms/clean.h
View File

@ -1369,7 +1369,7 @@ public:
//detection stage //detection stage
for(unsigned int index = 0 ; index < m.face.size(); ++index ) for(unsigned int index = 0 ; index < m.face.size(); ++index )
{ {
FacePointer f = &(m.face[index]); float sides[3]; Point3<float> dummy; FacePointer f = &(m.face[index]); float sides[3]; CoordType dummy;
sides[0] = Distance(f->P(0), f->P(1)); sides[0] = Distance(f->P(0), f->P(1));
sides[1] = Distance(f->P(1), f->P(2)); sides[1] = Distance(f->P(1), f->P(2));
sides[2] = Distance(f->P(2), f->P(0)); sides[2] = Distance(f->P(2), f->P(0));
@ -1383,7 +1383,7 @@ public:
if(face::CheckFlipEdge<FaceType>( *f, i )) { if(face::CheckFlipEdge<FaceType>( *f, i )) {
// Check if EdgeFlipping improves quality // Check if EdgeFlipping improves quality
FacePointer g = f->FFp(i); int k = f->FFi(i); FacePointer g = f->FFp(i); int k = f->FFi(i);
Triangle3<float> t1(f->P(i), f->P1(i), f->P2(i)), t2(g->P(k), g->P1(k), g->P2(k)), Triangle3<ScalarType> t1(f->P(i), f->P1(i), f->P2(i)), t2(g->P(k), g->P1(k), g->P2(k)),
t3(f->P(i), g->P2(k), f->P2(i)), t4(g->P(k), f->P2(i), g->P2(k)); t3(f->P(i), g->P2(k), f->P2(i)), t4(g->P(k), f->P2(i), g->P2(k));
if ( std::min( QualityFace(t1), QualityFace(t2) ) < std::min( QualityFace(t3), QualityFace(t4) )) if ( std::min( QualityFace(t1), QualityFace(t2) ) < std::min( QualityFace(t3), QualityFace(t4) ))
@ -1415,8 +1415,13 @@ public:
//detection stage //detection stage
for(unsigned int index = 0 ; index < m.face.size(); ++index ) for(unsigned int index = 0 ; index < m.face.size(); ++index )
{ {
FacePointer f = &(m.face[index]); float sides[3]; Point3<float> dummy; FacePointer f = &(m.face[index]);
sides[0] = Distance(f->P(0), f->P(1)); sides[1] = Distance(f->P(1), f->P(2)); sides[2] = Distance(f->P(2), f->P(0)); float sides[3];
CoordType dummy;
sides[0] = Distance(f->P(0), f->P(1));
sides[1] = Distance(f->P(1), f->P(2));
sides[2] = Distance(f->P(2), f->P(0));
int i = std::find(sides, sides+3, std::max( std::max(sides[0],sides[1]), sides[2])) - (sides); int i = std::find(sides, sides+3, std::max( std::max(sides[0],sides[1]), sides[2])) - (sides);
if( tri::IsMarked(m,f->V2(i) )) continue; if( tri::IsMarked(m,f->V2(i) )) continue;
@ -1670,7 +1675,7 @@ static std::pair<int,int> RemoveSmallConnectedComponentsDiameter(MeshType &m, Sc
tri::ConnectedComponentIterator<MeshType> ci; tri::ConnectedComponentIterator<MeshType> ci;
for(unsigned int i=0;i<CCV.size();++i) for(unsigned int i=0;i<CCV.size();++i)
{ {
Box3f bb; Box3<ScalarType> bb;
std::vector<typename MeshType::FacePointer> FPV; std::vector<typename MeshType::FacePointer> FPV;
for(ci.start(m,CCV[i].second);!ci.completed();++ci) for(ci.start(m,CCV[i].second);!ci.completed();++ci)
{ {