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

First set of changes to the new circulators

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@898 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-08-07 09:40:10 +00:00
parent 1c8d4fb59b
commit afda61f067
23 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenMesh/Core/Mesh/PolyConnectivity.cc
View File

@@ -401,8 +401,8 @@ bool PolyConnectivity::is_collapse_ok(HalfedgeHandle v0v1)
for (vv_it = vv_iter(v0); vv_it; ++vv_it)
{
if (status(vv_it).tagged() &&
!(vv_it.handle() == v_01_n && v0v1_triangle) &&
!(vv_it.handle() == v_10_n && v1v0_triangle)
!(*vv_it == v_01_n && v0v1_triangle) &&
!(*vv_it == v_10_n && v1v0_triangle)
)
{
return false;

2
src/OpenMesh/Core/Mesh/PolyMeshT.cc
View File

@@ -106,7 +106,7 @@ calc_face_normal(FaceHandle _fh) const
//calculate area-weighted average normal of polygon's ears
Normal n(0,0,0);
for(; fv_it; ++fv_it)
for(; fv_it.is_valid(); ++fv_it)
{
p2 = this->point(fv_it);
n += vector_cast<Normal>(calc_face_normal(p0, p1, p2));

2
src/OpenMesh/Core/Mesh/TriConnectivity.cc
View File

@@ -160,7 +160,7 @@ bool TriConnectivity::is_collapse_ok(HalfedgeHandle v0v1)
status(vv_it).set_tagged(true);
for (vv_it = vv_iter(v0); vv_it; ++vv_it)
if (status(vv_it).tagged() && vv_it.handle() != vl && vv_it.handle() != vr)
if (status(vv_it).tagged() && *vv_it != vl && *vv_it != vr)
return false;