Added catmull clark subdivider. Thanks to Leon Kos for the code.
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@609 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
@@ -7,6 +7,7 @@
|
||||
#include "unittests_trimesh_collapse.hh"
|
||||
#include "unittests_trimesh_circulators.hh"
|
||||
#include "unittests_decimater.hh"
|
||||
#include "unittests_subdivider.hh"
|
||||
#include "unittests_trimesh_normal_calculations.hh"
|
||||
#include "unittests_trimesh_others.hh"
|
||||
#include "unittests_add_face.hh"
|
||||
|
||||
248
src/Unittests/unittests_subdivider.hh
Normal file
248
src/Unittests/unittests_subdivider.hh
Normal file
@@ -0,0 +1,248 @@
|
||||
#ifndef INCLUDE_UNITTESTS_SUBIVIDER_HH
|
||||
#define INCLUDE_UNITTESTS_SUBIVIDER_HH
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
#include <Unittests/unittests_common.hh>
|
||||
#include <OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh>
|
||||
#include <OpenMesh/Tools/Subdivider/Uniform/Sqrt3T.hh>
|
||||
|
||||
class OpenMeshSubdivider_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...
|
||||
}
|
||||
|
||||
// Member already defined in OpenMeshBase
|
||||
//Mesh mesh_;
|
||||
};
|
||||
|
||||
class OpenMeshSubdivider_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...
|
||||
}
|
||||
|
||||
// Member already defined in OpenMeshBase
|
||||
//Mesh mesh_;
|
||||
};
|
||||
|
||||
/*
|
||||
* ====================================================================
|
||||
* Define tests below
|
||||
* ====================================================================
|
||||
*/
|
||||
|
||||
/*
|
||||
*/
|
||||
TEST_F(OpenMeshSubdivider_Triangle, Subdivider_Loop) {
|
||||
|
||||
mesh_.clear();
|
||||
|
||||
// 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));
|
||||
|
||||
// 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]);
|
||||
|
||||
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]);
|
||||
|
||||
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]);
|
||||
|
||||
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]);
|
||||
|
||||
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]);
|
||||
|
||||
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]);
|
||||
|
||||
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]);
|
||||
|
||||
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]);
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
// Test setup:
|
||||
// 6 === 7 === 8
|
||||
// | / | / |
|
||||
// | / | / |
|
||||
// | / | / |
|
||||
// 3 === 4 === 5
|
||||
// | / | \ |
|
||||
// | / | \ |
|
||||
// | / | \ |
|
||||
// 0 === 1 === 2
|
||||
|
||||
// Initialize subdivider
|
||||
OpenMesh::Subdivider::Uniform::Sqrt3T<Mesh> sqrt3;
|
||||
|
||||
// Check setup
|
||||
EXPECT_EQ(9, mesh_.n_vertices() ) << "Wrong number of vertices";
|
||||
EXPECT_EQ(8, mesh_.n_faces() ) << "Wrong number of faces";
|
||||
|
||||
// Execute 3 subdivision steps
|
||||
sqrt3.attach(mesh_);
|
||||
sqrt3( 3 );
|
||||
sqrt3.detach();
|
||||
|
||||
// Check setup
|
||||
EXPECT_EQ(121, mesh_.n_vertices() ) << "Wrong number of vertices after subdivision with sqrt3";
|
||||
EXPECT_EQ(216, mesh_.n_faces() ) << "Wrong number of faces after subdivision with sqrt3";
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* ====================================================================
|
||||
* Define tests below
|
||||
* ====================================================================
|
||||
*/
|
||||
|
||||
/*
|
||||
*/
|
||||
TEST_F(OpenMeshSubdivider_Poly, Subdivider_CatmullClark) {
|
||||
|
||||
mesh_.clear();
|
||||
|
||||
// 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));
|
||||
|
||||
// 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]);
|
||||
|
||||
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]);
|
||||
|
||||
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]);
|
||||
|
||||
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]);
|
||||
|
||||
mesh_.add_face(face_vhandles);
|
||||
|
||||
// Test setup:
|
||||
// 6 === 7 === 8
|
||||
// | | |
|
||||
// | | |
|
||||
// | | |
|
||||
// 3 === 4 === 5
|
||||
// | | |
|
||||
// | | |
|
||||
// | | |
|
||||
// 0 === 1 === 2
|
||||
|
||||
// Initialize subdivider
|
||||
OpenMesh::Subdivider::Uniform::CatmullClarkT<PolyMesh> catmull;
|
||||
|
||||
// Check setup
|
||||
EXPECT_EQ(9, mesh_.n_vertices() ) << "Wrong number of vertices";
|
||||
EXPECT_EQ(4, mesh_.n_faces() ) << "Wrong number of faces";
|
||||
|
||||
// Execute 3 subdivision steps
|
||||
catmull.attach(mesh_);
|
||||
catmull( 3 );
|
||||
catmull.detach();
|
||||
|
||||
EXPECT_EQ(289, mesh_.n_vertices() ) << "Wrong number of vertices after subdivision with catmull clark";
|
||||
EXPECT_EQ(256, mesh_.n_faces() ) << "Wrong number of faces after subdivision with catmull clark";
|
||||
|
||||
}
|
||||
|
||||
#endif // INCLUDE GUARD
|
||||
Reference in New Issue
Block a user