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

fix compilation issues

This commit is contained in:
Sébastien Loriot 2021-04-11 07:45:14 +02:00
parent 9de41310fd
commit ad55b8cd9f
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
View File

@ -227,14 +227,14 @@ namespace internal {
template<typename PM,
typename EdgeConstraintMap,
typename VertexPointMap,
typename FacePatchMap>
typename FacePatchMap,
typename SizingFunction>
bool constraints_are_short_enough(const PM& pmesh,
EdgeConstraintMap ecmap,
VertexPointMap vpmap,
const FacePatchMap& fpm,
const double& high)
const SizingFunction& sizing)
{
double sqh = high*high;
typedef typename boost::graph_traits<PM>::halfedge_descriptor halfedge_descriptor;
typedef typename boost::graph_traits<PM>::edge_descriptor edge_descriptor;
for(edge_descriptor e : edges(pmesh))
@ -244,8 +244,7 @@ namespace internal {
get(ecmap, e) ||
get(fpm, face(h,pmesh))!=get(fpm, face(opposite(h,pmesh),pmesh)) )
{
if (sqh < CGAL::squared_distance(get(vpmap, source(h, pmesh)),
get(vpmap, target(h, pmesh))))
if (sizing.is_too_long(source(h, pmesh), target(h, pmesh)))
{
return false;
}

19
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h
View File

@ -31,6 +31,16 @@ namespace CGAL {
namespace Polygon_mesh_processing {
/*! \todo document me or merge the doc with the original overload*/
template<typename PolygonMesh
, typename FaceRange
, typename SizingFunction
, typename NamedParameters>
void isotropic_remeshing(const FaceRange& faces
, const SizingFunction& sizing
, PolygonMesh& pmesh
, const NamedParameters& np);
/*!
* \ingroup PMP_meshing_grp
*
@ -200,8 +210,10 @@ void isotropic_remeshing(const FaceRange& faces
, PolygonMesh& pmesh
, const NamedParameters& np = parameters::default_values())
{
isotropic_remeshing(faces,
CGAL::Uniform_sizing_field<PolygonMesh>(target_edge_length, pmesh),
typedef Uniform_sizing_field<PolygonMesh> Default_sizing;
isotropic_remeshing<PolygonMesh, FaceRange, Default_sizing, NamedParameters>(
faces,
Default_sizing(target_edge_length, pmesh),
pmesh,
np);
}
@ -280,12 +292,11 @@ void isotropic_remeshing(const FaceRange& faces
#if !defined(CGAL_NO_PRECONDITIONS)
if(protect)
{
double high = 4. / 3. * target_edge_length;
std::string msg("Isotropic remeshing : protect_constraints cannot be set to");
msg.append(" true with constraints larger than 4/3 * target_edge_length.");
msg.append(" Remeshing aborted.");
CGAL_precondition_msg(
internal::constraints_are_short_enough(pmesh, ecmap, vpmap, fpmap, high),
internal::constraints_are_short_enough(pmesh, ecmap, vpmap, fpmap, sizing),
msg.c_str());
}
#endif