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

Merge branch 'midpoint_unittest' into 'master'

Browse Source 
Midpoint unittest

See merge request !119
This commit is contained in:
Jan Möbius
2017-01-16 09:25:19 +01:00
parent b3bd58a378 ca7abc7e30
commit 6b518742b4
2 changed files with 256 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/OpenMesh/Tools/Subdivider/Uniform/MidpointT.hh
View File

@@ -13,7 +13,7 @@ namespace Uniform {
/**
* Midpoint subdivision algorithm.
*
* With every step, the set of vertices is replaced with by the midpoints of all
* With every step, the set of vertices is replaced by the midpoints of all
* current edges. Then, two sets of faces are created to set up the new
* connectivity: From all midpoints of edges surrounding an original face, a new
* face is created. Also, for all midpoints of edges surrounding an original
@@ -47,6 +47,10 @@ protected: // SubdividerT interface
//! @note The _update_points option is ignored
bool subdivide(mesh_t& _m, size_t _n, const bool _update_points = true)
{
_m.request_halfedge_status();
_m.request_edge_status();
_m.request_vertex_status();
_m.request_face_status();
PropertyManager<EPropHandleT<typename mesh_t::VertexHandle>, mesh_t> edge_midpoint(_m, "edge_midpoint");
PropertyManager<VPropHandleT<bool>, mesh_t> is_original_vertex(_m, "is_original_vertex");
@@ -90,6 +94,7 @@ protected: // SubdividerT interface
_m.delete_vertex(vh);
}
}
_m.garbage_collection();
}
return true;
}

115
src/Unittests/unittests_subdivider_uniform.cc
View File

@@ -3,22 +3,19 @@
#include <Unittests/unittests_common.hh>
#include <OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh>
#include <OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh>
#include <OpenMesh/Tools/Subdivider/Uniform/MidpointT.hh>
namespace {
class OpenMeshSubdividerUniform_Poly : public OpenMeshBasePoly {
protected:
// This function is called before each test is run
virtual void SetUp() {
// Do some initial stuff with the member data here...
}
// This function is called after all tests are through
virtual void TearDown() {
// Do some final stuff with the member data here...
}
@@ -27,18 +24,14 @@ class OpenMeshSubdividerUniform_Poly : public OpenMeshBasePoly {
};
class OpenMeshSubdividerUniform_Triangle : public OpenMeshBase {
protected:
// This function is called before each test is run
virtual void SetUp() {
// Do some initial stuff with the member data here...
}
// This function is called after all tests are through
virtual void TearDown() {
// Do some final stuff with the member data here...
}
@@ -52,10 +45,7 @@ class OpenMeshSubdividerUniform_Triangle : public OpenMeshBase {
* ====================================================================
*/
/*
*/
TEST_F(OpenMeshSubdividerUniform_Triangle, Subdivider_Loop) {
TEST_F(OpenMeshSubdividerUniform_Triangle, Subdivider_Sqrt3) {
mesh_.clear();
// Add some vertices
@@ -155,7 +145,6 @@ TEST_F(OpenMeshSubdividerUniform_Triangle, Subdivider_Loop) {
// Check setup
EXPECT_EQ(121u, mesh_.n_vertices() ) << "Wrong number of vertices after subdivision with sqrt3";
EXPECT_EQ(216u, mesh_.n_faces() ) << "Wrong number of faces after subdivision with sqrt3";
}
/*
@@ -167,7 +156,6 @@ TEST_F(OpenMeshSubdividerUniform_Triangle, Subdivider_Loop) {
/*
*/
TEST_F(OpenMeshSubdividerUniform_Poly, Subdivider_CatmullClark) {
mesh_.clear();
// Add some vertices
@@ -242,6 +230,103 @@ TEST_F(OpenMeshSubdividerUniform_Poly, Subdivider_CatmullClark) {
EXPECT_EQ(289u, mesh_.n_vertices() ) << "Wrong number of vertices after subdivision with catmull clark";
EXPECT_EQ(256u, mesh_.n_faces() ) << "Wrong number of faces after subdivision with catmull clark";
}
/* Adds a cube to a polymesh
*/
TEST_F(OpenMeshSubdividerUniform_Poly, Midpoint) {
mesh_.clear();
// Add some vertices
Mesh::VertexHandle vhandle[8];
vhandle[0] = mesh_.add_vertex(PolyMesh::Point(-1, -1, 1));
vhandle[1] = mesh_.add_vertex(PolyMesh::Point( 1, -1, 1));
vhandle[2] = mesh_.add_vertex(PolyMesh::Point( 1, 1, 1));
vhandle[3] = mesh_.add_vertex(PolyMesh::Point(-1, 1, 1));
vhandle[4] = mesh_.add_vertex(PolyMesh::Point(-1, -1, -1));
vhandle[5] = mesh_.add_vertex(PolyMesh::Point( 1, -1, -1));
vhandle[6] = mesh_.add_vertex(PolyMesh::Point( 1, 1, -1));
vhandle[7] = mesh_.add_vertex(PolyMesh::Point(-1, 1, -1));
// Add six faces to form a cube
std::vector<Mesh::VertexHandle> face_vhandles;
face_vhandles.clear();
face_vhandles.push_back(vhandle[0]);
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[2]);
face_vhandles.push_back(vhandle[3]);
mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[7]);
face_vhandles.push_back(vhandle[6]);
face_vhandles.push_back(vhandle[5]);
face_vhandles.push_back(vhandle[4]);
mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[0]);
face_vhandles.push_back(vhandle[4]);
face_vhandles.push_back(vhandle[5]);
mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[2]);
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[5]);
face_vhandles.push_back(vhandle[6]);
mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[3]);
face_vhandles.push_back(vhandle[2]);
face_vhandles.push_back(vhandle[6]);
face_vhandles.push_back(vhandle[7]);
mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[0]);
face_vhandles.push_back(vhandle[3]);
face_vhandles.push_back(vhandle[7]);
face_vhandles.push_back(vhandle[4]);
mesh_.add_face(face_vhandles);
// Test setup:
//
//
// 3 ======== 2
// / /|
// / / | z
// 0 ======== 1 | |
// | | | | y
// | 7 | 6 | /
// | | / | /
// | |/ |/
// 4 ======== 5 -------> x
//
// Check setup
EXPECT_EQ(12u, mesh_.n_edges()) << "Wrong number of Edges";
EXPECT_EQ(24u, mesh_.n_halfedges()) << "Wrong number of HalfEdges";
EXPECT_EQ(8u, mesh_.n_vertices()) << "Wrong number of vertices";
EXPECT_EQ(6u, mesh_.n_faces()) << "Wrong number of faces";
// Initialize subdivider
OpenMesh::Subdivider::Uniform::MidpointT<PolyMesh> midpoint;
// Execute 2 subdivision steps
midpoint.attach(mesh_);
midpoint(2);
midpoint.detach();
// Check Result
EXPECT_EQ(48u, mesh_.n_edges()) << "Wrong number of Edges";
EXPECT_EQ(96u, mesh_.n_halfedges()) << "Wrong number of HalfEdges";
EXPECT_EQ(24u, mesh_.n_vertices()) << "Wrong number of vertices";
EXPECT_EQ(26u, mesh_.n_faces()) << "Wrong number of faces";
}
}
}