songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

really use one point per CC

This commit is contained in:
Sébastien Loriot 2018-10-02 14:40:54 +02:00
parent 2b350e71e1
commit a2491fe07c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Polygon_mesh_processing/include/CGAL/Rigid_mesh_collision_detection.h
View File

@ -109,7 +109,7 @@ public:
{
if (!assume_one_CC)
{
std::vector<std::size_t> CC_ids(num_faces(tm));
std::vector<std::size_t> cc_ids(num_faces(tm));
// TODO use dynamic property if no defaut fid is available
typename boost::property_map<TriangleMesh, boost::face_index_t>::type fid_map
@ -117,7 +117,8 @@ public:
std::size_t nb_cc =
Polygon_mesh_processing::connected_components(
tm, bind_property_maps(fid_map, make_property_map(CC_ids)) );
tm, bind_property_maps(fid_map, make_property_map(cc_ids)),
parameters::face_index_map(fid_map));
if (nb_cc != 1)
{
typedef boost::graph_traits<TriangleMesh> GrTr;
@ -125,10 +126,11 @@ public:
BOOST_FOREACH(typename GrTr::face_descriptor f, faces(tm))
{
if (vertex_per_cc[get(fid_map, f)]!=GrTr::null_vertex())
std::size_t cc_id = cc_ids[get(fid_map, f)];
if (vertex_per_cc[cc_id] == GrTr::null_vertex())
{
points.push_back(
get(vpm, target( halfedge(f, tm), tm)) );
vertex_per_cc[cc_id] = target( halfedge(f, tm), tm);
points.push_back( get(vpm, vertex_per_cc[cc_id]) );
}
}
return;