Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_calc_halfedge_normal' into 'master'

Browse Source 
use calc_face_normal if no normal property is available

See merge request OpenMesh/OpenMesh!321
This commit is contained in:
Jan Möbius
2022-08-25 07:29:53 +00:00
parent ad9eb8b48d 7a5aa1835b
commit 7c29f1e39e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh
View File

@@ -401,8 +401,8 @@ calc_halfedge_normal(HalfedgeHandle _heh, const double _feature_angle) const
} }
Normal n(0,0,0); Normal n(0,0,0);
for(unsigned int i=0; i<fhs.size(); ++i) for (unsigned int i = 0; i < fhs.size(); ++i)
n += Kernel::normal(fhs[i]); n += Kernel::has_face_normals() ? Kernel::normal(fhs[i]) : calc_face_normal(fhs[i]);
return normalize(n); return normalize(n);
} }
@@ -444,8 +444,8 @@ is_estimated_feature_edge(HalfedgeHandle _heh, const double _feature_angle) cons
FaceHandle fh0 = Kernel::face_handle(_heh); FaceHandle fh0 = Kernel::face_handle(_heh);
FaceHandle fh1 = Kernel::face_handle(Kernel::opposite_halfedge_handle(_heh)); FaceHandle fh1 = Kernel::face_handle(Kernel::opposite_halfedge_handle(_heh));
Normal fn0 = Kernel::normal(fh0); Normal fn0 = Kernel::has_face_normals() ? Kernel::normal(fh0) : calc_face_normal(fh0);
Normal fn1 = Kernel::normal(fh1); Normal fn1 = Kernel::has_face_normals() ? Kernel::normal(fh1) : calc_face_normal(fh1);
// dihedral angle above angle threshold // dihedral angle above angle threshold
return ( dot(fn0,fn1) < cos(_feature_angle) ); return ( dot(fn0,fn1) < cos(_feature_angle) );