lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-17 18:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed small bugs (Still remaining: bugs on APPEND)

Browse Source
This commit is contained in:
Stefano Marras marras 2010-09-22 12:03:54 +00:00
parent 351511f74f
commit 4ff992eabc
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/meshlabplugins/filter_zippering/filter_zippering.cpp
View File

@ -1053,7 +1053,6 @@ void FilterZippering::projectFace( CMeshO::FacePointer f, //pointer to the
//store current border edge
stack.push_back( make_pair( tri::Index( a->cm, f->V(e) ),
tri::Index( a->cm, f->V1(e) ) ) ); //indices of border vertices
//while there are border edges...
while ( !stack.empty() ) {
@ -1077,6 +1076,14 @@ void FilterZippering::projectFace( CMeshO::FacePointer f, //pointer to the
CMeshO::FacePointer endF = grid_a.GetClosest(PDistFunct, markerFunctor, a->cm.vert[current_edge.second].P(), max_dist, dist, closestEnd);
if ( fabs(dist) >= fabs(max_dist) ) endF = 0;
//DEBUG
if ( startF != 0 && endF != 0 ) {
if ( vcg::Distance<float> (a->cm.vert[current_edge.first].P(), closestStart) < eps &&
vcg::Distance<float> (a->cm.vert[current_edge.second].P(), closestEnd) < eps )
dbg_cnt++;
continue;
}
//case 00: startF and endF are null faces: no op
if ( startF == 0 && endF == 0 ) continue;
@ -1554,7 +1561,8 @@ bool FilterZippering::applyFilter(QAction *filter, MeshDocument &md, RichParamet
vector< CMeshO::FacePointer > tbt_faces; //To Be Triangulated
vector< CMeshO::FacePointer > tbr_faces; //To Be Removed
vector< int > verts; //vector containing indices of vertices of the new faces
int ccc = 0;
dbg_cnt = 0;
//for each border of the mesh B, select a face and projected it on the surface of A
//add information to the faces of A when needed
for ( size_t c = 0; c < border.size(); c ++ ) {
@ -1572,6 +1580,7 @@ bool FilterZippering::applyFilter(QAction *filter, MeshDocument &md, RichParamet
int v_ind = tri::Index( a->cm, p.V() );
//project current face on the surface of A
projectFace( p.F(), a, grid, par.getFloat("distance"), map_info, tbt_faces, tbr_faces, verts );
ccc++;
//restore vertex pointer
p.V() = &a->cm.vert[v_ind];
p.NextB();

2
src/meshlabplugins/filter_zippering/filter_zippering.h
View File

@ -453,6 +453,8 @@ private:
float eps;
int dbg_cnt;
};
#endif