mirror of https://github.com/CGAL/cgal
deprecate smooth_mesh() and rename it angle_and_area_smoothing()
This commit is contained in:
Jane Tournois
parent
752b5885aa
commit
6357211695
|
|
@ -65,6 +65,9 @@
|
|||
/// \defgroup PMP_IO_grp I/O Functions
|
||||
/// \ingroup PkgPolygonMeshProcessingRef
|
||||
|
||||
/// \defgroup PMPDeprecated Deprecated Functions
|
||||
/// \ingroup PkgPolygonMeshProcessingRef
|
||||
|
||||
/*!
|
||||
\addtogroup PkgPolygonMeshProcessingRef
|
||||
|
||||
|
|
@ -101,7 +104,8 @@ The page \ref bgl_namedparameters "Named Parameters" describes their usage.
|
|||
\cgalCRPSection{Meshing Functions}
|
||||
- `CGAL::Polygon_mesh_processing::fair()`
|
||||
- `CGAL::Polygon_mesh_processing::refine()`
|
||||
- `CGAL::Polygon_mesh_processing::smooth_mesh()`
|
||||
- `CGAL::Polygon_mesh_processing::smooth_mesh()` (deprecated)
|
||||
- `CGAL::Polygon_mesh_processing::angle_and_area_smoothing()`
|
||||
- `CGAL::Polygon_mesh_processing::tangential_relaxation()`
|
||||
- `CGAL::Polygon_mesh_processing::smooth_shape()`
|
||||
- `CGAL::Polygon_mesh_processing::triangulate_face()`
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
|
||||
#include <CGAL/Surface_mesh.h>
|
||||
|
||||
#include <CGAL/Polygon_mesh_processing/smooth_mesh.h>
|
||||
#include <CGAL/Polygon_mesh_processing/angle_and_area_smoothing.h>
|
||||
#include <CGAL/Polygon_mesh_processing/detect_features.h>
|
||||
#include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ int main(int argc, char** argv)
|
|||
std::cout << "Smoothing mesh... (" << nb_iterations << " iterations)" << std::endl;
|
||||
|
||||
// Smooth with both angle and area criteria + Delaunay flips
|
||||
PMP::smooth_mesh(mesh, PMP::parameters::number_of_iterations(nb_iterations)
|
||||
PMP::angle_and_area_smoothing(mesh, PMP::parameters::number_of_iterations(nb_iterations)
|
||||
.use_safety_constraints(false) // authorize all moves
|
||||
.edge_is_constrained_map(eif));
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,378 @@
|
|||
// Copyright (c) 2018 GeometryFactory (France).
|
||||
// All rights reserved.
|
||||
//
|
||||
// This file is part of CGAL (www.cgal.org).
|
||||
//
|
||||
// $URL$
|
||||
// $Id$
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
|
||||
//
|
||||
//
|
||||
// Author(s) : Mael Rouxel-Labbé
|
||||
// Konstantinos Katrioplas (konst.katrioplas@gmail.com)
|
||||
|
||||
#ifndef CGAL_POLYGON_MESH_PROCESSING_ANGLE_AND_AREA_SMOOTHING_H
|
||||
#define CGAL_POLYGON_MESH_PROCESSING_ANGLE_AND_AREA_SMOOTHING_H
|
||||
|
||||
#include <CGAL/license/Polygon_mesh_processing/meshing_hole_filling.h>
|
||||
|
||||
#include <CGAL/Polygon_mesh_processing/internal/Smoothing/mesh_smoothing_impl.h>
|
||||
#include <CGAL/Polygon_mesh_processing/internal/Smoothing/smoothing_evaluation.h>
|
||||
#include <CGAL/Polygon_mesh_processing/self_intersections.h>
|
||||
|
||||
#include <CGAL/boost/graph/Named_function_parameters.h>
|
||||
#include <CGAL/boost/graph/named_params_helper.h>
|
||||
|
||||
#include <CGAL/property_map.h>
|
||||
|
||||
#ifdef DOXYGEN_RUNNING
|
||||
#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters
|
||||
#define CGAL_PMP_NP_CLASS NamedParameters
|
||||
#endif
|
||||
|
||||
namespace CGAL {
|
||||
namespace Polygon_mesh_processing {
|
||||
|
||||
/*!
|
||||
* \ingroup PMP_meshing_grp
|
||||
*
|
||||
* \short smooths a triangulated region of a polygon mesh.
|
||||
*
|
||||
* This function attempts to make the triangle angle and area distributions as uniform as possible
|
||||
* by moving (non-constrained) vertices.
|
||||
*
|
||||
* Angle-based smoothing does not change the combinatorial information of the mesh. Area-based smoothing
|
||||
* might change the combinatorial information, unless specified otherwise. It is also possible
|
||||
* to make the smoothing algorithm "safer" by rejecting moves that, when applied, would worsen the
|
||||
* quality of the mesh, e.g. that would decrease the value of the smallest angle around a vertex or
|
||||
* create self-intersections.
|
||||
*
|
||||
* Optionally, the points are reprojected after each iteration.
|
||||
*
|
||||
* @tparam TriangleMesh model of `MutableFaceGraph`.
|
||||
* @tparam FaceRange range of `boost::graph_traits<TriangleMesh>::%face_descriptor`,
|
||||
model of `Range`. Its iterator type is `ForwardIterator`.
|
||||
* @tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters"
|
||||
*
|
||||
* @param tmesh a polygon mesh with triangulated surface patches to be smoothed.
|
||||
* @param faces the range of triangular faces defining one or several surface patches to be smoothed.
|
||||
* @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below
|
||||
*
|
||||
* \cgalNamedParamsBegin
|
||||
* \cgalParamNBegin{number_of_iterations}
|
||||
* \cgalParamDescription{the number of iterations for the sequence of the smoothing iterations performed}
|
||||
* \cgalParamType{unsigned int}
|
||||
* \cgalParamDefault{`1`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{use_angle_smoothing}
|
||||
* \cgalParamDescription{value to indicate whether angle-based smoothing should be used}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`true`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{use_area_smoothing}
|
||||
* \cgalParamDescription{value to indicate whether area-based smoothing should be used}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`true`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{vertex_point_map}
|
||||
* \cgalParamDescription{a property map associating points to the vertices of `tmesh`}
|
||||
* \cgalParamType{a class model of `ReadWritePropertyMap` with `boost::graph_traits<TriangleMesh>::%vertex_descriptor`
|
||||
* as key type and `%Point_3` as value type}
|
||||
* \cgalParamDefault{`boost::get(CGAL::vertex_point, tmesh)`}
|
||||
* \cgalParamExtra{If this parameter is omitted, an internal property map for `CGAL::vertex_point_t`
|
||||
* must be available in `TriangleMesh`.}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{geom_traits}
|
||||
* \cgalParamDescription{an instance of a geometric traits class}
|
||||
* \cgalParamType{a class model of `Kernel`}
|
||||
* \cgalParamDefault{a \cgal Kernel deduced from the point type, using `CGAL::Kernel_traits`}
|
||||
* \cgalParamExtra{The geometric traits class must be compatible with the vertex point type.}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{use_safety_constraints}
|
||||
* \cgalParamDescription{If `true`, vertex moves that would worsen the mesh are ignored.}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`false`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{use_Delaunay_flips}
|
||||
* \cgalParamDescription{If `true`, area-based smoothing will be completed by a phase of
|
||||
* Delaunay-based edge-flips to prevent the creation of elongated triangles.}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`true`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{do_project}
|
||||
* \cgalParamDescription{If `true`, points are projected onto the initial surface after each iteration.}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`true`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{vertex_is_constrained_map}
|
||||
* \cgalParamDescription{a property map containing the constrained-or-not status of each vertex of `tmesh`.}
|
||||
* \cgalParamType{a class model of `ReadWritePropertyMap` with `boost::graph_traits<TriangleMesh>::%vertex_descriptor`
|
||||
* as key type and `bool` as value type. It must be default constructible.}
|
||||
* \cgalParamDefault{a default property map where no vertex is constrained}
|
||||
* \cgalParamExtra{A constrained vertex cannot be modified at all during smoothing.}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{edge_is_constrained_map}
|
||||
* \cgalParamDescription{a property map containing the constrained-or-not status of each edge of `tmesh`.}
|
||||
* \cgalParamType{a class model of `ReadWritePropertyMap` with `boost::graph_traits<TriangleMesh>::%edge_descriptor`
|
||||
* as key type and `bool` as value type. It must be default constructible.}
|
||||
* \cgalParamDefault{a default property map where no edge is constrained}
|
||||
* \cgalParamExtra{A constrained edge cannot be modified at all during smoothing.}
|
||||
* \cgalParamNEnd
|
||||
* \cgalNamedParamsEnd
|
||||
*
|
||||
* @warning The third party library \link thirdpartyCeres Ceres \endlink is required
|
||||
* to use area-based smoothing.
|
||||
*
|
||||
* @pre `tmesh` does not contain any degenerate faces
|
||||
*/
|
||||
template<typename TriangleMesh, typename FaceRange, typename NamedParameters>
|
||||
void angle_and_area_smoothing(const FaceRange& faces,
|
||||
TriangleMesh& tmesh,
|
||||
const NamedParameters& np)
|
||||
{
|
||||
typedef typename boost::graph_traits<TriangleMesh>::vertex_descriptor vertex_descriptor;
|
||||
typedef typename boost::graph_traits<TriangleMesh>::halfedge_descriptor halfedge_descriptor;
|
||||
typedef typename boost::graph_traits<TriangleMesh>::edge_descriptor edge_descriptor;
|
||||
typedef typename boost::graph_traits<TriangleMesh>::face_descriptor face_descriptor;
|
||||
|
||||
typedef typename GetGeomTraits<TriangleMesh, NamedParameters>::type GeomTraits;
|
||||
typedef typename GetVertexPointMap<TriangleMesh, NamedParameters>::type VertexPointMap;
|
||||
|
||||
// We need a default pmap that is not just 'constant_pmap(false)' because if an edge is constrained,
|
||||
// its vertices are constrained.
|
||||
typedef CGAL::dynamic_vertex_property_t<bool> Vertex_property_tag;
|
||||
typedef typename boost::property_map<TriangleMesh, Vertex_property_tag>::type Default_VCMap;
|
||||
typedef typename internal_np::Lookup_named_param_def<internal_np::vertex_is_constrained_t,
|
||||
NamedParameters,
|
||||
Default_VCMap
|
||||
> ::type VCMap;
|
||||
|
||||
typedef typename internal_np::Lookup_named_param_def<internal_np::edge_is_constrained_t,
|
||||
NamedParameters,
|
||||
Static_boolean_property_map<edge_descriptor, false> // default
|
||||
> ::type ECMap;
|
||||
|
||||
typedef internal::Area_smoother<TriangleMesh, VertexPointMap, GeomTraits> Area_optimizer;
|
||||
typedef internal::Mesh_smoother<Area_optimizer, TriangleMesh,
|
||||
VertexPointMap, VCMap, GeomTraits> Area_smoother;
|
||||
typedef internal::Delaunay_edge_flipper<TriangleMesh, VertexPointMap,
|
||||
ECMap, GeomTraits> Delaunay_flipper;
|
||||
|
||||
typedef internal::Angle_smoother<TriangleMesh, VertexPointMap, GeomTraits> Angle_optimizer;
|
||||
typedef internal::Mesh_smoother<Angle_optimizer, TriangleMesh,
|
||||
VertexPointMap, VCMap, GeomTraits> Angle_smoother;
|
||||
|
||||
typedef typename GeomTraits::Triangle_3 Triangle;
|
||||
typedef std::vector<Triangle> Triangle_container;
|
||||
|
||||
typedef CGAL::AABB_triangle_primitive<GeomTraits,
|
||||
typename Triangle_container::iterator> AABB_Primitive;
|
||||
typedef CGAL::AABB_traits<GeomTraits, AABB_Primitive> AABB_Traits;
|
||||
typedef CGAL::AABB_tree<AABB_Traits> Tree;
|
||||
|
||||
if(std::begin(faces) == std::end(faces))
|
||||
return;
|
||||
|
||||
using parameters::choose_parameter;
|
||||
using parameters::get_parameter;
|
||||
|
||||
// named parameters
|
||||
GeomTraits gt = choose_parameter<GeomTraits>(get_parameter(np, internal_np::geom_traits));
|
||||
VertexPointMap vpmap = choose_parameter(get_parameter(np, internal_np::vertex_point),
|
||||
get_property_map(CGAL::vertex_point, tmesh));
|
||||
|
||||
const bool use_angle_smoothing = choose_parameter(get_parameter(np, internal_np::use_angle_smoothing), true);
|
||||
bool use_area_smoothing = choose_parameter(get_parameter(np, internal_np::use_area_smoothing), true);
|
||||
|
||||
#ifndef CGAL_PMP_USE_CERES_SOLVER
|
||||
std::cerr << "Area-based smoothing requires the Ceres Library, which is not available." << std::endl;
|
||||
std::cerr << "No such smoothing will be performed!" << std::endl;
|
||||
use_area_smoothing = false;
|
||||
#endif
|
||||
|
||||
if(!use_angle_smoothing && !use_area_smoothing)
|
||||
std::cerr << "Called PMP::angle_and_area_smoothing() without any smoothing method selected or available" << std::endl;
|
||||
|
||||
unsigned int nb_iterations = choose_parameter(get_parameter(np, internal_np::number_of_iterations), 1);
|
||||
const bool do_project = choose_parameter(get_parameter(np, internal_np::do_project), true);
|
||||
const bool use_safety_constraints = choose_parameter(get_parameter(np, internal_np::use_safety_constraints), true);
|
||||
const bool use_Delaunay_flips = choose_parameter(get_parameter(np, internal_np::use_Delaunay_flips), true);
|
||||
|
||||
VCMap vcmap = choose_parameter(get_parameter(np, internal_np::vertex_is_constrained),
|
||||
get(Vertex_property_tag(), tmesh));
|
||||
|
||||
// If it's the default vcmap, manually set everything to false because the dynamic pmap has no default initialization
|
||||
if((std::is_same<VCMap, Default_VCMap>::value))
|
||||
{
|
||||
for(vertex_descriptor v : vertices(tmesh))
|
||||
put(vcmap, v, false);
|
||||
}
|
||||
|
||||
ECMap ecmap = choose_parameter(get_parameter(np, internal_np::edge_is_constrained),
|
||||
Static_boolean_property_map<edge_descriptor, false>());
|
||||
|
||||
// a constrained edge has constrained extremities
|
||||
for(face_descriptor f : faces)
|
||||
{
|
||||
if(f == boost::graph_traits<TriangleMesh>::null_face())
|
||||
continue;
|
||||
|
||||
for(halfedge_descriptor h : CGAL::halfedges_around_face(halfedge(f, tmesh), tmesh))
|
||||
{
|
||||
if(get(ecmap, edge(h, tmesh)))
|
||||
{
|
||||
put(vcmap, source(h, tmesh), true);
|
||||
put(vcmap, target(h, tmesh), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Construct the AABB tree (if needed for reprojection)
|
||||
std::vector<Triangle> input_triangles;
|
||||
|
||||
if(do_project)
|
||||
{
|
||||
input_triangles.reserve(faces.size());
|
||||
|
||||
for(face_descriptor f : faces)
|
||||
{
|
||||
halfedge_descriptor h = halfedge(f, tmesh);
|
||||
if(is_border(h, tmesh)) // should not happen, but just in case
|
||||
continue;
|
||||
|
||||
input_triangles.push_back(gt.construct_triangle_3_object()(get(vpmap, source(h, tmesh)),
|
||||
get(vpmap, target(h, tmesh)),
|
||||
get(vpmap, target(next(h, tmesh), tmesh))));
|
||||
}
|
||||
}
|
||||
|
||||
Tree aabb_tree(input_triangles.begin(), input_triangles.end());
|
||||
|
||||
// Setup the working ranges and check some preconditions
|
||||
Angle_smoother angle_smoother(tmesh, vpmap, vcmap, gt);
|
||||
Area_smoother area_smoother(tmesh, vpmap, vcmap, gt);
|
||||
Delaunay_flipper delaunay_flipper(tmesh, vpmap, ecmap, gt);
|
||||
|
||||
if(use_angle_smoothing)
|
||||
angle_smoother.init_smoothing(faces);
|
||||
|
||||
if(use_area_smoothing)
|
||||
area_smoother.init_smoothing(faces);
|
||||
|
||||
for(unsigned int i=0; i<nb_iterations; ++i)
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cout << "Iteration #" << i << std::endl;
|
||||
#endif
|
||||
|
||||
if(use_area_smoothing)
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cout << "Smooth areas..." << std::endl;
|
||||
#endif
|
||||
|
||||
// First apply area smoothing...
|
||||
area_smoother.optimize(use_safety_constraints /*check for bad faces*/,
|
||||
false /*apply moves as soon as they're calculated*/,
|
||||
false /*do not enforce a minimum angle improvement*/);
|
||||
if(do_project)
|
||||
{
|
||||
if(use_safety_constraints && does_self_intersect(tmesh))
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cerr << "Cannot re-project as there are self-intersections in the mesh!\n";
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
area_smoother.project_to_surface(aabb_tree);
|
||||
}
|
||||
|
||||
if(use_Delaunay_flips)
|
||||
delaunay_flipper(faces);
|
||||
}
|
||||
|
||||
// ... then angle smoothing
|
||||
if(use_angle_smoothing)
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cout << "Smooth angles..." << std::endl;
|
||||
#endif
|
||||
|
||||
angle_smoother.optimize(use_safety_constraints /*check for bad faces*/,
|
||||
true /*apply all moves at once*/,
|
||||
use_safety_constraints /*check if the min angle is improved*/);
|
||||
|
||||
if(do_project)
|
||||
{
|
||||
if(use_safety_constraints && does_self_intersect(tmesh))
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cerr << "Can't do re-projection, there are self-intersections in the mesh!\n";
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
angle_smoother.project_to_surface(aabb_tree);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
///\cond SKIP_IN_MANUAL
|
||||
template <typename FaceRange, typename TriangleMesh>
|
||||
void angle_and_area_smoothing(const FaceRange& face_range, TriangleMesh& tmesh)
|
||||
{
|
||||
angle_and_area_smoothing(face_range, tmesh, parameters::all_default());
|
||||
}
|
||||
|
||||
template <typename TriangleMesh, typename CGAL_PMP_NP_TEMPLATE_PARAMETERS>
|
||||
void angle_and_area_smoothing(TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np)
|
||||
{
|
||||
angle_and_area_smoothing(faces(tmesh), tmesh, np);
|
||||
}
|
||||
|
||||
template<typename TriangleMesh>
|
||||
void angle_and_area_smoothing(TriangleMesh& tmesh)
|
||||
{
|
||||
angle_and_area_smoothing(faces(tmesh), tmesh, parameters::all_default());
|
||||
}
|
||||
|
||||
template<typename TriangleMesh, typename GeomTraits, typename Stream>
|
||||
void angles_evaluation(TriangleMesh& tmesh, GeomTraits traits, Stream& output)
|
||||
{
|
||||
internal::Quality_evaluator<TriangleMesh, GeomTraits> evaluator(tmesh, traits);
|
||||
evaluator.gather_angles();
|
||||
evaluator.extract_angles(output);
|
||||
}
|
||||
|
||||
template<typename TriangleMesh, typename GeomTraits, typename Stream>
|
||||
void areas_evaluation(TriangleMesh& tmesh, GeomTraits traits, Stream& output)
|
||||
{
|
||||
internal::Quality_evaluator<TriangleMesh, GeomTraits> evaluator(tmesh, traits);
|
||||
evaluator.measure_areas();
|
||||
evaluator.extract_areas(output);
|
||||
}
|
||||
|
||||
template<typename TriangleMesh, typename GeomTraits, typename Stream>
|
||||
void aspect_ratio_evaluation(TriangleMesh& tmesh, GeomTraits traits, Stream& output)
|
||||
{
|
||||
internal::Quality_evaluator<TriangleMesh, GeomTraits> evaluator(tmesh, traits);
|
||||
evaluator.calc_aspect_ratios();
|
||||
evaluator.extract_aspect_ratios(output);
|
||||
}
|
||||
///\endcond SKIP_IN_MANUAL
|
||||
|
||||
} // namespace Polygon_mesh_processing
|
||||
} // namespace CGAL
|
||||
|
||||
#endif // CGAL_POLYGON_MESH_PROCESSING_ANGLE_AND_AREA_SMOOTHING_H
|
||||
|
|
@ -16,14 +16,13 @@
|
|||
|
||||
#include <CGAL/license/Polygon_mesh_processing/meshing_hole_filling.h>
|
||||
|
||||
#include <CGAL/Polygon_mesh_processing/internal/Smoothing/mesh_smoothing_impl.h>
|
||||
#include <CGAL/Polygon_mesh_processing/internal/Smoothing/smoothing_evaluation.h>
|
||||
#include <CGAL/Polygon_mesh_processing/self_intersections.h>
|
||||
#define CGAL_DEPRECATED_HEADER "<CGAL/Polygon_mesh_processing/smooth_mesh.h>"
|
||||
#define CGAL_REPLACEMENT_HEADER "<CGAL/Polygon_mesh_processing/angle_and_area_smoothing.h>"
|
||||
#include <CGAL/Installation/internal/deprecation_warning.h>
|
||||
|
||||
#include <CGAL/boost/graph/Named_function_parameters.h>
|
||||
#include <CGAL/boost/graph/named_params_helper.h>
|
||||
#include <CGAL/Polygon_mesh_processing/angle_and_area_smoothing.h>
|
||||
|
||||
#include <CGAL/property_map.h>
|
||||
#ifndef CGAL_NO_DEPRECATED_CODE
|
||||
|
||||
#ifdef DOXYGEN_RUNNING
|
||||
#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters
|
||||
|
|
@ -34,345 +33,42 @@ namespace CGAL {
|
|||
namespace Polygon_mesh_processing {
|
||||
|
||||
/*!
|
||||
* \ingroup PMP_meshing_grp
|
||||
* \ingroup PMPDeprecated
|
||||
*
|
||||
* \short smooths a triangulated region of a polygon mesh.
|
||||
*
|
||||
* This function attempts to make the triangle angle and area distributions as uniform as possible
|
||||
* by moving (non-constrained) vertices.
|
||||
*
|
||||
* Angle-based smoothing does not change the combinatorial information of the mesh. Area-based smoothing
|
||||
* might change the combinatorial information, unless specified otherwise. It is also possible
|
||||
* to make the smoothing algorithm "safer" by rejecting moves that, when applied, would worsen the
|
||||
* quality of the mesh, e.g. that would decrease the value of the smallest angle around a vertex or
|
||||
* create self-intersections.
|
||||
*
|
||||
* Optionally, the points are reprojected after each iteration.
|
||||
*
|
||||
* @tparam TriangleMesh model of `MutableFaceGraph`.
|
||||
* @tparam FaceRange range of `boost::graph_traits<TriangleMesh>::%face_descriptor`,
|
||||
model of `Range`. Its iterator type is `ForwardIterator`.
|
||||
* @tparam NamedParameters a sequence of \ref bgl_namedparameters "Named Parameters"
|
||||
*
|
||||
* @param tmesh a polygon mesh with triangulated surface patches to be smoothed.
|
||||
* @param faces the range of triangular faces defining one or several surface patches to be smoothed.
|
||||
* @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below
|
||||
*
|
||||
* \cgalNamedParamsBegin
|
||||
* \cgalParamNBegin{number_of_iterations}
|
||||
* \cgalParamDescription{the number of iterations for the sequence of the smoothing iterations performed}
|
||||
* \cgalParamType{unsigned int}
|
||||
* \cgalParamDefault{`1`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{use_angle_smoothing}
|
||||
* \cgalParamDescription{value to indicate whether angle-based smoothing should be used}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`true`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{use_area_smoothing}
|
||||
* \cgalParamDescription{value to indicate whether area-based smoothing should be used}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`true`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{vertex_point_map}
|
||||
* \cgalParamDescription{a property map associating points to the vertices of `tmesh`}
|
||||
* \cgalParamType{a class model of `ReadWritePropertyMap` with `boost::graph_traits<TriangleMesh>::%vertex_descriptor`
|
||||
* as key type and `%Point_3` as value type}
|
||||
* \cgalParamDefault{`boost::get(CGAL::vertex_point, tmesh)`}
|
||||
* \cgalParamExtra{If this parameter is omitted, an internal property map for `CGAL::vertex_point_t`
|
||||
* must be available in `TriangleMesh`.}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{geom_traits}
|
||||
* \cgalParamDescription{an instance of a geometric traits class}
|
||||
* \cgalParamType{a class model of `Kernel`}
|
||||
* \cgalParamDefault{a \cgal Kernel deduced from the point type, using `CGAL::Kernel_traits`}
|
||||
* \cgalParamExtra{The geometric traits class must be compatible with the vertex point type.}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{use_safety_constraints}
|
||||
* \cgalParamDescription{If `true`, vertex moves that would worsen the mesh are ignored.}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`false`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{use_Delaunay_flips}
|
||||
* \cgalParamDescription{If `true`, area-based smoothing will be completed by a phase of
|
||||
* Delaunay-based edge-flips to prevent the creation of elongated triangles.}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`true`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{do_project}
|
||||
* \cgalParamDescription{If `true`, points are projected onto the initial surface after each iteration.}
|
||||
* \cgalParamType{Boolean}
|
||||
* \cgalParamDefault{`true`}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{vertex_is_constrained_map}
|
||||
* \cgalParamDescription{a property map containing the constrained-or-not status of each vertex of `tmesh`.}
|
||||
* \cgalParamType{a class model of `ReadWritePropertyMap` with `boost::graph_traits<TriangleMesh>::%vertex_descriptor`
|
||||
* as key type and `bool` as value type. It must be default constructible.}
|
||||
* \cgalParamDefault{a default property map where no vertex is constrained}
|
||||
* \cgalParamExtra{A constrained vertex cannot be modified at all during smoothing.}
|
||||
* \cgalParamNEnd
|
||||
*
|
||||
* \cgalParamNBegin{edge_is_constrained_map}
|
||||
* \cgalParamDescription{a property map containing the constrained-or-not status of each edge of `tmesh`.}
|
||||
* \cgalParamType{a class model of `ReadWritePropertyMap` with `boost::graph_traits<TriangleMesh>::%edge_descriptor`
|
||||
* as key type and `bool` as value type. It must be default constructible.}
|
||||
* \cgalParamDefault{a default property map where no edge is constrained}
|
||||
* \cgalParamExtra{A constrained edge cannot be modified at all during smoothing.}
|
||||
* \cgalParamNEnd
|
||||
* \cgalNamedParamsEnd
|
||||
*
|
||||
* @warning The third party library \link thirdpartyCeres Ceres \endlink is required
|
||||
* to use area-based smoothing.
|
||||
*
|
||||
* @pre `tmesh` does not contain any degenerate faces
|
||||
* \deprecated This function is deprecated since \cgal 5.5,
|
||||
* `CGAL::angle_and_area_smoothing()` should be used instead.
|
||||
*/
|
||||
template<typename TriangleMesh, typename FaceRange, typename NamedParameters>
|
||||
void smooth_mesh(const FaceRange& faces,
|
||||
CGAL_DEPRECATED void smooth_mesh(const FaceRange& faces,
|
||||
TriangleMesh& tmesh,
|
||||
const NamedParameters& np)
|
||||
{
|
||||
typedef typename boost::graph_traits<TriangleMesh>::vertex_descriptor vertex_descriptor;
|
||||
typedef typename boost::graph_traits<TriangleMesh>::halfedge_descriptor halfedge_descriptor;
|
||||
typedef typename boost::graph_traits<TriangleMesh>::edge_descriptor edge_descriptor;
|
||||
typedef typename boost::graph_traits<TriangleMesh>::face_descriptor face_descriptor;
|
||||
|
||||
typedef typename GetGeomTraits<TriangleMesh, NamedParameters>::type GeomTraits;
|
||||
typedef typename GetVertexPointMap<TriangleMesh, NamedParameters>::type VertexPointMap;
|
||||
|
||||
// We need a default pmap that is not just 'constant_pmap(false)' because if an edge is constrained,
|
||||
// its vertices are constrained.
|
||||
typedef CGAL::dynamic_vertex_property_t<bool> Vertex_property_tag;
|
||||
typedef typename boost::property_map<TriangleMesh, Vertex_property_tag>::type Default_VCMap;
|
||||
typedef typename internal_np::Lookup_named_param_def<internal_np::vertex_is_constrained_t,
|
||||
NamedParameters,
|
||||
Default_VCMap
|
||||
> ::type VCMap;
|
||||
|
||||
typedef typename internal_np::Lookup_named_param_def<internal_np::edge_is_constrained_t,
|
||||
NamedParameters,
|
||||
Static_boolean_property_map<edge_descriptor, false> // default
|
||||
> ::type ECMap;
|
||||
|
||||
typedef internal::Area_smoother<TriangleMesh, VertexPointMap, GeomTraits> Area_optimizer;
|
||||
typedef internal::Mesh_smoother<Area_optimizer, TriangleMesh,
|
||||
VertexPointMap, VCMap, GeomTraits> Area_smoother;
|
||||
typedef internal::Delaunay_edge_flipper<TriangleMesh, VertexPointMap,
|
||||
ECMap, GeomTraits> Delaunay_flipper;
|
||||
|
||||
typedef internal::Angle_smoother<TriangleMesh, VertexPointMap, GeomTraits> Angle_optimizer;
|
||||
typedef internal::Mesh_smoother<Angle_optimizer, TriangleMesh,
|
||||
VertexPointMap, VCMap, GeomTraits> Angle_smoother;
|
||||
|
||||
typedef typename GeomTraits::Triangle_3 Triangle;
|
||||
typedef std::vector<Triangle> Triangle_container;
|
||||
|
||||
typedef CGAL::AABB_triangle_primitive<GeomTraits,
|
||||
typename Triangle_container::iterator> AABB_Primitive;
|
||||
typedef CGAL::AABB_traits<GeomTraits, AABB_Primitive> AABB_Traits;
|
||||
typedef CGAL::AABB_tree<AABB_Traits> Tree;
|
||||
|
||||
if(std::begin(faces) == std::end(faces))
|
||||
return;
|
||||
|
||||
using parameters::choose_parameter;
|
||||
using parameters::get_parameter;
|
||||
|
||||
// named parameters
|
||||
GeomTraits gt = choose_parameter<GeomTraits>(get_parameter(np, internal_np::geom_traits));
|
||||
VertexPointMap vpmap = choose_parameter(get_parameter(np, internal_np::vertex_point),
|
||||
get_property_map(CGAL::vertex_point, tmesh));
|
||||
|
||||
const bool use_angle_smoothing = choose_parameter(get_parameter(np, internal_np::use_angle_smoothing), true);
|
||||
bool use_area_smoothing = choose_parameter(get_parameter(np, internal_np::use_area_smoothing), true);
|
||||
|
||||
#ifndef CGAL_PMP_USE_CERES_SOLVER
|
||||
std::cerr << "Area-based smoothing requires the Ceres Library, which is not available." << std::endl;
|
||||
std::cerr << "No such smoothing will be performed!" << std::endl;
|
||||
use_area_smoothing = false;
|
||||
#endif
|
||||
|
||||
if(!use_angle_smoothing && !use_area_smoothing)
|
||||
std::cerr << "Called PMP::smooth_mesh() without any smoothing method selected or available" << std::endl;
|
||||
|
||||
unsigned int nb_iterations = choose_parameter(get_parameter(np, internal_np::number_of_iterations), 1);
|
||||
const bool do_project = choose_parameter(get_parameter(np, internal_np::do_project), true);
|
||||
const bool use_safety_constraints = choose_parameter(get_parameter(np, internal_np::use_safety_constraints), true);
|
||||
const bool use_Delaunay_flips = choose_parameter(get_parameter(np, internal_np::use_Delaunay_flips), true);
|
||||
|
||||
VCMap vcmap = choose_parameter(get_parameter(np, internal_np::vertex_is_constrained),
|
||||
get(Vertex_property_tag(), tmesh));
|
||||
|
||||
// If it's the default vcmap, manually set everything to false because the dynamic pmap has no default initialization
|
||||
if((std::is_same<VCMap, Default_VCMap>::value))
|
||||
{
|
||||
for(vertex_descriptor v : vertices(tmesh))
|
||||
put(vcmap, v, false);
|
||||
}
|
||||
|
||||
ECMap ecmap = choose_parameter(get_parameter(np, internal_np::edge_is_constrained),
|
||||
Static_boolean_property_map<edge_descriptor, false>());
|
||||
|
||||
// a constrained edge has constrained extremities
|
||||
for(face_descriptor f : faces)
|
||||
{
|
||||
if(f == boost::graph_traits<TriangleMesh>::null_face())
|
||||
continue;
|
||||
|
||||
for(halfedge_descriptor h : CGAL::halfedges_around_face(halfedge(f, tmesh), tmesh))
|
||||
{
|
||||
if(get(ecmap, edge(h, tmesh)))
|
||||
{
|
||||
put(vcmap, source(h, tmesh), true);
|
||||
put(vcmap, target(h, tmesh), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Construct the AABB tree (if needed for reprojection)
|
||||
std::vector<Triangle> input_triangles;
|
||||
|
||||
if(do_project)
|
||||
{
|
||||
input_triangles.reserve(faces.size());
|
||||
|
||||
for(face_descriptor f : faces)
|
||||
{
|
||||
halfedge_descriptor h = halfedge(f, tmesh);
|
||||
if(is_border(h, tmesh)) // should not happen, but just in case
|
||||
continue;
|
||||
|
||||
input_triangles.push_back(gt.construct_triangle_3_object()(get(vpmap, source(h, tmesh)),
|
||||
get(vpmap, target(h, tmesh)),
|
||||
get(vpmap, target(next(h, tmesh), tmesh))));
|
||||
}
|
||||
}
|
||||
|
||||
Tree aabb_tree(input_triangles.begin(), input_triangles.end());
|
||||
|
||||
// Setup the working ranges and check some preconditions
|
||||
Angle_smoother angle_smoother(tmesh, vpmap, vcmap, gt);
|
||||
Area_smoother area_smoother(tmesh, vpmap, vcmap, gt);
|
||||
Delaunay_flipper delaunay_flipper(tmesh, vpmap, ecmap, gt);
|
||||
|
||||
if(use_angle_smoothing)
|
||||
angle_smoother.init_smoothing(faces);
|
||||
|
||||
if(use_area_smoothing)
|
||||
area_smoother.init_smoothing(faces);
|
||||
|
||||
for(unsigned int i=0; i<nb_iterations; ++i)
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cout << "Iteration #" << i << std::endl;
|
||||
#endif
|
||||
|
||||
if(use_area_smoothing)
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cout << "Smooth areas..." << std::endl;
|
||||
#endif
|
||||
|
||||
// First apply area smoothing...
|
||||
area_smoother.optimize(use_safety_constraints /*check for bad faces*/,
|
||||
false /*apply moves as soon as they're calculated*/,
|
||||
false /*do not enforce a minimum angle improvement*/);
|
||||
if(do_project)
|
||||
{
|
||||
if(use_safety_constraints && does_self_intersect(tmesh))
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cerr << "Cannot re-project as there are self-intersections in the mesh!\n";
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
area_smoother.project_to_surface(aabb_tree);
|
||||
}
|
||||
|
||||
if(use_Delaunay_flips)
|
||||
delaunay_flipper(faces);
|
||||
}
|
||||
|
||||
// ... then angle smoothing
|
||||
if(use_angle_smoothing)
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cout << "Smooth angles..." << std::endl;
|
||||
#endif
|
||||
|
||||
angle_smoother.optimize(use_safety_constraints /*check for bad faces*/,
|
||||
true /*apply all moves at once*/,
|
||||
use_safety_constraints /*check if the min angle is improved*/);
|
||||
|
||||
if(do_project)
|
||||
{
|
||||
if(use_safety_constraints && does_self_intersect(tmesh))
|
||||
{
|
||||
#ifdef CGAL_PMP_SMOOTHING_DEBUG
|
||||
std::cerr << "Can't do re-projection, there are self-intersections in the mesh!\n";
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
angle_smoother.project_to_surface(aabb_tree);
|
||||
}
|
||||
}
|
||||
}
|
||||
angle_and_area_smoothing(faces, tmesh, np);
|
||||
}
|
||||
|
||||
///\cond SKIP_IN_MANUAL
|
||||
template <typename FaceRange, typename TriangleMesh>
|
||||
void smooth_mesh(const FaceRange& face_range, TriangleMesh& tmesh)
|
||||
CGAL_DEPRECATED void smooth_mesh(const FaceRange& face_range, TriangleMesh& tmesh)
|
||||
{
|
||||
smooth_mesh(face_range, tmesh, parameters::all_default());
|
||||
}
|
||||
|
||||
template <typename TriangleMesh, typename CGAL_PMP_NP_TEMPLATE_PARAMETERS>
|
||||
void smooth_mesh(TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np)
|
||||
CGAL_DEPRECATED void smooth_mesh(TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np)
|
||||
{
|
||||
smooth_mesh(faces(tmesh), tmesh, np);
|
||||
}
|
||||
|
||||
template<typename TriangleMesh>
|
||||
void smooth_mesh(TriangleMesh& tmesh)
|
||||
CGAL_DEPRECATED void smooth_mesh(TriangleMesh& tmesh)
|
||||
{
|
||||
smooth_mesh(faces(tmesh), tmesh, parameters::all_default());
|
||||
}
|
||||
|
||||
template<typename TriangleMesh, typename GeomTraits, typename Stream>
|
||||
void angles_evaluation(TriangleMesh& tmesh, GeomTraits traits, Stream& output)
|
||||
{
|
||||
internal::Quality_evaluator<TriangleMesh, GeomTraits> evaluator(tmesh, traits);
|
||||
evaluator.gather_angles();
|
||||
evaluator.extract_angles(output);
|
||||
}
|
||||
|
||||
template<typename TriangleMesh, typename GeomTraits, typename Stream>
|
||||
void areas_evaluation(TriangleMesh& tmesh, GeomTraits traits, Stream& output)
|
||||
{
|
||||
internal::Quality_evaluator<TriangleMesh, GeomTraits> evaluator(tmesh, traits);
|
||||
evaluator.measure_areas();
|
||||
evaluator.extract_areas(output);
|
||||
}
|
||||
|
||||
template<typename TriangleMesh, typename GeomTraits, typename Stream>
|
||||
void aspect_ratio_evaluation(TriangleMesh& tmesh, GeomTraits traits, Stream& output)
|
||||
{
|
||||
internal::Quality_evaluator<TriangleMesh, GeomTraits> evaluator(tmesh, traits);
|
||||
evaluator.calc_aspect_ratios();
|
||||
evaluator.extract_aspect_ratios(output);
|
||||
}
|
||||
///\endcond SKIP_IN_MANUAL
|
||||
|
||||
} // namespace Polygon_mesh_processing
|
||||
} // namespace CGAL
|
||||
|
||||
#endif //#ifndef CGAL_NO_DEPRECATED_CODE
|
||||
|
||||
#endif // CGAL_POLYGON_MESH_PROCESSING_SMOOTH_MESH_H
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <CGAL/Surface_mesh.h>
|
||||
#include <CGAL/Polyhedron_3.h>
|
||||
#include <CGAL/Polygon_mesh_processing/smooth_mesh.h>
|
||||
#include <CGAL/Polygon_mesh_processing/angle_and_area_smoothing.h>
|
||||
#include <CGAL/Polygon_mesh_processing/tangential_relaxation.h>
|
||||
|
||||
#include <CGAL/property_map.h>
|
||||
|
|
@ -37,8 +37,8 @@ void test_smoothing(const char* filename)
|
|||
Mesh mesh;
|
||||
read_mesh(filename, mesh);
|
||||
|
||||
PMP::smooth_mesh(mesh);
|
||||
PMP::smooth_mesh(mesh, CGAL::parameters::number_of_iterations(10));
|
||||
PMP::angle_and_area_smoothing(mesh);
|
||||
PMP::angle_and_area_smoothing(mesh, CGAL::parameters::number_of_iterations(10));
|
||||
}
|
||||
|
||||
template <typename Mesh>
|
||||
|
|
@ -47,8 +47,8 @@ void test_angle_smoothing(const char* filename)
|
|||
Mesh mesh;
|
||||
read_mesh(filename, mesh);
|
||||
|
||||
PMP::smooth_mesh(mesh);
|
||||
PMP::smooth_mesh(mesh, CGAL::parameters::number_of_iterations(10)
|
||||
PMP::angle_and_area_smoothing(mesh);
|
||||
PMP::angle_and_area_smoothing(mesh, CGAL::parameters::number_of_iterations(10)
|
||||
.use_area_smoothing(false));
|
||||
}
|
||||
|
||||
|
|
@ -58,8 +58,8 @@ void test_area_smoothing(const char* filename)
|
|||
Mesh mesh;
|
||||
read_mesh(filename, mesh);
|
||||
|
||||
PMP::smooth_mesh(mesh);
|
||||
PMP::smooth_mesh(mesh, CGAL::parameters::number_of_iterations(10)
|
||||
PMP::angle_and_area_smoothing(mesh);
|
||||
PMP::angle_and_area_smoothing(mesh, CGAL::parameters::number_of_iterations(10)
|
||||
.use_angle_smoothing(false));
|
||||
}
|
||||
|
||||
|
|
@ -69,7 +69,7 @@ void test_angle_smoothing_without_projection(const char* filename)
|
|||
Mesh mesh;
|
||||
read_mesh(filename, mesh);
|
||||
|
||||
PMP::smooth_mesh(mesh, CGAL::parameters::do_project(false)
|
||||
PMP::angle_and_area_smoothing(mesh, CGAL::parameters::do_project(false)
|
||||
.use_area_smoothing(false));
|
||||
}
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ void test_area_smoothing_without_projection(const char* filename)
|
|||
Mesh mesh;
|
||||
read_mesh(filename, mesh);
|
||||
|
||||
PMP::smooth_mesh(mesh, CGAL::parameters::do_project(false)
|
||||
PMP::angle_and_area_smoothing(mesh, CGAL::parameters::do_project(false)
|
||||
.use_angle_smoothing(false));
|
||||
}
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ void test_constrained_vertices(const char* filename)
|
|||
|
||||
CGAL::Boolean_property_map<std::set<vertex_descriptor> > vcmap(selected_vertices);
|
||||
|
||||
PMP::smooth_mesh(mesh, CGAL::parameters::vertex_is_constrained_map(vcmap));
|
||||
PMP::angle_and_area_smoothing(mesh, CGAL::parameters::vertex_is_constrained_map(vcmap));
|
||||
|
||||
for(vertex_descriptor v : vertices(mesh))
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue