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

Remove useless parameter simplify API call

This commit is contained in:
Mael Rouxel-Labbé 2024-02-26 17:55:26 +01:00
parent b905a8f41a
commit b4bc7ee168
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/Isosurfacing_domain_3.h
View File

@ -95,6 +95,24 @@ public:
return PT::point(v, m_partition);
}
// returns the value of the function at vertex `v`
decltype(auto) /*FT*/ value(const Vertex_descriptor& v) const
{
return m_values(v);
}
// returns the value of the function at point `p`
decltype(auto) /*FT*/ value(const Point_3& p) const
{
return m_values(p);
}
// returns the gradient at point `p`
decltype(auto) /*Vector_3*/ gradient(const Point_3& p) const
{
return m_gradients(p);
}
// returns a container with the two vertices incident to the edge `e`
decltype(auto) /*Vertices_incident_to_edge*/ incident_vertices(const Edge_descriptor& e) const
{
@ -140,22 +158,13 @@ public:
PT::for_each_cell(f, m_partition, ConcurrencyTag{});
}
// returns the value of the function at vertex `v`
decltype(auto) /*FT*/ value(const Vertex_descriptor& v) const
// finds the intersection of the isosurface with the edge `e` (if any)
bool construct_intersection(const Point_3& p_0, const Point_3& p_1,
const FT val_0, const FT val_1,
const FT isovalue,
Point_3& p) const
{
return m_values(v);
}
// returns the value of the function at point `p`
decltype(auto) /*FT*/ value(const Point_3& p) const
{
return m_values(p);
}
// returns the gradient at point `p`
decltype(auto) /*Vector_3*/ gradient(const Point_3& p) const
{
return m_gradients(p);
return m_intersection_oracle(p_0, p_1, val_0, val_1, *this, isovalue, p);
}
};

4
Isosurfacing_3/include/CGAL/Isosurfacing_3/internal/dual_contouring_functors.h
View File

@ -338,7 +338,7 @@ public:
const FT val1 = domain.value(v1);
Point_3 p;
bool res = domain.intersection_oracle()(p0, p1, val0, val1, domain, isovalue, p);
bool res = domain.construct_intersection(p0, p1, val0, val1, isovalue, p);
if(!res)
return;
@ -466,7 +466,7 @@ public:
const FT val1 = domain.value(v1);
Point_3 p;
bool res = domain.intersection_oracle()(p0, p1, val0, val1, domain, isovalue, p);
bool res = domain.construct_intersection(p0, p1, val0, val1, isovalue, p);
if(!res)
return;