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

moved face* circulators to old behavior

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1234 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
2015-03-04 15:47:04 +00:00
parent 4cd1955f4b
commit 4020a879e6
6 changed files with 424 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenMesh/Core/Mesh/CirculatorsT.hh
View File

@@ -370,6 +370,11 @@ class GenericCirculatorT : protected GenericCirculatorBaseT<Mesh> {
// OpenMeshTrimeshCirculatorVertexOHalfEdge.VertexOHalfEdgeIterCheckInvalidationAtEnds
// OpenMeshTrimeshCirculatorVertexFace.VertexFaceIterCheckInvalidationAtEnds
// OpenMeshTrimeshCirculatorVertexFace.VertexFaceIterWithoutHolesDecrement
// OpenMeshTrimeshCirculatorFaceEdge.FaceEdgeIterCheckInvalidationAtEnds
// OpenMeshTrimeshCirculatorFaceFace.FaceFaceIterCheckInvalidationAtEnds
// OpenMeshTrimeshCirculatorFaceHalfEdge.FaceHalfedgeIterWithoutHolesIncrement
// OpenMeshTrimeshCirculatorFaceVertex.FaceVertexIterCheckInvalidationAtEnds
// OpenMeshTrimeshCirculatorFaceHalfEdge.FaceHalfedgeIterCheckInvalidationAtEnds
//
template<class Mesh, class CenterEntityHandle, class ValueHandle>

20
src/OpenMesh/Core/Mesh/PolyConnectivity.hh
View File

@@ -216,10 +216,11 @@ public:
/**
* Enumerate incident vertices in a counter clockwise fashion.
*/
typedef Iterators::GenericCirculatorT<This, This::FaceHandle, This::VertexHandle,
typedef Iterators::GenericCirculatorT_DEPRECATED<This, This::FaceHandle, This::VertexHandle,
&Iterators::GenericCirculatorBaseT<This>::toVertexHandle>
FaceVertexIter;
typedef FaceVertexIter FaceVertexCCWIter;
typedef Iterators::GenericCirculatorT<This, This::FaceHandle, This::VertexHandle,
&Iterators::GenericCirculatorBaseT<This>::toVertexHandle> FaceVertexCCWIter;
/**
* Enumerate incident vertices in a clockwise fashion.
@@ -231,10 +232,11 @@ public:
/**
* Enumerate incident half edges in a counter clockwise fashion.
*/
typedef Iterators::GenericCirculatorT<This, This::FaceHandle, This::HalfedgeHandle,
typedef Iterators::GenericCirculatorT_DEPRECATED<This, This::FaceHandle, This::HalfedgeHandle,
&Iterators::GenericCirculatorBaseT<This>::toHalfedgeHandle>
FaceHalfedgeIter;
typedef FaceHalfedgeIter FaceHalfedgeCCWIter;
typedef Iterators::GenericCirculatorT<This, This::FaceHandle, This::HalfedgeHandle,
&Iterators::GenericCirculatorBaseT<This>::toHalfedgeHandle> FaceHalfedgeCCWIter;
/**
* Enumerate incident half edges in a clockwise fashion.
@@ -246,10 +248,11 @@ public:
/**
* Enumerate incident edges in a counter clockwise fashion.
*/
typedef Iterators::GenericCirculatorT<This, This::FaceHandle, This::EdgeHandle,
typedef Iterators::GenericCirculatorT_DEPRECATED<This, This::FaceHandle, This::EdgeHandle,
&Iterators::GenericCirculatorBaseT<This>::toEdgeHandle>
FaceEdgeIter;
typedef FaceEdgeIter FaceEdgeCCWIter;
typedef Iterators::GenericCirculatorT<This, This::FaceHandle, This::EdgeHandle,
&Iterators::GenericCirculatorBaseT<This>::toEdgeHandle> FaceEdgeCCWIter;
/**
* Enumerate incident edges in a clockwise fashion.
@@ -261,10 +264,11 @@ public:
/**
* Enumerate adjacent faces in a counter clockwise fashion.
*/
typedef Iterators::GenericCirculatorT<This, This::FaceHandle, This::FaceHandle,
typedef Iterators::GenericCirculatorT_DEPRECATED<This, This::FaceHandle, This::FaceHandle,
&Iterators::GenericCirculatorBaseT<This>::toOppositeFaceHandle>
FaceFaceIter;
typedef FaceFaceIter FaceFaceCCWIter;
typedef Iterators::GenericCirculatorT<This, This::FaceHandle, This::FaceHandle,
&Iterators::GenericCirculatorBaseT<This>::toOppositeFaceHandle> FaceFaceCCWIter;
/**
* Enumerate adjacent faces in a clockwise fashion.

156
src/Unittests/unittests_trimesh_circulator_face_edge.cc
View File

@@ -273,84 +273,84 @@ TEST_F(OpenMeshTrimeshCirculatorFaceEdge, CWAndCCWTest) {
/*
* Test if the end iterator stays invalid after one lap
*/
TEST_F(OpenMeshTrimeshCirculatorFaceEdge, FaceEdgeIterCheckInvalidationAtEnds) {
mesh_.clear();
// Add some vertices
Mesh::VertexHandle vhandle[5];
vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
// Add two faces
std::vector<Mesh::VertexHandle> face_vhandles;
face_vhandles.push_back(vhandle[0]);
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[2]);
Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[3]);
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[1]);
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[4]);
mesh_.add_face(face_vhandles);
/* Test setup:
0 ==== 2
|\ 0 /|
| \ / |
|2 1 3|
| / \ |
|/ 1 \|
3 ==== 4 */
// Check if the end iterator stays invalid after end
Mesh::FaceEdgeIter endIter = mesh_.fe_end(fh0);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
++endIter ;
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
// Check if the end iterators becomes valid after decrement
endIter = mesh_.fe_end(fh0);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
--endIter;
EXPECT_TRUE(endIter.is_valid()) << "EndIter is invalid after decrement";
EXPECT_EQ(1,endIter->idx()) << "EndIter points on the wrong element";
// Check if the start iterator decrement is invalid
Mesh::FaceEdgeIter startIter = mesh_.fe_begin(fh0);
EXPECT_TRUE(startIter.is_valid()) << "StartIter is not valid";
--startIter;
EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
// Check if the start iterator becomes valid
++startIter;
EXPECT_TRUE(startIter.is_valid()) << "StartIter is invalid after re-incrementing";
EXPECT_EQ(startIter->idx(), mesh_.fe_begin(fh0)->idx()) << "StartIter points on the wrong element";
}
//TEST_F(OpenMeshTrimeshCirculatorFaceEdge, FaceEdgeIterCheckInvalidationAtEnds) {
//
// mesh_.clear();
//
// // Add some vertices
// Mesh::VertexHandle vhandle[5];
//
// vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
// vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
// vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
// vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
// vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
//
// // Add two faces
// std::vector<Mesh::VertexHandle> face_vhandles;
//
// face_vhandles.push_back(vhandle[0]);
// face_vhandles.push_back(vhandle[1]);
// face_vhandles.push_back(vhandle[2]);
// Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
//
// face_vhandles.clear();
//
// face_vhandles.push_back(vhandle[1]);
// face_vhandles.push_back(vhandle[3]);
// 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[1]);
// 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[4]);
// mesh_.add_face(face_vhandles);
//
// /* Test setup:
// 0 ==== 2
// |\ 0 /|
// | \ / |
// |2 1 3|
// | / \ |
// |/ 1 \|
// 3 ==== 4 */
//
//
// // Check if the end iterator stays invalid after end
// Mesh::FaceEdgeIter endIter = mesh_.fe_end(fh0);
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
// ++endIter ;
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
//
// // Check if the end iterators becomes valid after decrement
// endIter = mesh_.fe_end(fh0);
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
// --endIter;
// EXPECT_TRUE(endIter.is_valid()) << "EndIter is invalid after decrement";
// EXPECT_EQ(1,endIter->idx()) << "EndIter points on the wrong element";
//
//
// // Check if the start iterator decrement is invalid
// Mesh::FaceEdgeIter startIter = mesh_.fe_begin(fh0);
// EXPECT_TRUE(startIter.is_valid()) << "StartIter is not valid";
// --startIter;
// EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
//
// // Check if the start iterator becomes valid
// ++startIter;
// EXPECT_TRUE(startIter.is_valid()) << "StartIter is invalid after re-incrementing";
// EXPECT_EQ(startIter->idx(), mesh_.fe_begin(fh0)->idx()) << "StartIter points on the wrong element";
//
//}
/*

156
src/Unittests/unittests_trimesh_circulator_face_face.cc
View File

@@ -406,84 +406,84 @@ TEST_F(OpenMeshTrimeshCirculatorFaceFace, FaceFaceIteratorHandleConversion) {
/*
* Test if the end iterator stays invalid after one lap
*/
TEST_F(OpenMeshTrimeshCirculatorFaceFace, FaceFaceIterCheckInvalidationAtEnds) {
mesh_.clear();
// Add some vertices
Mesh::VertexHandle vhandle[5];
vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
// Add two faces
std::vector<Mesh::VertexHandle> face_vhandles;
face_vhandles.push_back(vhandle[0]);
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[2]);
Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[3]);
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[1]);
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[4]);
mesh_.add_face(face_vhandles);
/* Test setup:
0 ==== 2
|\ 0 /|
| \ / |
|2 1 3|
| / \ |
|/ 1 \|
3 ==== 4 */
// Check if the end iterator stays invalid after end
Mesh::FaceFaceIter endIter = mesh_.ff_end(fh0);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
++endIter ;
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
// Check if the end iterators becomes valid after decrement
endIter = mesh_.ff_end(fh0);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
--endIter;
EXPECT_TRUE(endIter.is_valid()) << "EndIter is invalid after decrement";
EXPECT_EQ(3,endIter->idx()) << "EndIter points on the wrong element";
// Check if the start iterator decrement is invalid
Mesh::FaceFaceIter startIter = mesh_.ff_begin(fh0);
EXPECT_TRUE(startIter.is_valid()) << "StartIter is not valid";
--startIter;
EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
// Check if the start iterator becomes valid
++startIter;
EXPECT_TRUE(startIter.is_valid()) << "StartIter is invalid after re-incrementing";
EXPECT_EQ(startIter->idx(), mesh_.ff_begin(fh0)->idx()) << "StartIter points on the wrong element";
}
//TEST_F(OpenMeshTrimeshCirculatorFaceFace, FaceFaceIterCheckInvalidationAtEnds) {
//
// mesh_.clear();
//
// // Add some vertices
// Mesh::VertexHandle vhandle[5];
//
// vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
// vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
// vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
// vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
// vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
//
// // Add two faces
// std::vector<Mesh::VertexHandle> face_vhandles;
//
// face_vhandles.push_back(vhandle[0]);
// face_vhandles.push_back(vhandle[1]);
// face_vhandles.push_back(vhandle[2]);
// Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
//
// face_vhandles.clear();
//
// face_vhandles.push_back(vhandle[1]);
// face_vhandles.push_back(vhandle[3]);
// 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[1]);
// 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[4]);
// mesh_.add_face(face_vhandles);
//
// /* Test setup:
// 0 ==== 2
// |\ 0 /|
// | \ / |
// |2 1 3|
// | / \ |
// |/ 1 \|
// 3 ==== 4 */
//
//
// // Check if the end iterator stays invalid after end
// Mesh::FaceFaceIter endIter = mesh_.ff_end(fh0);
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
// ++endIter ;
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
//
// // Check if the end iterators becomes valid after decrement
// endIter = mesh_.ff_end(fh0);
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
// --endIter;
// EXPECT_TRUE(endIter.is_valid()) << "EndIter is invalid after decrement";
// EXPECT_EQ(3,endIter->idx()) << "EndIter points on the wrong element";
//
//
// // Check if the start iterator decrement is invalid
// Mesh::FaceFaceIter startIter = mesh_.ff_begin(fh0);
// EXPECT_TRUE(startIter.is_valid()) << "StartIter is not valid";
// --startIter;
// EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
//
// // Check if the start iterator becomes valid
// ++startIter;
// EXPECT_TRUE(startIter.is_valid()) << "StartIter is invalid after re-incrementing";
// EXPECT_EQ(startIter->idx(), mesh_.ff_begin(fh0)->idx()) << "StartIter points on the wrong element";
//
//}
}

