Added unittest for midpoint algorithm
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
#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 {
|
||||
|
||||
@@ -244,4 +245,146 @@ TEST_F(OpenMeshSubdividerUniform_Poly, Subdivider_CatmullClark) {
|
||||
EXPECT_EQ(256u, mesh_.n_faces() ) << "Wrong number of faces after subdivision with catmull clark";
|
||||
|
||||
}
|
||||
|
||||
/* Adds a cube to a trimesh
|
||||
*/
|
||||
TEST_F(OpenMeshSubdividerUniform_Triangle,Midpoint) {
|
||||
|
||||
mesh_.clear();
|
||||
|
||||
// Add some vertices
|
||||
Mesh::VertexHandle vhandle[8];
|
||||
vhandle[0] = mesh_.add_vertex(Mesh::Point(-1, -1, 1));
|
||||
vhandle[1] = mesh_.add_vertex(Mesh::Point( 1, -1, 1));
|
||||
vhandle[2] = mesh_.add_vertex(Mesh::Point( 1, 1, 1));
|
||||
vhandle[3] = mesh_.add_vertex(Mesh::Point(-1, 1, 1));
|
||||
vhandle[4] = mesh_.add_vertex(Mesh::Point(-1, -1, -1));
|
||||
vhandle[5] = mesh_.add_vertex(Mesh::Point( 1, -1, -1));
|
||||
vhandle[6] = mesh_.add_vertex(Mesh::Point( 1, 1, -1));
|
||||
vhandle[7] = mesh_.add_vertex(Mesh::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[3]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
face_vhandles.clear();
|
||||
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]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
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]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[1]);
|
||||
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]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[2]);
|
||||
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]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
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]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[0]);
|
||||
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(18u, mesh_.n_edges() ) << "Wrong number of Edges";
|
||||
EXPECT_EQ(36u, mesh_.n_halfedges() ) << "Wrong number of HalfEdges";
|
||||
EXPECT_EQ(8u, mesh_.n_vertices() ) << "Wrong number of vertices";
|
||||
EXPECT_EQ(12u, mesh_.n_faces() ) << "Wrong number of faces";
|
||||
|
||||
// Initialize subdivider
|
||||
OpenMesh::Subdivider::Uniform::MidpointT<Mesh> midpoint;
|
||||
|
||||
// Execute 3 subdivision steps
|
||||
midpoint.attach(mesh_);
|
||||
midpoint( 2 );
|
||||
midpoint.detach();
|
||||
|
||||
// Check Result
|
||||
EXPECT_EQ(18u, mesh_.n_edges() ) << "Wrong number of Edges";
|
||||
EXPECT_EQ(36u, mesh_.n_halfedges() ) << "Wrong number of HalfEdges";
|
||||
EXPECT_EQ(8u, mesh_.n_vertices() ) << "Wrong number of vertices";
|
||||
EXPECT_EQ(12u, mesh_.n_faces() ) << "Wrong number of faces";
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user