phynexis-deps/cgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #973 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois

Browse Source 
PMP : fix isotropic_remeshing plugin
This commit is contained in:
Laurent Rineau
2016-04-04 11:19:52 +02:00
parent 4d1ac46990 52b09a1e44
commit 621e16ed41
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp
+25 -15
View File
@@ -309,14 +309,6 @@ public Q_SLOTS:
? *poly_item->polyhedron()
: *selection_item->polyhedron();
// tricks to use the function detect_and_split_duplicates
// that uses several poly items
std::map<Polyhedron*,Edge_set > edges_to_protect_map;
std::vector<Scene_polyhedron_item*> poly_items(1,poly_item);
Edge_set& edges_to_protect=edges_to_protect_map[poly_item->polyhedron()];
if(preserve_duplicates)
detect_and_split_duplicates(poly_items, edges_to_protect_map, target_length);
boost::property_map<Polyhedron, CGAL::face_index_t>::type fim
= get(CGAL::face_index, pmesh);
unsigned int id = 0;
@@ -359,16 +351,13 @@ public Q_SLOTS:
}
else
{
Edge_constrained_pmap ecm(edges_to_protect);
CGAL::OR_property_map<Edge_constrained_pmap, Edge_constrained_pmap> etp(ecm, selection_item->constrained_edges_pmap());
CGAL::Polygon_mesh_processing::isotropic_remeshing(
selection_item->selected_facets
, target_length
, *selection_item->polyhedron()
, CGAL::Polygon_mesh_processing::parameters::number_of_iterations(nb_iter)
.protect_constraints(protect)
.edge_is_constrained_map(etp)
.edge_is_constrained_map(selection_item->constrained_edges_pmap())
.smooth_along_features(smooth_features)
.vertex_is_constrained_map(selection_item->constrained_vertices_pmap()));
}
@@ -400,14 +389,28 @@ public Q_SLOTS:
}
else
{
Scene_polyhedron_selection_item::Is_constrained_map<Edge_set > ecm(edges_to_protect);
CGAL::Polygon_mesh_processing::isotropic_remeshing(
// tricks to use the function detect_and_split_duplicates
// that uses several poly items
std::map<Polyhedron*, Edge_set > edges_to_protect_map;
std::vector<Scene_polyhedron_item*> poly_items(1, poly_item);
Edge_set& edges_to_protect = edges_to_protect_map[poly_item->polyhedron()];
if (preserve_duplicates)
{
detect_and_split_duplicates(poly_items, edges_to_protect_map, target_length);
boost::property_map<Polyhedron, CGAL::face_index_t>::type fim = get(CGAL::face_index, pmesh);
unsigned int id = 0;
BOOST_FOREACH(face_descriptor f, faces(pmesh))
put(fim, f, id++);
}
Scene_polyhedron_selection_item::Is_constrained_map<Edge_set> ecm(edges_to_protect);
CGAL::Polygon_mesh_processing::isotropic_remeshing(
faces(*poly_item->polyhedron())
, target_length
, *poly_item->polyhedron()
, CGAL::Polygon_mesh_processing::parameters::number_of_iterations(nb_iter)
.protect_constraints(protect)
.edge_is_constrained_map(ecm)
.edge_is_constrained_map(ecm)
.smooth_along_features(smooth_features));
}
poly_item->invalidateOpenGLBuffers();
@@ -708,6 +711,13 @@ private:
ui.protect_checkbox->setChecked(false);
ui.smooth1D_checkbox->setChecked(true);
if (NULL != selection_item)
{
//do not preserve duplicates in selection mode
ui.preserveDuplicates_checkbox->setDisabled(true);
ui.preserveDuplicates_checkbox->setChecked(false);
}
return ui;
}