bringing back the old circulators. marked decrement operator as deprecated. Please use CW/CCW iterators
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1230 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
@@ -200,85 +200,86 @@ TEST_F(OpenMeshTrimeshCirculatorVertexEdge, VertexEdgeIterBoundaryIncrement) {
|
||||
|
||||
/*
|
||||
* Test if the end iterator stays invalid after one lap
|
||||
* DISABLED as long as the normal iterators using old behavior
|
||||
*/
|
||||
TEST_F(OpenMeshTrimeshCirculatorVertexEdge, VertexEdgeIterCheckInvalidationAtEnds) {
|
||||
|
||||
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::VertexEdgeIter endIter = mesh_.ve_end(vhandle[1]);
|
||||
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_.ve_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(1,endIter->idx()) << "EndIter points on the wrong element";
|
||||
|
||||
|
||||
// Check if the start iterator decrement is invalid
|
||||
Mesh::VertexEdgeIter startIter = mesh_.ve_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()) << "StarIter is invalid after re-incrementing";
|
||||
EXPECT_EQ(startIter->idx(), mesh_.ve_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
|
||||
|
||||
}
|
||||
//TEST_F(OpenMeshTrimeshCirculatorVertexEdge, VertexEdgeIterCheckInvalidationAtEnds) {
|
||||
//
|
||||
// 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::VertexEdgeIter endIter = mesh_.ve_end(vhandle[1]);
|
||||
// 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_.ve_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(1,endIter->idx()) << "EndIter points on the wrong element";
|
||||
//
|
||||
//
|
||||
// // Check if the start iterator decrement is invalid
|
||||
// Mesh::VertexEdgeIter startIter = mesh_.ve_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()) << "StarIter is invalid after re-incrementing";
|
||||
// EXPECT_EQ(startIter->idx(), mesh_.ve_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
|
||||
//
|
||||
//}
|
||||
|
||||
/*
|
||||
* Test CW and CCW iterators
|
||||
|
||||
@@ -269,187 +269,189 @@ TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterBoundaryIncrement) {
|
||||
|
||||
/*
|
||||
* Test if the end iterator stays invalid after one lap
|
||||
* DISABLED as long as the normal iterators using old behavior
|
||||
*/
|
||||
TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterCheckInvalidationAtEnds) {
|
||||
|
||||
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::VertexFaceIter endIter = mesh_.vf_end(vhandle[1]);
|
||||
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_.vf_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(0,endIter->idx()) << "EndIter points on the wrong element";
|
||||
|
||||
|
||||
// Check if the start iterator decrement is invalid
|
||||
Mesh::VertexFaceIter startIter = mesh_.vf_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()) << "StarIter is invalid after re-incrementing";
|
||||
EXPECT_EQ(startIter->idx(), mesh_.vf_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
|
||||
|
||||
}
|
||||
//TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterCheckInvalidationAtEnds) {
|
||||
//
|
||||
// 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::VertexFaceIter endIter = mesh_.vf_end(vhandle[1]);
|
||||
// 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_.vf_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(0,endIter->idx()) << "EndIter points on the wrong element";
|
||||
//
|
||||
//
|
||||
// // Check if the start iterator decrement is invalid
|
||||
// Mesh::VertexFaceIter startIter = mesh_.vf_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()) << "StarIter is invalid after re-incrementing";
|
||||
// EXPECT_EQ(startIter->idx(), mesh_.vf_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
|
||||
//
|
||||
//}
|
||||
|
||||
/*
|
||||
* VertexFaceIterator Test without holes testing decrement
|
||||
* DISABLED as long as the normal iterators using old behavior
|
||||
*/
|
||||
TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterWithoutHolesDecrement) {
|
||||
|
||||
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_.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 */
|
||||
|
||||
mesh_.vf_begin(vhandle[1]);
|
||||
|
||||
// Iterate around vertex 1 at the middle
|
||||
Mesh::VertexFaceIter vf_it = mesh_.vf_begin(vhandle[1]);
|
||||
std::advance(vf_it,3);
|
||||
Mesh::VertexFaceIter vf_end = mesh_.vf_begin(vhandle[1]);
|
||||
--vf_end;
|
||||
|
||||
EXPECT_EQ(0, vf_it->idx() ) << "Index wrong in VertexFaceIter at initialization";
|
||||
EXPECT_TRUE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at initialization";
|
||||
--vf_it ;
|
||||
EXPECT_EQ(2, vf_it->idx() ) << "Index wrong in VertexFaceIter at step 1";
|
||||
EXPECT_TRUE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 1";
|
||||
--vf_it ;
|
||||
EXPECT_EQ(1, vf_it->idx() ) << "Index wrong in VertexFaceIter at step 2";
|
||||
EXPECT_TRUE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 2";
|
||||
--vf_it ;
|
||||
EXPECT_EQ(3, vf_it->idx() ) << "Index wrong in VertexFaceIter at step 3";
|
||||
EXPECT_TRUE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 3";
|
||||
--vf_it ;
|
||||
EXPECT_EQ(0, vf_it->idx() ) << "Index wrong in VertexFaceIter at end";
|
||||
EXPECT_FALSE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 2";
|
||||
EXPECT_TRUE( vf_it == vf_end ) << "End iterator for VertexFaceIter not matching";
|
||||
|
||||
// Iterate around vertex 1 at the middle with const iterator
|
||||
Mesh::ConstVertexFaceIter cvf_it = mesh_.cvf_begin(vhandle[1]);
|
||||
std::advance(cvf_it,3);
|
||||
Mesh::ConstVertexFaceIter cvf_end = mesh_.cvf_begin(vhandle[1]);
|
||||
--cvf_end;
|
||||
|
||||
EXPECT_EQ(0, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at initialization";
|
||||
EXPECT_TRUE(cvf_it.is_valid()) << "Iterator invalid in ConstVertexFaceIter at initialization";
|
||||
--cvf_it ;
|
||||
EXPECT_EQ(2, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at step 1";
|
||||
EXPECT_TRUE(cvf_it.is_valid()) << "Iterator invalid in ConstVertexFaceIter at step 1";
|
||||
--cvf_it ;
|
||||
EXPECT_EQ(1, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at step 2";
|
||||
EXPECT_TRUE(cvf_it.is_valid()) << "Iterator invalid in ConstVertexFaceIter at step 2";
|
||||
--cvf_it ;
|
||||
EXPECT_EQ(3, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at step 3";
|
||||
EXPECT_TRUE(cvf_it.is_valid()) << "Iterator invalid in ConstVertexFaceIter at step 3";
|
||||
--cvf_it ;
|
||||
EXPECT_EQ(0, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at end";
|
||||
EXPECT_FALSE(cvf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 2";
|
||||
EXPECT_TRUE( cvf_it == cvf_end ) << "End iterator for ConstVertexFaceIter not matching";
|
||||
|
||||
}
|
||||
//TEST_F(OpenMeshTrimeshCirculatorVertexFace, VertexFaceIterWithoutHolesDecrement) {
|
||||
//
|
||||
// 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_.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 */
|
||||
//
|
||||
// mesh_.vf_begin(vhandle[1]);
|
||||
//
|
||||
// // Iterate around vertex 1 at the middle
|
||||
// Mesh::VertexFaceIter vf_it = mesh_.vf_begin(vhandle[1]);
|
||||
// std::advance(vf_it,3);
|
||||
// Mesh::VertexFaceIter vf_end = mesh_.vf_begin(vhandle[1]);
|
||||
// --vf_end;
|
||||
//
|
||||
// EXPECT_EQ(0, vf_it->idx() ) << "Index wrong in VertexFaceIter at initialization";
|
||||
// EXPECT_TRUE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at initialization";
|
||||
// --vf_it ;
|
||||
// EXPECT_EQ(2, vf_it->idx() ) << "Index wrong in VertexFaceIter at step 1";
|
||||
// EXPECT_TRUE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 1";
|
||||
// --vf_it ;
|
||||
// EXPECT_EQ(1, vf_it->idx() ) << "Index wrong in VertexFaceIter at step 2";
|
||||
// EXPECT_TRUE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 2";
|
||||
// --vf_it ;
|
||||
// EXPECT_EQ(3, vf_it->idx() ) << "Index wrong in VertexFaceIter at step 3";
|
||||
// EXPECT_TRUE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 3";
|
||||
// --vf_it ;
|
||||
// EXPECT_EQ(0, vf_it->idx() ) << "Index wrong in VertexFaceIter at end";
|
||||
// EXPECT_FALSE(vf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 2";
|
||||
// EXPECT_TRUE( vf_it == vf_end ) << "End iterator for VertexFaceIter not matching";
|
||||
//
|
||||
// // Iterate around vertex 1 at the middle with const iterator
|
||||
// Mesh::ConstVertexFaceIter cvf_it = mesh_.cvf_begin(vhandle[1]);
|
||||
// std::advance(cvf_it,3);
|
||||
// Mesh::ConstVertexFaceIter cvf_end = mesh_.cvf_begin(vhandle[1]);
|
||||
// --cvf_end;
|
||||
//
|
||||
// EXPECT_EQ(0, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at initialization";
|
||||
// EXPECT_TRUE(cvf_it.is_valid()) << "Iterator invalid in ConstVertexFaceIter at initialization";
|
||||
// --cvf_it ;
|
||||
// EXPECT_EQ(2, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at step 1";
|
||||
// EXPECT_TRUE(cvf_it.is_valid()) << "Iterator invalid in ConstVertexFaceIter at step 1";
|
||||
// --cvf_it ;
|
||||
// EXPECT_EQ(1, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at step 2";
|
||||
// EXPECT_TRUE(cvf_it.is_valid()) << "Iterator invalid in ConstVertexFaceIter at step 2";
|
||||
// --cvf_it ;
|
||||
// EXPECT_EQ(3, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at step 3";
|
||||
// EXPECT_TRUE(cvf_it.is_valid()) << "Iterator invalid in ConstVertexFaceIter at step 3";
|
||||
// --cvf_it ;
|
||||
// EXPECT_EQ(0, cvf_it->idx() ) << "Index wrong in ConstVertexFaceIter at end";
|
||||
// EXPECT_FALSE(cvf_it.is_valid()) << "Iterator invalid in VertexFaceIter at step 2";
|
||||
// EXPECT_TRUE( cvf_it == cvf_end ) << "End iterator for ConstVertexFaceIter not matching";
|
||||
//
|
||||
//}
|
||||
|
||||
/*
|
||||
* Test CW and CCW iterators
|
||||
|
||||
@@ -314,85 +314,86 @@ TEST_F(OpenMeshTrimeshCirculatorVertexIHalfEdge, VertexIncomingHalfedgeDereferen
|
||||
|
||||
/*
|
||||
* Test if the end iterator stays invalid after one lap
|
||||
* DISABLED as long as the normal iterators using old behavior
|
||||
*/
|
||||
TEST_F(OpenMeshTrimeshCirculatorVertexIHalfEdge, VertexIHalfEdgeIterCheckInvalidationAtEnds) {
|
||||
|
||||
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::VertexIHalfedgeIter endIter = mesh_.vih_end(vhandle[1]);
|
||||
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_.vih_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(3,endIter->idx()) << "EndIter points on the wrong element";
|
||||
|
||||
|
||||
// Check if the start iterator decrement is invalid
|
||||
Mesh::VertexIHalfedgeIter startIter = mesh_.vih_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()) << "StarIter is invalid after re-incrementing";
|
||||
EXPECT_EQ(startIter->idx(), mesh_.vih_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
|
||||
|
||||
}
|
||||
//TEST_F(OpenMeshTrimeshCirculatorVertexIHalfEdge, VertexIHalfEdgeIterCheckInvalidationAtEnds) {
|
||||
//
|
||||
// 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::VertexIHalfedgeIter endIter = mesh_.vih_end(vhandle[1]);
|
||||
// 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_.vih_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(3,endIter->idx()) << "EndIter points on the wrong element";
|
||||
//
|
||||
//
|
||||
// // Check if the start iterator decrement is invalid
|
||||
// Mesh::VertexIHalfedgeIter startIter = mesh_.vih_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()) << "StarIter is invalid after re-incrementing";
|
||||
// EXPECT_EQ(startIter->idx(), mesh_.vih_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
|
||||
//
|
||||
//}
|
||||
|
||||
/*
|
||||
* Test CW and CCW iterators
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -203,85 +203,86 @@ TEST_F(OpenMeshTrimeshCirculatorVertexVertex, VertexVertexBoundaryIncrement) {
|
||||
|
||||
/*
|
||||
* Test if the end iterator stays invalid after one lap
|
||||
* DISABLED as long as the normal iterators using old behavior
|
||||
*/
|
||||
TEST_F(OpenMeshTrimeshCirculatorVertexVertex, VertexVertexIterCheckInvalidationAtEnds) {
|
||||
|
||||
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::VertexVertexIter endIter = mesh_.vv_end(vhandle[1]);
|
||||
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_.vv_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::VertexVertexIter startIter = mesh_.vv_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_.vv_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
|
||||
|
||||
}
|
||||
//TEST_F(OpenMeshTrimeshCirculatorVertexVertex, VertexVertexIterCheckInvalidationAtEnds) {
|
||||
//
|
||||
// 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::VertexVertexIter endIter = mesh_.vv_end(vhandle[1]);
|
||||
// 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_.vv_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::VertexVertexIter startIter = mesh_.vv_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_.vv_begin(vhandle[1])->idx()) << "StartIter points on the wrong element";
|
||||
//
|
||||
//}
|
||||
|
||||
/*
|
||||
* Test CW and CCW iterators
|
||||
|
||||
Reference in New Issue
Block a user