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

bringing back the old circulators. marked decrement operator as deprecated. Please use CW/CCW iterators

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1230 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
2015-03-04 12:59:54 +00:00
parent c7a41edafd
commit 53b9020496
7 changed files with 715 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/Unittests/unittests_trimesh_circulator_vertex_ohalfedge.cc
View File

@@ -315,84 +315,85 @@ TEST_F(OpenMeshTrimeshCirculatorVertexOHalfEdge, VertexOutgoingHalfedgeDereferen
/*
* Test if the end iterator stays invalid after one lap
* DISABLED as long as the normal iterators using old behavior
*/
TEST_F(OpenMeshTrimeshCirculatorVertexOHalfEdge, VertexOHalfEdgeIterCheckInvalidationAtEnds) {
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::VertexOHalfedgeIter endIter = mesh_.voh_end(vhandle[1]);
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
++endIter ;
EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
endIter = mesh_.voh_end(vhandle[1]);
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::VertexOHalfedgeIter startIter = mesh_.voh_begin(vhandle[1]);
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_.voh_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
}
//TEST_F(OpenMeshTrimeshCirculatorVertexOHalfEdge, VertexOHalfEdgeIterCheckInvalidationAtEnds) {
//
// 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::VertexOHalfedgeIter endIter = mesh_.voh_end(vhandle[1]);
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid";
// ++endIter ;
// EXPECT_FALSE(endIter.is_valid()) << "EndIter is not invalid after increment";
//
// endIter = mesh_.voh_end(vhandle[1]);
// 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::VertexOHalfedgeIter startIter = mesh_.voh_begin(vhandle[1]);
// 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_.voh_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
//
//}
/*
* Test CW and CCW iterators