346
src/Unittests/unittests_trimesh_circulator_face_halfedge.cc
View File

@@ -36,97 +36,97 @@ class OpenMeshTrimeshCirculatorFaceHalfEdge : public OpenMeshBase {
/*
* Small FaceHalfedgeIterator Test
*/
TEST_F(OpenMeshTrimeshCirculatorFaceHalfEdge, FaceHalfedgeIterWithoutHolesIncrement) {
mesh_.clear();
// Add some vertices
Mesh::VertexHandle vhandle[6];
vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
vhandle[3] = mesh_.add_vertex(Mesh::Point(3, 0, 0));
vhandle[4] = mesh_.add_vertex(Mesh::Point(4, 1, 0));
vhandle[5] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
// Add three faces
std::vector<Mesh::VertexHandle> face_vhandles;
face_vhandles.push_back(vhandle[0]);
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[2]);
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[3]);
mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[2]);
face_vhandles.push_back(vhandle[3]);
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[5]);
face_vhandles.push_back(vhandle[3]);
mesh_.add_face(face_vhandles);
/* Test setup:
*
* 0 ------ 2 ------ 4
* \ / \ /
* \ 0 / \ 2 /
* \ / 1 \ /
* 1 ------- 3
* \ /
* \ 3 /
* \ /
* \ /
* 5
*/
Mesh::FaceHalfedgeIter fh_it = mesh_.fh_begin(mesh_.face_handle(1));
Mesh::FaceHalfedgeIter fh_end = mesh_.fh_end(mesh_.face_handle(1));
EXPECT_EQ(8, fh_it->idx() ) << "Index wrong in FaceHalfedgeIter at initialization";
EXPECT_TRUE(fh_it.is_valid()) << "Iterator invalid in FaceHalfedgeIter at initialization";
++fh_it;
EXPECT_EQ(3, fh_it->idx() ) << "Index wrong in FaceHalfedgeIter at step 1";
EXPECT_TRUE(fh_it.is_valid()) << "Iterator invalid in FaceHalfedgeIter at step 1";
++fh_it;
EXPECT_EQ(6, fh_it->idx() ) << "Index wrong in FaceHalfedgeIter at step 2";
EXPECT_TRUE(fh_it.is_valid()) << "Iterator invalid in FaceHalfedgeIter at step 2";
++fh_it;
EXPECT_EQ(8, fh_it->idx() ) << "Index wrong in FaceHalfedgeIter at end";
EXPECT_FALSE(fh_it.is_valid()) << "Iterator invalid in FaceHalfedgeIter at end";
EXPECT_TRUE( fh_it == fh_end ) << "End iterator for FaceHalfedgeIter not matching";
Mesh::ConstFaceHalfedgeIter cfh_it = mesh_.cfh_begin(mesh_.face_handle(1));
Mesh::ConstFaceHalfedgeIter cfh_end = mesh_.cfh_end(mesh_.face_handle(1));
EXPECT_EQ(8, cfh_it->idx() ) << "Index wrong in ConstFaceHalfedgeIter at initialization";
EXPECT_TRUE(cfh_it.is_valid()) << "Iterator invalid in ConstFaceHalfedgeIter at initialization";
++cfh_it;
EXPECT_EQ(3, cfh_it->idx() ) << "Index wrong in ConstFaceHalfedgeIter at step 1";
EXPECT_TRUE(cfh_it.is_valid()) << "Iterator invalid in ConstFaceHalfedgeIter at step 1";
++cfh_it;
EXPECT_EQ(6, cfh_it->idx() ) << "Index wrong in ConstFaceHalfedgeIter at step 2";
EXPECT_TRUE(cfh_it.is_valid()) << "Iterator invalid in ConstFaceHalfedgeIter at step 2";
++cfh_it;
EXPECT_EQ(8, cfh_it->idx() ) << "Index wrong in ConstFaceHalfedgeIter at end";
EXPECT_FALSE(cfh_it.is_valid()) << "Iterator invalid in ConstFaceHalfedgeIter at end";
EXPECT_TRUE( cfh_it == cfh_end ) << "End iterator for ConstFaceHalfedgeIter not matching";
}
//TEST_F(OpenMeshTrimeshCirculatorFaceHalfEdge, FaceHalfedgeIterWithoutHolesIncrement) {
//
// mesh_.clear();
//
// // Add some vertices
// Mesh::VertexHandle vhandle[6];
//
// vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
// vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
// vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
// vhandle[3] = mesh_.add_vertex(Mesh::Point(3, 0, 0));
// vhandle[4] = mesh_.add_vertex(Mesh::Point(4, 1, 0));
// vhandle[5] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
//
// // Add three faces
// std::vector<Mesh::VertexHandle> face_vhandles;
//
// face_vhandles.push_back(vhandle[0]);
// face_vhandles.push_back(vhandle[1]);
// face_vhandles.push_back(vhandle[2]);
// 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[3]);
// mesh_.add_face(face_vhandles);
//
// face_vhandles.clear();
//
// face_vhandles.push_back(vhandle[2]);
// face_vhandles.push_back(vhandle[3]);
// 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[5]);
// face_vhandles.push_back(vhandle[3]);
// mesh_.add_face(face_vhandles);
//
// /* Test setup:
// *
// * 0 ------ 2 ------ 4
// * \ / \ /
// * \ 0 / \ 2 /
// * \ / 1 \ /
// * 1 ------- 3
// * \ /
// * \ 3 /
// * \ /
// * \ /
// * 5
// */
//
//
// Mesh::FaceHalfedgeIter fh_it = mesh_.fh_begin(mesh_.face_handle(1));
// Mesh::FaceHalfedgeIter fh_end = mesh_.fh_end(mesh_.face_handle(1));
//
// EXPECT_EQ(8, fh_it->idx() ) << "Index wrong in FaceHalfedgeIter at initialization";
// EXPECT_TRUE(fh_it.is_valid()) << "Iterator invalid in FaceHalfedgeIter at initialization";
// ++fh_it;
// EXPECT_EQ(3, fh_it->idx() ) << "Index wrong in FaceHalfedgeIter at step 1";
// EXPECT_TRUE(fh_it.is_valid()) << "Iterator invalid in FaceHalfedgeIter at step 1";
// ++fh_it;
// EXPECT_EQ(6, fh_it->idx() ) << "Index wrong in FaceHalfedgeIter at step 2";
// EXPECT_TRUE(fh_it.is_valid()) << "Iterator invalid in FaceHalfedgeIter at step 2";
// ++fh_it;
// EXPECT_EQ(8, fh_it->idx() ) << "Index wrong in FaceHalfedgeIter at end";
// EXPECT_FALSE(fh_it.is_valid()) << "Iterator invalid in FaceHalfedgeIter at end";
// EXPECT_TRUE( fh_it == fh_end ) << "End iterator for FaceHalfedgeIter not matching";
//
// Mesh::ConstFaceHalfedgeIter cfh_it = mesh_.cfh_begin(mesh_.face_handle(1));
// Mesh::ConstFaceHalfedgeIter cfh_end = mesh_.cfh_end(mesh_.face_handle(1));
//
// EXPECT_EQ(8, cfh_it->idx() ) << "Index wrong in ConstFaceHalfedgeIter at initialization";
// EXPECT_TRUE(cfh_it.is_valid()) << "Iterator invalid in ConstFaceHalfedgeIter at initialization";
// ++cfh_it;
// EXPECT_EQ(3, cfh_it->idx() ) << "Index wrong in ConstFaceHalfedgeIter at step 1";
// EXPECT_TRUE(cfh_it.is_valid()) << "Iterator invalid in ConstFaceHalfedgeIter at step 1";
// ++cfh_it;
// EXPECT_EQ(6, cfh_it->idx() ) << "Index wrong in ConstFaceHalfedgeIter at step 2";
// EXPECT_TRUE(cfh_it.is_valid()) << "Iterator invalid in ConstFaceHalfedgeIter at step 2";
// ++cfh_it;
// EXPECT_EQ(8, cfh_it->idx() ) << "Index wrong in ConstFaceHalfedgeIter at end";
// EXPECT_FALSE(cfh_it.is_valid()) << "Iterator invalid in ConstFaceHalfedgeIter at end";
// EXPECT_TRUE( cfh_it == cfh_end ) << "End iterator for ConstFaceHalfedgeIter not matching";
//
//}
/*
* test CW and CCW iterators
@@ -194,8 +194,8 @@ TEST_F(OpenMeshTrimeshCirculatorFaceHalfEdge, CWAndCCWTest) {
std::reverse_copy(indices,indices+4,rev_indices);
//CCW
Mesh::FaceHalfedgeIter fh_ccwit = mesh_.fh_ccwbegin(mesh_.face_handle(1));
Mesh::FaceHalfedgeIter fh_ccwend = mesh_.fh_ccwend(mesh_.face_handle(1));
Mesh::FaceHalfedgeCCWIter fh_ccwit = mesh_.fh_ccwbegin(mesh_.face_handle(1));
Mesh::FaceHalfedgeCCWIter fh_ccwend = mesh_.fh_ccwend(mesh_.face_handle(1));
size_t i = 0;
for (;fh_ccwit != fh_ccwend; ++fh_ccwit, ++i)
{
@@ -206,8 +206,8 @@ TEST_F(OpenMeshTrimeshCirculatorFaceHalfEdge, CWAndCCWTest) {
EXPECT_TRUE( fh_ccwit == fh_ccwend ) << "End iterator for FaceHalfedgeIter not matching";
//constant CCW
Mesh::ConstFaceHalfedgeIter cfh_ccwit = mesh_.cfh_ccwbegin(mesh_.face_handle(1));
Mesh::ConstFaceHalfedgeIter cfh_ccwend = mesh_.cfh_ccwend(mesh_.face_handle(1));
Mesh::ConstFaceHalfedgeCCWIter cfh_ccwit = mesh_.cfh_ccwbegin(mesh_.face_handle(1));
Mesh::ConstFaceHalfedgeCCWIter cfh_ccwend = mesh_.cfh_ccwend(mesh_.face_handle(1));
i = 0;
for (;cfh_ccwit != cfh_ccwend; ++cfh_ccwit, ++i)
{
@@ -272,83 +272,83 @@ TEST_F(OpenMeshTrimeshCirculatorFaceHalfEdge, CWAndCCWTest) {
/*
* Test if the end iterator stays invalid after one lap
*/
TEST_F(OpenMeshTrimeshCirculatorFaceHalfEdge, FaceHalfedgeIterCheckInvalidationAtEnds) {
mesh_.clear();
// Add some vertices
Mesh::VertexHandle vhandle[5];
vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
// Add two faces
std::vector<Mesh::VertexHandle> face_vhandles;
face_vhandles.push_back(vhandle[0]);
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[2]);
Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[3]);
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[1]);
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[4]);
mesh_.add_face(face_vhandles);
/* Test setup:
0 ==== 2
|\ 0 /|
| \ / |
|2 1 3|
| / \ |
|/ 1 \|
3 ==== 4 */
// Check if the end iterator stays invalid after end
Mesh::FaceHalfedgeIter endIter = mesh_.fh_end(fh0);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
++endIter ;
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
// Check if the end iterators becomes valid after decrement
endIter = mesh_.fh_end(fh0);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
--endIter;
EXPECT_TRUE(endIter.is_valid()) << "EndIter is invalid after decrement";
EXPECT_EQ(2,endIter->idx()) << "EndIter points on the wrong element";
// Check if the start iterator decrement is invalid
Mesh::FaceHalfedgeIter startIter = mesh_.fh_begin(fh0);
EXPECT_TRUE(startIter.is_valid()) << "StartIter is not valid";
--startIter;
EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
// Check if the start iterator becomes valid
++startIter;
EXPECT_TRUE(startIter.is_valid()) << "StartIter is invalid after re-incrementing";
EXPECT_EQ(startIter->idx(), mesh_.fh_begin(fh0)->idx()) << "StartIter points on the wrong element";
}
//TEST_F(OpenMeshTrimeshCirculatorFaceHalfEdge, FaceHalfedgeIterCheckInvalidationAtEnds) {
//
// mesh_.clear();
//
// // Add some vertices
// Mesh::VertexHandle vhandle[5];
//
// vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
// vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
// vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
// vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
// vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
//
// // Add two faces
// std::vector<Mesh::VertexHandle> face_vhandles;
//
// face_vhandles.push_back(vhandle[0]);
// face_vhandles.push_back(vhandle[1]);
// face_vhandles.push_back(vhandle[2]);
// Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
//
// face_vhandles.clear();
//
// face_vhandles.push_back(vhandle[1]);
// face_vhandles.push_back(vhandle[3]);
// 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[1]);
// 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[4]);
// mesh_.add_face(face_vhandles);
//
// /* Test setup:
// 0 ==== 2
// |\ 0 /|
// | \ / |
// |2 1 3|
// | / \ |
// |/ 1 \|
// 3 ==== 4 */
//
//
// // Check if the end iterator stays invalid after end
// Mesh::FaceHalfedgeIter endIter = mesh_.fh_end(fh0);
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
// ++endIter ;
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
//
// // Check if the end iterators becomes valid after decrement
// endIter = mesh_.fh_end(fh0);
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
// --endIter;
// EXPECT_TRUE(endIter.is_valid()) << "EndIter is invalid after decrement";
// EXPECT_EQ(2,endIter->idx()) << "EndIter points on the wrong element";
//
//
// // Check if the start iterator decrement is invalid
// Mesh::FaceHalfedgeIter startIter = mesh_.fh_begin(fh0);
// EXPECT_TRUE(startIter.is_valid()) << "StartIter is not valid";
// --startIter;
// EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
//
// // Check if the start iterator becomes valid
// ++startIter;
// EXPECT_TRUE(startIter.is_valid()) << "StartIter is invalid after re-incrementing";
// EXPECT_EQ(startIter->idx(), mesh_.fh_begin(fh0)->idx()) << "StartIter points on the wrong element";
//
//}
}

