remove TriMesh test case for Midpoint subdivision
This commit is contained in:
Janis Born
@@ -8,40 +8,32 @@
|
||||
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...
|
||||
}
|
||||
|
||||
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...
|
||||
}
|
||||
// This function is called after all tests are through
|
||||
virtual void TearDown() {
|
||||
// Do some final stuff with the member data here...
|
||||
}
|
||||
|
||||
// Member already defined in OpenMeshBase
|
||||
//Mesh mesh_;
|
||||
};
|
||||
|
||||
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...
|
||||
}
|
||||
|
||||
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...
|
||||
}
|
||||
// This function is called after all tests are through
|
||||
virtual void TearDown() {
|
||||
// Do some final stuff with the member data here...
|
||||
}
|
||||
|
||||
// Member already defined in OpenMeshBase
|
||||
//Mesh mesh_;
|
||||
@@ -53,110 +45,106 @@ class OpenMeshSubdividerUniform_Triangle : public OpenMeshBase {
|
||||
* ====================================================================
|
||||
*/
|
||||
|
||||
/*
|
||||
*/
|
||||
TEST_F(OpenMeshSubdividerUniform_Triangle, Subdivider_Loop) {
|
||||
TEST_F(OpenMeshSubdividerUniform_Triangle, Subdivider_Sqrt3) {
|
||||
mesh_.clear();
|
||||
|
||||
mesh_.clear();
|
||||
// Add some vertices
|
||||
Mesh::VertexHandle vhandle[9];
|
||||
|
||||
// Add some vertices
|
||||
Mesh::VertexHandle vhandle[9];
|
||||
vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 0, 0));
|
||||
vhandle[1] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
|
||||
vhandle[2] = mesh_.add_vertex(Mesh::Point(0, 2, 0));
|
||||
vhandle[3] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
|
||||
vhandle[4] = mesh_.add_vertex(Mesh::Point(1, 1, 0));
|
||||
vhandle[5] = mesh_.add_vertex(Mesh::Point(1, 2, 0));
|
||||
vhandle[6] = mesh_.add_vertex(Mesh::Point(2, 0, 0));
|
||||
vhandle[7] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
|
||||
vhandle[8] = mesh_.add_vertex(Mesh::Point(2, 2, 0));
|
||||
|
||||
vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 0, 0));
|
||||
vhandle[1] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
|
||||
vhandle[2] = mesh_.add_vertex(Mesh::Point(0, 2, 0));
|
||||
vhandle[3] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
|
||||
vhandle[4] = mesh_.add_vertex(Mesh::Point(1, 1, 0));
|
||||
vhandle[5] = mesh_.add_vertex(Mesh::Point(1, 2, 0));
|
||||
vhandle[6] = mesh_.add_vertex(Mesh::Point(2, 0, 0));
|
||||
vhandle[7] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
|
||||
vhandle[8] = mesh_.add_vertex(Mesh::Point(2, 2, 0));
|
||||
// Add eight faces
|
||||
std::vector<Mesh::VertexHandle> face_vhandles;
|
||||
|
||||
// Add eight faces
|
||||
std::vector<Mesh::VertexHandle> face_vhandles;
|
||||
face_vhandles.push_back(vhandle[0]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
|
||||
face_vhandles.push_back(vhandle[0]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[0]);
|
||||
face_vhandles.push_back(vhandle[1]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
|
||||
face_vhandles.push_back(vhandle[0]);
|
||||
face_vhandles.push_back(vhandle[1]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
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[4]);
|
||||
|
||||
face_vhandles.push_back(vhandle[1]);
|
||||
face_vhandles.push_back(vhandle[2]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
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[4]);
|
||||
|
||||
face_vhandles.push_back(vhandle[2]);
|
||||
face_vhandles.push_back(vhandle[5]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
face_vhandles.push_back(vhandle[6]);
|
||||
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
face_vhandles.push_back(vhandle[6]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[8]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[8]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[5]);
|
||||
face_vhandles.push_back(vhandle[8]);
|
||||
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[5]);
|
||||
face_vhandles.push_back(vhandle[8]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
// Test setup:
|
||||
// 6 === 7 === 8
|
||||
// | / | / |
|
||||
// | / | / |
|
||||
// | / | / |
|
||||
// 3 === 4 === 5
|
||||
// | / | \ |
|
||||
// | / | \ |
|
||||
// | / | \ |
|
||||
// 0 === 1 === 2
|
||||
|
||||
// Test setup:
|
||||
// 6 === 7 === 8
|
||||
// | / | / |
|
||||
// | / | / |
|
||||
// | / | / |
|
||||
// 3 === 4 === 5
|
||||
// | / | \ |
|
||||
// | / | \ |
|
||||
// | / | \ |
|
||||
// 0 === 1 === 2
|
||||
// Initialize subdivider
|
||||
OpenMesh::Subdivider::Uniform::Sqrt3T<Mesh> sqrt3;
|
||||
|
||||
// Initialize subdivider
|
||||
OpenMesh::Subdivider::Uniform::Sqrt3T<Mesh> sqrt3;
|
||||
// Check setup
|
||||
EXPECT_EQ(9u, mesh_.n_vertices() ) << "Wrong number of vertices";
|
||||
EXPECT_EQ(8u, mesh_.n_faces() ) << "Wrong number of faces";
|
||||
|
||||
// Check setup
|
||||
EXPECT_EQ(9u, mesh_.n_vertices() ) << "Wrong number of vertices";
|
||||
EXPECT_EQ(8u, mesh_.n_faces() ) << "Wrong number of faces";
|
||||
|
||||
// Execute 3 subdivision steps
|
||||
sqrt3.attach(mesh_);
|
||||
sqrt3( 3 );
|
||||
sqrt3.detach();
|
||||
|
||||
// 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";
|
||||
// Execute 3 subdivision steps
|
||||
sqrt3.attach(mesh_);
|
||||
sqrt3( 3 );
|
||||
sqrt3.detach();
|
||||
|
||||
// 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";
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -168,323 +156,177 @@ TEST_F(OpenMeshSubdividerUniform_Triangle, Subdivider_Loop) {
|
||||
/*
|
||||
*/
|
||||
TEST_F(OpenMeshSubdividerUniform_Poly, Subdivider_CatmullClark) {
|
||||
mesh_.clear();
|
||||
|
||||
mesh_.clear();
|
||||
// Add some vertices
|
||||
Mesh::VertexHandle vhandle[9];
|
||||
|
||||
// Add some vertices
|
||||
Mesh::VertexHandle vhandle[9];
|
||||
vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 0, 0));
|
||||
vhandle[1] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
|
||||
vhandle[2] = mesh_.add_vertex(Mesh::Point(0, 2, 0));
|
||||
vhandle[3] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
|
||||
vhandle[4] = mesh_.add_vertex(Mesh::Point(1, 1, 0));
|
||||
vhandle[5] = mesh_.add_vertex(Mesh::Point(1, 2, 0));
|
||||
vhandle[6] = mesh_.add_vertex(Mesh::Point(2, 0, 0));
|
||||
vhandle[7] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
|
||||
vhandle[8] = mesh_.add_vertex(Mesh::Point(2, 2, 0));
|
||||
|
||||
vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 0, 0));
|
||||
vhandle[1] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
|
||||
vhandle[2] = mesh_.add_vertex(Mesh::Point(0, 2, 0));
|
||||
vhandle[3] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
|
||||
vhandle[4] = mesh_.add_vertex(Mesh::Point(1, 1, 0));
|
||||
vhandle[5] = mesh_.add_vertex(Mesh::Point(1, 2, 0));
|
||||
vhandle[6] = mesh_.add_vertex(Mesh::Point(2, 0, 0));
|
||||
vhandle[7] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
|
||||
vhandle[8] = mesh_.add_vertex(Mesh::Point(2, 2, 0));
|
||||
// Add four faces
|
||||
std::vector<Mesh::VertexHandle> face_vhandles;
|
||||
|
||||
// Add four faces
|
||||
std::vector<Mesh::VertexHandle> face_vhandles;
|
||||
face_vhandles.push_back(vhandle[0]);
|
||||
face_vhandles.push_back(vhandle[1]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
|
||||
face_vhandles.push_back(vhandle[0]);
|
||||
face_vhandles.push_back(vhandle[1]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
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[5]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
|
||||
face_vhandles.push_back(vhandle[1]);
|
||||
face_vhandles.push_back(vhandle[2]);
|
||||
face_vhandles.push_back(vhandle[5]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[5]);
|
||||
face_vhandles.push_back(vhandle[8]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[5]);
|
||||
face_vhandles.push_back(vhandle[8]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
face_vhandles.clear();
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
face_vhandles.push_back(vhandle[6]);
|
||||
|
||||
face_vhandles.push_back(vhandle[3]);
|
||||
face_vhandles.push_back(vhandle[4]);
|
||||
face_vhandles.push_back(vhandle[7]);
|
||||
face_vhandles.push_back(vhandle[6]);
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
// Test setup:
|
||||
// 6 === 7 === 8
|
||||
// | | |
|
||||
// | | |
|
||||
// | | |
|
||||
// 3 === 4 === 5
|
||||
// | | |
|
||||
// | | |
|
||||
// | | |
|
||||
// 0 === 1 === 2
|
||||
|
||||
// Test setup:
|
||||
// 6 === 7 === 8
|
||||
// | | |
|
||||
// | | |
|
||||
// | | |
|
||||
// 3 === 4 === 5
|
||||
// | | |
|
||||
// | | |
|
||||
// | | |
|
||||
// 0 === 1 === 2
|
||||
// Initialize subdivider
|
||||
OpenMesh::Subdivider::Uniform::CatmullClarkT<PolyMesh> catmull;
|
||||
|
||||
// Initialize subdivider
|
||||
OpenMesh::Subdivider::Uniform::CatmullClarkT<PolyMesh> catmull;
|
||||
// Check setup
|
||||
EXPECT_EQ(9u, mesh_.n_vertices() ) << "Wrong number of vertices";
|
||||
EXPECT_EQ(4u, mesh_.n_faces() ) << "Wrong number of faces";
|
||||
|
||||
// Check setup
|
||||
EXPECT_EQ(9u, mesh_.n_vertices() ) << "Wrong number of vertices";
|
||||
EXPECT_EQ(4u, mesh_.n_faces() ) << "Wrong number of faces";
|
||||
|
||||
// Execute 3 subdivision steps
|
||||
catmull.attach(mesh_);
|
||||
catmull( 3 );
|
||||
catmull.detach();
|
||||
|
||||
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 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 2 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";
|
||||
// Execute 3 subdivision steps
|
||||
catmull.attach(mesh_);
|
||||
catmull( 3 );
|
||||
catmull.detach();
|
||||
|
||||
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();
|
||||
|
||||
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 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;
|
||||
|
||||
// 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[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[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[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[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[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);
|
||||
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
|
||||
//
|
||||
// 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";
|
||||
// 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;
|
||||
// Initialize subdivider
|
||||
OpenMesh::Subdivider::Uniform::MidpointT<PolyMesh> midpoint;
|
||||
|
||||
// Execute 2 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";
|
||||
// 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";
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user