rename macro to be independant of any package
This commit is contained in:
Sébastien Loriot
+10
-10
@@ -32,12 +32,12 @@
|
||||
namespace CGAL{
|
||||
namespace parameters{
|
||||
enum all_default_t { all_default }; //cannot use macro because it takes no argument
|
||||
#define CGAL_add_pmp_parameter(X, Y, Z) \
|
||||
#define CGAL_add_named_parameter(X, Y, Z) \
|
||||
enum X { Y };
|
||||
|
||||
#include <CGAL/Polygon_mesh_processing/internal/parameters_interface.h>
|
||||
|
||||
#undef CGAL_add_pmp_parameter
|
||||
#undef CGAL_add_named_parameter
|
||||
}//parameters
|
||||
template <typename T, typename Tag, typename Base = boost::no_property>
|
||||
struct pmp_bgl_named_params
|
||||
@@ -54,7 +54,7 @@ enum all_default_t { all_default }; //cannot use macro because it takes no argum
|
||||
typedef pmp_bgl_named_params<bool, parameters::all_default_t, self> Params;
|
||||
return Params(*this);
|
||||
}
|
||||
#define CGAL_add_pmp_parameter(X, Y, Z) \
|
||||
#define CGAL_add_named_parameter(X, Y, Z) \
|
||||
template<typename K> \
|
||||
pmp_bgl_named_params<K, parameters::X, self> \
|
||||
Z(const K& k) const \
|
||||
@@ -65,8 +65,8 @@ enum all_default_t { all_default }; //cannot use macro because it takes no argum
|
||||
|
||||
#include <CGAL/Polygon_mesh_processing/internal/parameters_interface.h>
|
||||
#include <CGAL/boost/graph/parameters_interface.h>
|
||||
#undef CGAL_add_pmp_parameter
|
||||
#define CGAL_add_pmp_parameter(X, Y, Z) \
|
||||
#undef CGAL_add_named_parameter
|
||||
#define CGAL_add_named_parameter(X, Y, Z) \
|
||||
template<typename K> \
|
||||
pmp_bgl_named_params<K, boost::X, self> \
|
||||
Z(const K& k) const \
|
||||
@@ -75,7 +75,7 @@ enum all_default_t { all_default }; //cannot use macro because it takes no argum
|
||||
return Params(k, *this); \
|
||||
}
|
||||
#include <CGAL/boost/graph/boost_parameters_interface.h>
|
||||
#undef CGAL_add_pmp_parameter
|
||||
#undef CGAL_add_named_parameter
|
||||
};
|
||||
|
||||
namespace Polygon_mesh_processing{
|
||||
@@ -98,7 +98,7 @@ pmp_bgl_named_params<bool, CGAL::parameters::all_default_t>
|
||||
return Params();
|
||||
}
|
||||
|
||||
#define CGAL_add_pmp_parameter(X, Y, Z) \
|
||||
#define CGAL_add_named_parameter(X, Y, Z) \
|
||||
template<typename K> \
|
||||
pmp_bgl_named_params<K, CGAL::parameters::X> \
|
||||
Z(const K& k) \
|
||||
@@ -108,8 +108,8 @@ pmp_bgl_named_params<bool, CGAL::parameters::all_default_t>
|
||||
}
|
||||
#include <CGAL/boost/graph/parameters_interface.h>
|
||||
#include <CGAL/Polygon_mesh_processing/internal/parameters_interface.h>
|
||||
#undef CGAL_add_pmp_parameter
|
||||
#define CGAL_add_pmp_parameter(X, Y, Z) \
|
||||
#undef CGAL_add_named_parameter
|
||||
#define CGAL_add_named_parameter(X, Y, Z) \
|
||||
template<typename K> \
|
||||
pmp_bgl_named_params<K, boost::X> \
|
||||
Z(const K& k) \
|
||||
@@ -118,7 +118,7 @@ pmp_bgl_named_params<bool, CGAL::parameters::all_default_t>
|
||||
return Params(k); \
|
||||
}
|
||||
#include <CGAL/boost/graph/boost_parameters_interface.h>
|
||||
#undef CGAL_add_pmp_parameter
|
||||
#undef CGAL_add_named_parameter
|
||||
} //namespace parameters
|
||||
} //namespace Polygon_mesh_processing
|
||||
|
||||
|
||||
+26
-26
@@ -18,32 +18,32 @@
|
||||
//
|
||||
// Author(s) : Maxime Gimeno
|
||||
|
||||
CGAL_add_pmp_parameter(geom_traits_t, geom_traits, geom_traits)
|
||||
CGAL_add_pmp_parameter(density_control_factor_t, density_control_factor, density_control_factor)
|
||||
CGAL_add_pmp_parameter(use_delaunay_triangulation_t, use_delaunay_triangulation, use_delaunay_triangulation)
|
||||
CGAL_add_pmp_parameter(fairing_continuity_t, fairing_continuity, fairing_continuity)
|
||||
CGAL_add_pmp_parameter(sparse_linear_solver_t, sparse_linear_solver, sparse_linear_solver)
|
||||
CGAL_add_pmp_parameter(number_of_iterations_t, number_of_iterations, number_of_iterations)
|
||||
CGAL_add_pmp_parameter(number_of_relaxation_steps_t, number_of_relaxation_steps, number_of_relaxation_steps)
|
||||
CGAL_add_pmp_parameter(protect_constraints_t, protect_constraints, protect_constraints)
|
||||
CGAL_add_pmp_parameter(relax_constraints_t, relax_constraints, relax_constraints)
|
||||
CGAL_add_pmp_parameter(vertex_is_constrained_t, vertex_is_constrained, vertex_is_constrained_map)
|
||||
CGAL_add_pmp_parameter(face_patch_t, face_patch, face_patch_map)
|
||||
CGAL_add_pmp_parameter(random_uniform_sampling_t, random_uniform_sampling, random_uniform_sampling)
|
||||
CGAL_add_pmp_parameter(grid_sampling_t, grid_sampling, grid_sampling)
|
||||
CGAL_add_pmp_parameter(monte_carlo_sampling_t, monte_carlo_sampling, monte_carlo_sampling)
|
||||
CGAL_add_pmp_parameter(do_sample_edges_t, do_sample_edges, do_sample_edges)
|
||||
CGAL_add_pmp_parameter(do_sample_vertices_t, do_sample_vertices, do_sample_vertices)
|
||||
CGAL_add_pmp_parameter(do_sample_faces_t, do_sample_faces, do_sample_faces)
|
||||
CGAL_add_pmp_parameter(number_of_points_on_faces_t, number_of_points_on_faces, number_of_points_on_faces)
|
||||
CGAL_add_pmp_parameter(number_of_points_per_face_t, number_of_points_per_face, number_of_points_per_face)
|
||||
CGAL_add_pmp_parameter(grid_spacing_t, grid_spacing, grid_spacing)
|
||||
CGAL_add_pmp_parameter(number_of_points_per_edge_t, number_of_points_per_edge, number_of_points_per_edge)
|
||||
CGAL_add_pmp_parameter(number_of_points_on_edges_t, number_of_points_on_edges, number_of_points_on_edges)
|
||||
CGAL_add_pmp_parameter(nb_points_per_area_unit_t, nb_points_per_area_unit, number_of_points_per_area_unit)
|
||||
CGAL_add_pmp_parameter(nb_points_per_distance_unit_t, nb_points_per_distance_unit, number_of_points_per_distance_unit)
|
||||
CGAL_add_named_parameter(geom_traits_t, geom_traits, geom_traits)
|
||||
CGAL_add_named_parameter(density_control_factor_t, density_control_factor, density_control_factor)
|
||||
CGAL_add_named_parameter(use_delaunay_triangulation_t, use_delaunay_triangulation, use_delaunay_triangulation)
|
||||
CGAL_add_named_parameter(fairing_continuity_t, fairing_continuity, fairing_continuity)
|
||||
CGAL_add_named_parameter(sparse_linear_solver_t, sparse_linear_solver, sparse_linear_solver)
|
||||
CGAL_add_named_parameter(number_of_iterations_t, number_of_iterations, number_of_iterations)
|
||||
CGAL_add_named_parameter(number_of_relaxation_steps_t, number_of_relaxation_steps, number_of_relaxation_steps)
|
||||
CGAL_add_named_parameter(protect_constraints_t, protect_constraints, protect_constraints)
|
||||
CGAL_add_named_parameter(relax_constraints_t, relax_constraints, relax_constraints)
|
||||
CGAL_add_named_parameter(vertex_is_constrained_t, vertex_is_constrained, vertex_is_constrained_map)
|
||||
CGAL_add_named_parameter(face_patch_t, face_patch, face_patch_map)
|
||||
CGAL_add_named_parameter(random_uniform_sampling_t, random_uniform_sampling, random_uniform_sampling)
|
||||
CGAL_add_named_parameter(grid_sampling_t, grid_sampling, grid_sampling)
|
||||
CGAL_add_named_parameter(monte_carlo_sampling_t, monte_carlo_sampling, monte_carlo_sampling)
|
||||
CGAL_add_named_parameter(do_sample_edges_t, do_sample_edges, do_sample_edges)
|
||||
CGAL_add_named_parameter(do_sample_vertices_t, do_sample_vertices, do_sample_vertices)
|
||||
CGAL_add_named_parameter(do_sample_faces_t, do_sample_faces, do_sample_faces)
|
||||
CGAL_add_named_parameter(number_of_points_on_faces_t, number_of_points_on_faces, number_of_points_on_faces)
|
||||
CGAL_add_named_parameter(number_of_points_per_face_t, number_of_points_per_face, number_of_points_per_face)
|
||||
CGAL_add_named_parameter(grid_spacing_t, grid_spacing, grid_spacing)
|
||||
CGAL_add_named_parameter(number_of_points_per_edge_t, number_of_points_per_edge, number_of_points_per_edge)
|
||||
CGAL_add_named_parameter(number_of_points_on_edges_t, number_of_points_on_edges, number_of_points_on_edges)
|
||||
CGAL_add_named_parameter(nb_points_per_area_unit_t, nb_points_per_area_unit, number_of_points_per_area_unit)
|
||||
CGAL_add_named_parameter(nb_points_per_distance_unit_t, nb_points_per_distance_unit, number_of_points_per_distance_unit)
|
||||
//to be documented
|
||||
CGAL_add_pmp_parameter(face_normal_t, face_normal, face_normal_map)
|
||||
CGAL_add_named_parameter(face_normal_t, face_normal, face_normal_map)
|
||||
|
||||
//internal
|
||||
CGAL_add_pmp_parameter(weight_calculator_t, weight_calculator, weight_calculator)
|
||||
CGAL_add_named_parameter(weight_calculator_t, weight_calculator, weight_calculator)
|
||||
|
||||
Reference in New Issue
Block a user