From 6fef88d56f2dd6f643316d1545ca26b4acd70052 Mon Sep 17 00:00:00 2001 From: Max Lyon Date: Fri, 17 Feb 2017 18:20:46 +0100 Subject: [PATCH 1/2] fix halfedge indices in OpenMeshTrimeshCirculatorHalfedgeLoop CWAndCCWCheck --- src/Unittests/unittests_trimesh_circulator_halfedge_loop.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Unittests/unittests_trimesh_circulator_halfedge_loop.cc b/src/Unittests/unittests_trimesh_circulator_halfedge_loop.cc index 14283856..a5e19488 100644 --- a/src/Unittests/unittests_trimesh_circulator_halfedge_loop.cc +++ b/src/Unittests/unittests_trimesh_circulator_halfedge_loop.cc @@ -287,7 +287,7 @@ TEST_F(OpenMeshTrimeshCirculatorHalfedgeLoop, CWAndCCWCheck) { */ - int indices[4] = {3, 8, 6, 3}; + int indices[4] = {3, 6, 8, 3}; int rev_indices[4]; std::reverse_copy(indices,indices+4,rev_indices); From 1f331456e5291a30d8ecff012f7557b1744d538d Mon Sep 17 00:00:00 2001 From: Martin Schultz Date: Mon, 20 Feb 2017 15:40:08 +0100 Subject: [PATCH 2/2] fix wrong behaviour of HalfedgeLoopIterators by changing the template parameter --- src/OpenMesh/Core/Mesh/PolyConnectivity.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenMesh/Core/Mesh/PolyConnectivity.hh b/src/OpenMesh/Core/Mesh/PolyConnectivity.hh index c7e966e3..5dfc9daf 100644 --- a/src/OpenMesh/Core/Mesh/PolyConnectivity.hh +++ b/src/OpenMesh/Core/Mesh/PolyConnectivity.hh @@ -192,12 +192,12 @@ public: &Iterators::GenericCirculatorBaseT::toHalfedgeHandle> HalfedgeLoopIter; typedef Iterators::GenericCirculatorT::toHalfedgeHandle> HalfedgeLoopCWIter; + &Iterators::GenericCirculatorBaseT::toHalfedgeHandle, false> HalfedgeLoopCWIter; /** * Identical to #FaceHalfedgeIter. God knows why this typedef exists. */ typedef Iterators::GenericCirculatorT::toHalfedgeHandle, false> + &Iterators::GenericCirculatorBaseT::toHalfedgeHandle> HalfedgeLoopCCWIter; typedef VertexVertexIter ConstVertexVertexIter;