Commit da2c1168 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'edge_split_copy_face_properties' into 'master'

Edge split copy face properties

See merge request !156
parents 80e24b7d d32df7f1
Pipeline #6563 passed with stage
in 48 minutes and 13 seconds
......@@ -488,6 +488,11 @@ void TriConnectivity::split(EdgeHandle _eh, VertexHandle _vh)
void TriConnectivity::split_copy(EdgeHandle _eh, VertexHandle _vh)
{
const VertexHandle v0 = to_vertex_handle(halfedge_handle(_eh, 0));
const VertexHandle v1 = to_vertex_handle(halfedge_handle(_eh, 1));
const int nf = n_faces();
// Split the halfedge ( handle will be preserved)
split(_eh, _vh);
......@@ -495,6 +500,22 @@ void TriConnectivity::split_copy(EdgeHandle _eh, VertexHandle _vh)
// have been created
for(VEIter ve_it = ve_iter(_vh); ve_it.is_valid(); ++ve_it)
copy_all_properties(_eh, *ve_it, true);
for (auto vh : {v0, v1})
{
// get the halfedge pointing from new vertex to old vertex
const HalfedgeHandle h = find_halfedge(_vh, vh);
if (!is_boundary(h)) // for boundaries there are no faces whose properties need to be copied
{
FaceHandle fh0 = face_handle(h);
FaceHandle fh1 = face_handle(opposite_halfedge_handle(prev_halfedge_handle(h)));
if (fh0.idx() >= nf) // is fh0 the new face?
std::swap(fh0, fh1);
// copy properties from old face to new face
copy_all_properties(fh0, fh1, true);
}
}
}
}// namespace OpenMesh
......@@ -91,13 +91,15 @@ TEST_F(OpenMeshSplitEdgeCopyTriangleMesh, SplitEdgeCopyTriangleMesh) {
//set internal property
mesh_.status(eh).set_tagged(true);
// split face with new vertex
mesh_.split_edge_copy(eh, vhandle[3]);
// split edge with new vertex
mesh_.split_copy(eh, vhandle[3]);
// Check setup
Mesh::EdgeHandle eh0 = mesh_.edge_handle( mesh_.next_halfedge_handle( mesh_.halfedge_handle(eh, 1) ) );
EXPECT_EQ(999, mesh_.property(eprop_int, eh0)) << "Different Property value";
EXPECT_TRUE(mesh_.status(eh0).tagged()) << "Different internal property value";
EXPECT_EQ(mesh_.valence(fh), 3) << "Face of TriMesh has valence other than 3";
}
/* splits an edge that has a property in a poly mesh with split_edge_copy
......@@ -152,4 +154,102 @@ TEST_F(OpenMeshSplitEdgeCopyPolyMesh, SplitEdgeCopyPolymesh) {
EXPECT_EQ(999, mesh_.property(eprop_int, eh0)) << "Different Property value";
EXPECT_TRUE(mesh_.status(eh0).tagged()) << "Different internal property value";
}
/* splits an edge in a triangle mesh that has a face property with split_edge_copy
* the property should be copied to the new edge
*/
TEST_F(OpenMeshSplitEdgeCopyTriangleMesh, SplitEdgeCopyFacePropertiesTriangleMesh) {
mesh_.clear();
mesh_.request_edge_status();
mesh_.request_face_status();
static_assert(std::is_same<decltype (mesh_), Mesh>::value, "Mesh is not a triangle mesh");
// Add some vertices
Mesh::VertexHandle vhandle[4];
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(1, 1, 0));
vhandle[3] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
Mesh::VertexHandle inner_vertex = mesh_.add_vertex(Mesh::Point(0.5, 0.5, 0));
Mesh::VertexHandle boundary_vertex = mesh_.add_vertex(Mesh::Point(0.0, 0.5, 0));
// Add two faces
std::vector<Mesh::VertexHandle> face_vhandles;
face_vhandles.push_back(vhandle[2]);
face_vhandles.push_back(vhandle[1]);
face_vhandles.push_back(vhandle[0]);
Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
face_vhandles.clear();
face_vhandles.push_back(vhandle[2]);
face_vhandles.push_back(vhandle[0]);
face_vhandles.push_back(vhandle[3]);
Mesh::FaceHandle fh1 = mesh_.add_face(face_vhandles);
Mesh::EdgeHandle inner_edge = Mesh::EdgeHandle(2);
EXPECT_EQ(mesh_.n_faces(), 2u);
// Test setup:
// 1 --- 2
// | / |
// | / |
// | / |
// 0 --- 3
// set property
OpenMesh::FPropHandleT<int> fprop_int;
mesh_.add_property(fprop_int);
mesh_.property(fprop_int, fh0) = 13;
mesh_.property(fprop_int, fh1) = 17;
//set internal property
mesh_.status(fh0).set_tagged(true);
// 2 to 4 split
mesh_.split_copy(inner_edge, inner_vertex);
EXPECT_EQ(mesh_.n_faces(), 4u);
for (auto fh : mesh_.faces())
{
EXPECT_EQ(mesh_.valence(fh), 3);
}
// Check setup
Mesh::HalfedgeHandle heh21 = mesh_.find_halfedge(vhandle[2], vhandle[1]);
Mesh::HalfedgeHandle heh10 = mesh_.find_halfedge(vhandle[1], vhandle[0]);
Mesh::HalfedgeHandle heh03 = mesh_.find_halfedge(vhandle[0], vhandle[3]);
Mesh::HalfedgeHandle heh32 = mesh_.find_halfedge(vhandle[3], vhandle[2]);
EXPECT_EQ(13, mesh_.property(fprop_int, mesh_.face_handle(heh21))) << "Different Property value";
EXPECT_EQ(13, mesh_.property(fprop_int, mesh_.face_handle(heh10))) << "Different Property value";
EXPECT_EQ(17, mesh_.property(fprop_int, mesh_.face_handle(heh03))) << "Different Property value";
EXPECT_EQ(17, mesh_.property(fprop_int, mesh_.face_handle(heh32))) << "Different Property value";
EXPECT_TRUE(mesh_.status(mesh_.face_handle(heh21)).tagged()) << "Different internal property value";
EXPECT_TRUE(mesh_.status(mesh_.face_handle(heh10)).tagged()) << "Different internal property value";
EXPECT_FALSE(mesh_.status(mesh_.face_handle(heh03)).tagged()) << "Different internal property value";
EXPECT_FALSE(mesh_.status(mesh_.face_handle(heh32)).tagged()) << "Different internal property value";
// also test boundary split
Mesh::EdgeHandle boundary_edge = mesh_.edge_handle(heh10);
// 1 to 2 split
mesh_.split_copy(boundary_edge, boundary_vertex);
Mesh::HalfedgeHandle heh1b = mesh_.find_halfedge(vhandle[1], boundary_vertex);
Mesh::HalfedgeHandle hehb0 = mesh_.find_halfedge(boundary_vertex, vhandle[0]);
EXPECT_EQ(13, mesh_.property(fprop_int, mesh_.face_handle(heh1b))) << "Different Property value";
EXPECT_EQ(13, mesh_.property(fprop_int, mesh_.face_handle(hehb0))) << "Different Property value";
EXPECT_TRUE(mesh_.status(mesh_.face_handle(heh1b)).tagged()) << "Different internal property value";
EXPECT_TRUE(mesh_.status(mesh_.face_handle(hehb0)).tagged()) << "Different internal property value";
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment