From 8f5a2c91b8f124d545b10b0d8ba92b7cae8aeea8 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Thu, 8 Oct 2015 12:16:26 +0200 Subject: [PATCH] Fix missing concurrency_tag and badly handled normal vectors --- .../Polyhedron_demo_meta_reconstruction_plugin.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_meta_reconstruction_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_meta_reconstruction_plugin.cpp index 40eeb470573..ee69e138606 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_meta_reconstruction_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_meta_reconstruction_plugin.cpp @@ -240,7 +240,8 @@ namespace MetaReconstruction void smooth_point_set (Point_set& points, unsigned int scale) { - CGAL::jet_smooth_point_set(points.begin(), points.end(), scale); + CGAL::jet_smooth_point_set(points.begin(), points.end(), + scale); } void scale_space (const Point_set& points, Scene_polygon_soup_item* new_item, @@ -283,9 +284,9 @@ namespace MetaReconstruction void compute_normals (Point_set& points, unsigned int neighbors) { - CGAL::jet_estimate_normals(points.begin(), points.end(), - CGAL::make_normal_of_point_with_normal_pmap(Point_set::value_type()), - 2 * neighbors); + CGAL::jet_estimate_normals(points.begin(), points.end(), + CGAL::make_normal_of_point_with_normal_pmap(Point_set::value_type()), + 2 * neighbors); points.erase (CGAL::mst_orient_normals (points.begin(), points.end(), CGAL::make_normal_of_point_with_normal_pmap(Point_set::value_type()), @@ -424,6 +425,7 @@ void Polyhedron_demo_meta_reconstruction_plugin::on_actionMetaReconstruction_tri std::cerr << "Denoising point set... "; time.restart(); MetaReconstruction::smooth_point_set (*points, noise_scale); + new_item->set_has_normals (false); std::cerr << "ok (" << time.elapsed() << " ms)" << std::endl; } @@ -480,7 +482,7 @@ void Polyhedron_demo_meta_reconstruction_plugin::on_actionMetaReconstruction_tri } else { - if (!(pts_item->has_normals())) + if (!(new_item->has_normals())) { std::cerr << "Estimation of normal vectors... "; time.restart();