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

Changed holefiller test case

Browse Source
This commit is contained in:
Jan Möbius
2024-02-21 10:10:54 +01:00
parent 378c0a35b9
commit bd3cc17b78
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/OpenMesh/Tools/HoleFiller/HoleFillerT.hh
View File

@@ -75,9 +75,6 @@ public:
*/ */
void fill_hole( typename MeshT::EdgeHandle _eh, int _stages = 3 ); void fill_hole( typename MeshT::EdgeHandle _eh, int _stages = 3 );
private: private:
@@ -114,8 +111,8 @@ private:
Scalar area_; Scalar area_;
}; };
// Refine a face // Refine a face
bool refine( typename MeshT::FaceHandle _fh ); bool refine( typename MeshT::FaceHandle _fh );
// Relax an edge // Relax an edge
bool relax_edge( OpenMesh::SmartEdgeHandle _eh ); 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 >::iterator VHVecIter;
typedef typename std::vector< typename MeshT::VertexHandle >::const_iterator CVHVecIter; 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 >::iterator FHVecIter;
typedef typename std::vector< typename MeshT::FaceHandle >::const_iterator CFHVecIter; typedef typename std::vector< typename MeshT::FaceHandle >::const_iterator CFHVecIter;

BIN
src/Unittests/TestFiles/cube_2holes.off
View File

Binary file not shown.

8
src/Unittests/unittests_holefiller.cc
View File

@@ -43,8 +43,8 @@ TEST_F(OpenMeshHoleFiller_Triangle,Triangle_Hole_Filling) {
ASSERT_TRUE(ok); ASSERT_TRUE(ok);
// Check setup // Check setup
EXPECT_EQ(5219u, mesh_.n_vertices() ) << "Wrong number of vertices"; EXPECT_EQ(1456u, mesh_.n_vertices() ) << "Wrong number of vertices";
EXPECT_EQ(10369u, mesh_.n_faces() ) << "Wrong number of faces"; EXPECT_EQ(2864u, mesh_.n_faces() ) << "Wrong number of faces";
// Initialize subdivider // Initialize subdivider
@@ -55,8 +55,8 @@ TEST_F(OpenMeshHoleFiller_Triangle,Triangle_Hole_Filling) {
filler.fill_all_holes(); filler.fill_all_holes();
EXPECT_EQ(5330u, mesh_.n_vertices() ) << "Wrong number of vertices after smoothing?"; EXPECT_EQ(1507u, mesh_.n_vertices() ) << "Wrong number of vertices after smoothing?";
EXPECT_EQ(10656u, mesh_.n_faces() ) << "Wrong number of faces after smoothing?"; EXPECT_EQ(3010u, mesh_.n_faces() ) << "Wrong number of faces after smoothing?";
} }