songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #995 from janetournois/PMP-fix_compute_normals-jtournois 

PMP : improve computation of a face normal for non-triangular faces
This commit is contained in:
Laurent Rineau 2016-04-14 15:09:40 +02:00
parent 6ac37a9ad4 c7c8c86a9e
commit 9cfaf4f664
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h
View File

@ -54,21 +54,22 @@ void sum_normals(const PM& pmesh,
VertexPointMap vpmap,
Vector& sum)
{
typedef typename boost::graph_traits<PM>::vertex_descriptor vertex_descriptor;
typedef typename boost::graph_traits<PM>::halfedge_descriptor halfedge_descriptor;
halfedge_descriptor he = halfedge(f, pmesh);
halfedge_descriptor end = he;
bool f_is_triangle = (he == next(next(next(he, pmesh), pmesh), pmesh));
/*it is useless to compute the normal 3 times on a triangle*/
do
vertex_descriptor v = source(he, pmesh);
const Point& pv = get(vpmap, v);
while (v != target(next(he, pmesh), pmesh))
{
const Point& prv = get(vpmap, target(prev(he, pmesh), pmesh));
const Point& curr = get(vpmap, target(he, pmesh));
const Point& nxt = get(vpmap, target(next(he, pmesh), pmesh));
Vector n = internal::triangle_normal(prv, curr, nxt);
const Point& pvn = get(vpmap, target(he, pmesh));
const Point& pvnn = get(vpmap, target(next(he, pmesh), pmesh));
Vector n = internal::triangle_normal(pv, pvn, pvnn);
sum = sum + n;
he = next(he, pmesh);
} while (he != end && !f_is_triangle);
}
}