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

Fix missing propagations of PSP named parameters API change

This commit is contained in:
Simon Giraudot 2018-01-08 11:10:57 +01:00
parent 6f4291428e
commit e00c4f67d6
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp
View File

@ -145,11 +145,14 @@ int main (int argc, char* argv[])
std::cerr << "done\nPoint set structuring... "; std::cerr << "done\nPoint set structuring... ";
Pwn_vector structured_pts; Pwn_vector structured_pts;
Structure pss (points, Point_map(), Normal_map(), Structure pss (points,
planes, planes,
CGAL::Shape_detection_3::Plane_map<Traits>(), op.cluster_epsilon, // Same parameter as RANSAC
CGAL::Shape_detection_3::Point_to_shape_index_map<Traits>(points, planes), CGAL::parameters::point_map (Point_map()).
op.cluster_epsilon); // Same parameter as RANSAC normal_map (Normal_map()).
plane_map (CGAL::Shape_detection_3::Plane_map<Traits>()).
plane_index_map(CGAL::Shape_detection_3::Point_to_shape_index_map<Traits>(points, planes)));
for (std::size_t i = 0; i < pss.size(); ++ i) for (std::size_t i = 0; i < pss.size(); ++ i)
structured_pts.push_back (pss[i]); structured_pts.push_back (pss[i]);

4
Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp
View File

@ -17,9 +17,9 @@ bool test_orientation(TriangleMesh& tm, bool is_positive, const NamedParameters&
typedef boost::graph_traits<TriangleMesh> Graph_traits; typedef boost::graph_traits<TriangleMesh> Graph_traits;
typedef typename Graph_traits::vertex_descriptor vertex_descriptor; typedef typename Graph_traits::vertex_descriptor vertex_descriptor;
typedef typename Graph_traits::face_descriptor face_descriptor; typedef typename Graph_traits::face_descriptor face_descriptor;
typedef typename CGAL::GetVertexPointMap<TriangleMesh, typedef typename CGAL::Polygon_mesh_processing::GetVertexPointMap<TriangleMesh,
NamedParameters>::const_type Vpm; NamedParameters>::const_type Vpm;
typedef typename CGAL::GetFaceIndexMap<TriangleMesh, typedef typename CGAL::Polygon_mesh_processing::GetFaceIndexMap<TriangleMesh,
NamedParameters>::const_type Fid_map; NamedParameters>::const_type Fid_map;
Vpm vpm = boost::choose_param(get_param(np, CGAL::internal_np::vertex_point), Vpm vpm = boost::choose_param(get_param(np, CGAL::internal_np::vertex_point),

6
Triangulation_3/demo/Triangulation_3/Scene.cpp
View File

@ -12,6 +12,8 @@
#include <CGAL/IO/read_xyz_points.h> #include <CGAL/IO/read_xyz_points.h>
#include <CGAL/IO/write_xyz_points.h> #include <CGAL/IO/write_xyz_points.h>
#include <CGAL/Iterator_range.h>
using namespace std; using namespace std;
void Scene::generatePoints(int num) void Scene::generatePoints(int num)
@ -226,8 +228,8 @@ void Scene::savePointsXYZ(const char* filename)
/* Use CGAL::write_xyz_points to write out data */ /* Use CGAL::write_xyz_points to write out data */
/* Note: this function writes out points only (normals are ignored) */ /* Note: this function writes out points only (normals are ignored) */
if( !CGAL::write_xyz_points( fout, // output ofstream if( !CGAL::write_xyz_points( fout, // output ofstream
m_dt.points_begin(), // first output point CGAL::make_range (m_dt.points_begin(), // first output point
m_dt.points_end() ) ) { // past-the-end output point m_dt.points_end()) ) ) { // past-the-end output point
showError( QObject::tr("Error: cannot read file %1.").arg(filename) ); showError( QObject::tr("Error: cannot read file %1.").arg(filename) );
} }
} }