restrict shared vertices on the boundary

This commit is contained in:
Sébastien Loriot 2025-04-11 14:30:52 +02:00
parent c5ab9f9adc
commit 6727894231
1 changed files with 29 additions and 12 deletions

View File

@ -1025,6 +1025,7 @@ bool decimate_meshes_with_common_interfaces_impl(TriangleMeshRange& meshes,
MeshMap mesh_map, MeshMap mesh_map,
const TagFunction& tag_function, const TagFunction& tag_function,
const std::vector<VertexPointMap>& vpms, const std::vector<VertexPointMap>& vpms,
bool shared_on_boundary_only,
bool do_not_triangulate_faces) bool do_not_triangulate_faces)
{ {
typedef typename boost::property_traits<MeshMap>::value_type Triangle_mesh; typedef typename boost::property_traits<MeshMap>::value_type Triangle_mesh;
@ -1092,11 +1093,10 @@ bool decimate_meshes_with_common_interfaces_impl(TriangleMeshRange& meshes,
//start by detecting and marking all shared vertices //start by detecting and marking all shared vertices
mesh_id = 0; mesh_id = 0;
for(Triangle_mesh* tm_ptr : mesh_ptrs)
{
Triangle_mesh& tm = *tm_ptr;
for(vertex_descriptor v : vertices(tm)) auto register_point =
[&vertex_shared_maps, &point_to_vertex_maps, &vpms]
(vertex_descriptor v, std::size_t mesh_id)
{ {
std::multimap<std::size_t, vertex_descriptor>& mesh_id_to_vertex = std::multimap<std::size_t, vertex_descriptor>& mesh_id_to_vertex =
point_to_vertex_maps[get(vpms[mesh_id], v)]; point_to_vertex_maps[get(vpms[mesh_id], v)];
@ -1108,7 +1108,22 @@ bool decimate_meshes_with_common_interfaces_impl(TriangleMeshRange& meshes,
put(vertex_shared_maps[other.first], other.second, true); put(vertex_shared_maps[other.first], other.second, true);
} }
mesh_id_to_vertex.insert( std::make_pair(mesh_id, v) ); mesh_id_to_vertex.insert( std::make_pair(mesh_id, v) );
};
for(Triangle_mesh* tm_ptr : mesh_ptrs)
{
Triangle_mesh& tm = *tm_ptr;
if (shared_on_boundary_only)
for(halfedge_descriptor h : halfedges(tm))
{
if (!is_border(h,tm)) continue;
vertex_descriptor v = target(h, tm);
register_point(v, mesh_id);
} }
else
for(vertex_descriptor v : vertices(tm))
register_point(v, mesh_id);
++mesh_id; ++mesh_id;
} }
@ -1222,7 +1237,7 @@ bool decimate_meshes_with_common_interfaces_impl(TriangleMeshRange& meshes,
{ {
typedef std::pair<const std::size_t, vertex_descriptor> Map_pair_type; typedef std::pair<const std::size_t, vertex_descriptor> Map_pair_type;
auto find_res = point_to_vertex_maps.find(corners[cid]); auto find_res = point_to_vertex_maps.find(corners[cid]);
assert(find_res != point_to_vertex_maps.end()); if (find_res == point_to_vertex_maps.end()) continue; // the point is not shared
for(Map_pair_type& mp : find_res->second) for(Map_pair_type& mp : find_res->second)
{ {
std::size_t other_mesh_id = mp.first; std::size_t other_mesh_id = mp.first;
@ -1279,6 +1294,7 @@ bool decimate_meshes_with_common_interfaces_impl(TriangleMeshRange& meshes,
MeshMap mesh_map, MeshMap mesh_map,
double coplanar_cos_threshold, double coplanar_cos_threshold,
const std::vector<VertexPointMap>& vpms, const std::vector<VertexPointMap>& vpms,
bool shared_on_boundary_only,
bool do_not_triangulate_faces) bool do_not_triangulate_faces)
{ {
typedef typename boost::property_traits<MeshMap>::value_type Triangle_mesh; typedef typename boost::property_traits<MeshMap>::value_type Triangle_mesh;
@ -1300,6 +1316,7 @@ bool decimate_meshes_with_common_interfaces_impl(TriangleMeshRange& meshes,
mesh_map, mesh_map,
tag_function, tag_function,
vpms, vpms,
shared_on_boundary_only,
do_not_triangulate_faces); do_not_triangulate_faces);
} }