156
src/Unittests/unittests_trimesh_circulator_face_vertex.cc
View File

@@ -127,84 +127,84 @@ TEST_F(OpenMeshTrimeshCirculatorFaceVertex, FaceVertexIterWithoutIncrement) {
/*
* Test if the end iterator stays invalid after one lap
*/
TEST_F(OpenMeshTrimeshCirculatorFaceVertex, FaceVertexIterCheckInvalidationAtEnds) {
mesh_.clear();
// Add some vertices
Mesh::VertexHandle vhandle[5];
vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
// Add two faces
std::vector<Mesh::VertexHandle> face_vhandles;
face_vhandles.push_back(vhandle[0]);
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[2]);
Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[3]);
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[1]);
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[4]);
mesh_.add_face(face_vhandles);
/* Test setup:
0 ==== 2
|\ 0 /|
| \ / |
|2 1 3|
| / \ |
|/ 1 \|
3 ==== 4 */
// Check if the end iterator stays invalid after end
Mesh::FaceVertexIter endIter = mesh_.fv_end(fh0);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
++endIter ;
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
// Check if the end iterators becomes valid after decrement
endIter = mesh_.fv_end(fh0);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
--endIter;
EXPECT_TRUE(endIter.is_valid()) << "EndIter is invalid after decrement";
EXPECT_EQ(2,endIter->idx()) << "EndIter points on the wrong element";
// Check if the start iterator decrement is invalid
Mesh::FaceVertexIter startIter = mesh_.fv_begin(fh0);
EXPECT_TRUE(startIter.is_valid()) << "StartIter is not valid";
--startIter;
EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
// Check if the start iterator becomes valid
++startIter;
EXPECT_TRUE(startIter.is_valid()) << "StartIter is invalid after re-incrementing";
EXPECT_EQ(startIter->idx(), mesh_.fv_begin(fh0)->idx()) << "StartIter points on the wrong element";
}
//TEST_F(OpenMeshTrimeshCirculatorFaceVertex, FaceVertexIterCheckInvalidationAtEnds) {
//
// mesh_.clear();
//
// // Add some vertices
// Mesh::VertexHandle vhandle[5];
//
// vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
// vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
// vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
// vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
// vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
//
// // Add two faces
// std::vector<Mesh::VertexHandle> face_vhandles;
//
// face_vhandles.push_back(vhandle[0]);
// face_vhandles.push_back(vhandle[1]);
// face_vhandles.push_back(vhandle[2]);
// Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
//
// face_vhandles.clear();
//
// face_vhandles.push_back(vhandle[1]);
// face_vhandles.push_back(vhandle[3]);
// 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[1]);
// 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[4]);
// mesh_.add_face(face_vhandles);
//
// /* Test setup:
// 0 ==== 2
// |\ 0 /|
// | \ / |
// |2 1 3|
// | / \ |
// |/ 1 \|
// 3 ==== 4 */
//
//
// // Check if the end iterator stays invalid after end
// Mesh::FaceVertexIter endIter = mesh_.fv_end(fh0);
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
// ++endIter ;
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
//
// // Check if the end iterators becomes valid after decrement
// endIter = mesh_.fv_end(fh0);
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
// --endIter;
// EXPECT_TRUE(endIter.is_valid()) << "EndIter is invalid after decrement";
// EXPECT_EQ(2,endIter->idx()) << "EndIter points on the wrong element";
//
//
// // Check if the start iterator decrement is invalid
// Mesh::FaceVertexIter startIter = mesh_.fv_begin(fh0);
// EXPECT_TRUE(startIter.is_valid()) << "StartIter is not valid";
// --startIter;
// EXPECT_FALSE(startIter.is_valid()) << "StartIter decrement is not invalid";
//
// // Check if the start iterator becomes valid
// ++startIter;
// EXPECT_TRUE(startIter.is_valid()) << "StartIter is invalid after re-incrementing";
// EXPECT_EQ(startIter->idx(), mesh_.fv_begin(fh0)->idx()) << "StartIter points on the wrong element";
//
//}
/*
* Test CW and CCW iterators