diff --git a/src/OpenMesh/Tools/HoleFiller/HoleFillerT.hh b/src/OpenMesh/Tools/HoleFiller/HoleFillerT.hh index edbc43cb..5eeebd5d 100644 --- a/src/OpenMesh/Tools/HoleFiller/HoleFillerT.hh +++ b/src/OpenMesh/Tools/HoleFiller/HoleFillerT.hh @@ -75,9 +75,6 @@ public: */ void fill_hole( typename MeshT::EdgeHandle _eh, int _stages = 3 ); - - - private: @@ -114,8 +111,8 @@ private: Scalar area_; }; - // Refine a face - bool refine( typename MeshT::FaceHandle _fh ); + // Refine a face + bool refine( typename MeshT::FaceHandle _fh ); // Relax an edge bool relax_edge( OpenMesh::SmartEdgeHandle _eh ); @@ -159,15 +156,15 @@ private: / \ / \ / \ / \ / \ / \ \ / \ / - * * <- opposite_vertex_ + * * <- opposite_vertex_ */ - typedef std::vector< typename MeshT::VertexHandle > VHVec; + typedef std::vector< typename MeshT::VertexHandle > VHVec; typedef typename std::vector< typename MeshT::VertexHandle >::iterator VHVecIter; typedef typename std::vector< typename MeshT::VertexHandle >::const_iterator CVHVecIter; - typedef std::vector< typename MeshT::FaceHandle > FHVec; + typedef std::vector< typename MeshT::FaceHandle > FHVec; typedef typename std::vector< typename MeshT::FaceHandle >::iterator FHVecIter; typedef typename std::vector< typename MeshT::FaceHandle >::const_iterator CFHVecIter; diff --git a/src/Unittests/TestFiles/cube_2holes.off b/src/Unittests/TestFiles/cube_2holes.off index 477d928c..5885d05c 100644 Binary files a/src/Unittests/TestFiles/cube_2holes.off and b/src/Unittests/TestFiles/cube_2holes.off differ diff --git a/src/Unittests/unittests_holefiller.cc b/src/Unittests/unittests_holefiller.cc index 86bbc089..f5c48087 100644 --- a/src/Unittests/unittests_holefiller.cc +++ b/src/Unittests/unittests_holefiller.cc @@ -43,8 +43,8 @@ TEST_F(OpenMeshHoleFiller_Triangle,Triangle_Hole_Filling) { ASSERT_TRUE(ok); // Check setup - EXPECT_EQ(5219u, mesh_.n_vertices() ) << "Wrong number of vertices"; - EXPECT_EQ(10369u, mesh_.n_faces() ) << "Wrong number of faces"; + EXPECT_EQ(1456u, mesh_.n_vertices() ) << "Wrong number of vertices"; + EXPECT_EQ(2864u, mesh_.n_faces() ) << "Wrong number of faces"; // Initialize subdivider @@ -55,8 +55,8 @@ TEST_F(OpenMeshHoleFiller_Triangle,Triangle_Hole_Filling) { filler.fill_all_holes(); - EXPECT_EQ(5330u, mesh_.n_vertices() ) << "Wrong number of vertices after smoothing?"; - EXPECT_EQ(10656u, mesh_.n_faces() ) << "Wrong number of faces after smoothing?"; + EXPECT_EQ(1507u, mesh_.n_vertices() ) << "Wrong number of vertices after smoothing?"; + EXPECT_EQ(3010u, mesh_.n_faces() ) << "Wrong number of faces after smoothing?"; }