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

refs are not needed here 

Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
This commit is contained in:
Jane Tournois 2023-06-13 10:40:33 +02:00
parent 5629f7a04b
commit cb779038f6
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Adaptive_sizing_field.h
View File

@ -66,8 +66,8 @@ public:
} }
private: private:
FT sqlength(const vertex_descriptor& va, FT sqlength(const vertex_descriptor va,
const vertex_descriptor& vb) const const vertex_descriptor vb) const
{ {
typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::const_type typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::const_type
vpmap = get(CGAL::vertex_point, m_pmesh); vpmap = get(CGAL::vertex_point, m_pmesh);
@ -80,7 +80,7 @@ private:
} }
public: public:
FT get_sizing(const vertex_descriptor& v) const { FT get_sizing(const vertex_descriptor v) const {
CGAL_assertion(get(m_vertex_sizing_map, v)); CGAL_assertion(get(m_vertex_sizing_map, v));
return get(m_vertex_sizing_map, v); return get(m_vertex_sizing_map, v);
} }
@ -140,7 +140,7 @@ public:
#endif #endif
} }
boost::optional<FT> is_too_long(const halfedge_descriptor& h) const boost::optional<FT> is_too_long(const halfedge_descriptor h) const
{ {
const FT sqlen = sqlength(h); const FT sqlen = sqlength(h);
FT sqtarg_len = CGAL::min(get(m_vertex_sizing_map, source(h, m_pmesh)), FT sqtarg_len = CGAL::min(get(m_vertex_sizing_map, source(h, m_pmesh)),
@ -153,8 +153,8 @@ public:
return boost::none; return boost::none;
} }
boost::optional<FT> is_too_long(const vertex_descriptor& va, boost::optional<FT> is_too_long(const vertex_descriptor va,
const vertex_descriptor& vb) const const vertex_descriptor vb) const
{ {
const FT sqlen = sqlength(va, vb); const FT sqlen = sqlength(va, vb);
FT sqtarg_len = CGAL::min(get(m_vertex_sizing_map, va), FT sqtarg_len = CGAL::min(get(m_vertex_sizing_map, va),
@ -167,7 +167,7 @@ public:
return boost::none; return boost::none;
} }
boost::optional<FT> is_too_short(const halfedge_descriptor& h) const boost::optional<FT> is_too_short(const halfedge_descriptor h) const
{ {
const FT sqlen = sqlength(h); const FT sqlen = sqlength(h);
FT sqtarg_len = CGAL::min(get(m_vertex_sizing_map, source(h, m_pmesh)), FT sqtarg_len = CGAL::min(get(m_vertex_sizing_map, source(h, m_pmesh)),
@ -180,7 +180,7 @@ public:
return boost::none; return boost::none;
} }
virtual Point_3 split_placement(const halfedge_descriptor& h) const virtual Point_3 split_placement(const halfedge_descriptor h) const
{ {
typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::const_type typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::const_type
vpmap = get(CGAL::vertex_point, m_pmesh); vpmap = get(CGAL::vertex_point, m_pmesh);
@ -188,7 +188,7 @@ public:
get(vpmap, source(h, m_pmesh))); get(vpmap, source(h, m_pmesh)));
} }
void update_sizing_map(const vertex_descriptor& v) void update_sizing_map(const vertex_descriptor v)
{ {
// calculating it as the average of two vertices on other ends // calculating it as the average of two vertices on other ends
// of halfedges as updating is done during an edge split // of halfedges as updating is done during an edge split

10
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Sizing_field.h
View File

@ -39,11 +39,11 @@ public:
typedef typename K::FT FT; typedef typename K::FT FT;
public: public:
virtual boost::optional<FT> is_too_long(const halfedge_descriptor& h) const = 0; virtual boost::optional<FT> is_too_long(const halfedge_descriptor h) const = 0;
virtual boost::optional<FT> is_too_long(const vertex_descriptor& va, virtual boost::optional<FT> is_too_long(const vertex_descriptor va,
const vertex_descriptor& vb) const = 0; const vertex_descriptor vb) const = 0;
virtual boost::optional<FT> is_too_short(const halfedge_descriptor& h) const = 0; virtual boost::optional<FT> is_too_short(const halfedge_descriptor h) const = 0;
virtual Point_3 split_placement(const halfedge_descriptor& h) const = 0; virtual Point_3 split_placement(const halfedge_descriptor h) const = 0;
}; };

14
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/Uniform_sizing_field.h
View File

@ -42,8 +42,8 @@ public:
{} {}
private: private:
FT sqlength(const vertex_descriptor& va, FT sqlength(const vertex_descriptor va,
const vertex_descriptor& vb) const const vertex_descriptor vb) const
{ {
typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::const_type typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::const_type
vpmap = get(CGAL::vertex_point, m_pmesh); vpmap = get(CGAL::vertex_point, m_pmesh);
@ -60,7 +60,7 @@ public:
void calc_sizing_map() const {} void calc_sizing_map() const {}
void update_sizing_map(const vertex_descriptor& vnew) const {} void update_sizing_map(const vertex_descriptor& vnew) const {}
boost::optional<FT> is_too_long(const halfedge_descriptor& h) const boost::optional<FT> is_too_long(const halfedge_descriptor h) const
{ {
const FT sqlen = sqlength(h); const FT sqlen = sqlength(h);
if(sqlen > m_sq_long) if(sqlen > m_sq_long)
@ -69,8 +69,8 @@ public:
return boost::none; return boost::none;
} }
boost::optional<FT> is_too_long(const vertex_descriptor& va, boost::optional<FT> is_too_long(const vertex_descriptor va,
const vertex_descriptor& vb) const const vertex_descriptor vb) const
{ {
const FT sqlen = sqlength(va, vb); const FT sqlen = sqlength(va, vb);
if (sqlen > m_sq_long) if (sqlen > m_sq_long)
@ -79,7 +79,7 @@ public:
return boost::none; return boost::none;
} }
boost::optional<FT> is_too_short(const halfedge_descriptor& h) const boost::optional<FT> is_too_short(const halfedge_descriptor h) const
{ {
const FT sqlen = sqlength(h); const FT sqlen = sqlength(h);
if (sqlen < m_sq_long) if (sqlen < m_sq_long)
@ -88,7 +88,7 @@ public:
return boost::none; return boost::none;
} }
virtual Point_3 split_placement(const halfedge_descriptor& h) const virtual Point_3 split_placement(const halfedge_descriptor h) const
{ {
typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::const_type typename boost::property_map<PolygonMesh, CGAL::vertex_point_t>::const_type
vpmap = get(CGAL::vertex_point, m_pmesh); vpmap = get(CGAL::vertex_point, m_pmesh);