Changed to reflect the recent changes of the vcg in UpdateFlags and Triangle Normal

This commit is contained in:
Paolo Cignoni cignoni 2014-11-13 22:42:58 +00:00
parent cde59827a9
commit 2e4b9cb198
3 changed files with 6 additions and 6 deletions

View File

@ -397,7 +397,7 @@ void ComputeSurfaceExposure(MeshModel* m,int r,int n_ray){
//For every f_face get the central point
p_c=fromBarCoords(RandomBaricentric(),&*fi);
//Create a ray with p_c as origin and direction N
p_c=p_c+NormalizedNormal(*fi)*0.1;
p_c=p_c+TriangleNormal(*fi).Normalize()*0.1;
Ray3<Scalarm> ray=Ray3<Scalarm>(p_c,fi->N());
di=0;
face=0;

View File

@ -21,7 +21,7 @@ void UpdateStructures(MeshType *mesh)
vcg::tri::UpdateComponentEP<MeshType>::Set(*mesh);
vcg::tri::UpdateFlags<MeshType>::Clear(*mesh);
vcg::tri::UpdateFlags<MeshType>::FaceBorderFromFF(*mesh);
vcg::tri::UpdateFlags<MeshType>::VertexBorderFromFace(*mesh);
vcg::tri::UpdateFlags<MeshType>::VertexBorderFromFaceBorder(*mesh);
}
template <class MeshType>
@ -30,7 +30,7 @@ void UpdateTopologies(MeshType *mesh)
vcg::tri::UpdateTopology<MeshType>::FaceFace(*mesh);
vcg::tri::UpdateTopology<MeshType>::VertexFace(*mesh);
vcg::tri::UpdateFlags<MeshType>::FaceBorderFromFF(*mesh);
vcg::tri::UpdateFlags<MeshType>::VertexBorderFromFace(*mesh);
vcg::tri::UpdateFlags<MeshType>::VertexBorderFromFaceBorder(*mesh);
}
template <class MeshType>

View File

@ -319,7 +319,7 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP
break;
case FP_SELECT_BORDER:
tri::UpdateFlags<CMeshO>::FaceBorderFromNone(m.cm);
tri::UpdateFlags<CMeshO>::VertexBorderFromFace(m.cm);
tri::UpdateFlags<CMeshO>::VertexBorderFromFaceBorder(m.cm);
tri::UpdateSelection<CMeshO>::FaceFromBorderFlag(m.cm);
tri::UpdateSelection<CMeshO>::VertexFromBorderFlag(m.cm);
break;
@ -392,13 +392,13 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP
case CP_SELECT_TEXBORDER:
tri::UpdateTopology<CMeshO>::FaceFaceFromTexCoord(m.cm);
tri::UpdateFlags<CMeshO>::FaceBorderFromFF(m.cm);
tri::UpdateFlags<CMeshO>::VertexBorderFromFace(m.cm);
tri::UpdateFlags<CMeshO>::VertexBorderFromFaceBorder(m.cm);
tri::UpdateSelection<CMeshO>::VertexFromBorderFlag(m.cm);
// Just to be sure restore standard topology and border flags
tri::UpdateTopology<CMeshO>::FaceFace(m.cm);
tri::UpdateFlags<CMeshO>::FaceBorderFromFF(m.cm);
tri::UpdateFlags<CMeshO>::VertexBorderFromFace(m.cm);
tri::UpdateFlags<CMeshO>::VertexBorderFromFaceBorder(m.cm);
break;
case CP_SELECT_NON_MANIFOLD_FACE:
tri::Clean<CMeshO>::CountNonManifoldEdgeFF(m.cm,true);