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

- marked current_halfedge_handle as deprecated

Browse Source 
- updated code to fix related warnings
- added some unittests to ensure unchanged behaviour when replacing current_halfedge_handle

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@917 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Isaak Lim
2013-08-08 12:47:48 +00:00
parent cb16ac26d6
commit 2eeb756b6a
7 changed files with 346 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/OpenMesh/Tools/Decimater/ModAspectRatioT.cc
View File

@@ -134,19 +134,20 @@ float ModAspectRatioT<MeshT>::collapse_priority(const CollapseInfo& _ci) {
typename Mesh::FaceHandle fh;
const typename Mesh::Point *p1(&_ci.p1), *p2, *p3;
typename Mesh::Scalar r0, r1, r0_min(1.0), r1_min(1.0);
typename Mesh::CVVIter vv_it(mesh_, _ci.v0);
typename Mesh::ConstVertexOHalfedgeIter voh_it(mesh_, _ci.v0);
v3 = *vv_it;
v3 = mesh_.to_vertex_handle(*voh_it);
p3 = &mesh_.point(v3);
while (vv_it.is_valid()) {
while (voh_it.is_valid()) {
v2 = v3;
p2 = p3;
v3 = *(++vv_it);
++voh_it;
v3 = mesh_.to_vertex_handle(*voh_it);
p3 = &mesh_.point(v3);
fh = mesh_.face_handle(vv_it.current_halfedge_handle());
fh = mesh_.face_handle(*voh_it);
// if not boundary
if (fh.is_valid()) {