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

Comment unitialized argument and link eigen correctly

This commit is contained in:
lvalque 2025-09-10 14:33:18 +02:00
parent d99baac07f
commit 25aa21635a
9 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/CHANGES.md
View File

@ -648,7 +648,7 @@ Release date: July 2023
- Added the class `CGAL::Surface_mesh_simplification::GarlandHeckbert_plane_and_line_policies`, which provides improved output for `CGAL::Surface_mesh_simplification::edge_collapse`. - Added the class `CGAL::Surface_mesh_simplification::GarlandHeckbert_plane_and_line_policies`, which provides improved output for `CGAL::Surface_mesh_simplification::edge_collapse`.
- That class works the same as previous `GarlandHeckbert_policies` - That class works the same as previous `GarlandHeckbert_policies`
- Its constructor takes a `Mesh` and an optional `double` parameter specifying the weight of the line policy relative to the plane policy (default: 0.01). - Its constructor takes a `Mesh` and an optional `double` parameter specifying the weight of the line policy relative to the plane policy (default: 0.01).
- `CGAL::Surface_mesh_simplification::GarlandHeckbert_policies.h` is now an alias of `CGAL::Surface_mesh_simplification::GarlandHeckbert_plane_plus_line_policies.h` and is no longer deprecated. - `CGAL::Surface_mesh_simplification::GarlandHeckbert_policies.h` is now an alias of `CGAL::Surface_mesh_simplification::GarlandHeckbert_plane_and_line_policies.h` and is no longer deprecated.
### [2D Regularized Boolean Set Operations](https://doc.cgal.org/5.6/Manual/packages.html#PkgBooleanSetOperations2) ### [2D Regularized Boolean Set Operations](https://doc.cgal.org/5.6/Manual/packages.html#PkgBooleanSetOperations2)
- Exposed all required member functions of the - Exposed all required member functions of the

5
Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_and_line_policies.h
View File

@ -45,9 +45,10 @@ public:
/// @{ /// @{
/*! /*!
initializes the Garland-Heckbert Plane policies. initializes the Garland-Heckbert Plane policies. The `line_weight` parameter (default: 0.01) defines the weight of the line
policy relative to the plane policy.
*/ */
GarlandHeckbert_plane_and_line_policies(TriangleMesh& tmesh); GarlandHeckbert_plane_and_line_policies(TriangleMesh& tmesh, const FT line_weight=FT(0.01));
/// @} /// @}

4
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_and_line_policies.h
View File

@ -43,8 +43,8 @@ public:
public: public:
GarlandHeckbert_plane_and_line_policies(TriangleMesh& tmesh, GarlandHeckbert_plane_and_line_policies(TriangleMesh& tmesh,
const FT dm = FT(100), const FT line_weight=FT(0.01),
const FT line_weight=FT(0.01)) const FT dm = FT(100))
: Base(tmesh, FT(1.)/line_weight, dm) : Base(tmesh, FT(1.)/line_weight, dm)
{ } { }

8
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_policies.h
View File

@ -33,10 +33,10 @@ public:
Plane_quadric_calculator() { } Plane_quadric_calculator() { }
template <typename VertexPointMap> template <typename VertexPointMap>
Mat_4 construct_quadric_from_vertex(typename boost::graph_traits<TriangleMesh>::vertex_descriptor v, Mat_4 construct_quadric_from_vertex(typename boost::graph_traits<TriangleMesh>::vertex_descriptor /*v*/,
const TriangleMesh& tmesh, const TriangleMesh& /*tmesh*/,
const VertexPointMap point_map, const VertexPointMap /*point_map*/,
const GeomTraits& gt) const const GeomTraits& /*gt*/) const
{ {
return Mat_4::Zero(); return Mat_4::Zero();
} }

8
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_plane_policies.h
View File

@ -75,10 +75,10 @@ public:
public: public:
template <typename VertexPointMap> template <typename VertexPointMap>
Mat_4 construct_quadric_from_vertex(typename boost::graph_traits<TriangleMesh>::vertex_descriptor v, Mat_4 construct_quadric_from_vertex(typename boost::graph_traits<TriangleMesh>::vertex_descriptor /*v*/,
const TriangleMesh& tmesh, const TriangleMesh& /*tmesh*/,
const VertexPointMap point_map, const VertexPointMap /*point_map*/,
const GeomTraits& gt) const const GeomTraits& /*gt*/) const
{ {
return Mat_4::Zero(); return Mat_4::Zero();
} }

8
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_probabilistic_triangle_policies.h
View File

@ -75,10 +75,10 @@ public:
public: public:
template <typename VertexPointMap> template <typename VertexPointMap>
Mat_4 construct_quadric_from_vertex(typename boost::graph_traits<TriangleMesh>::vertex_descriptor v, Mat_4 construct_quadric_from_vertex(typename boost::graph_traits<TriangleMesh>::vertex_descriptor /*v*/,
const TriangleMesh& tmesh, const TriangleMesh& /*tmesh*/,
const VertexPointMap point_map, const VertexPointMap /*point_map*/,
const GeomTraits& gt) const const GeomTraits& /*gt*/) const
{ {
return Mat_4::Zero(); return Mat_4::Zero();
} }

8
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_triangle_policies.h
View File

@ -33,10 +33,10 @@ public:
Triangle_quadric_calculator() { } Triangle_quadric_calculator() { }
template <typename VertexPointMap> template <typename VertexPointMap>
Mat_4 construct_quadric_from_vertex(typename boost::graph_traits<TriangleMesh>::vertex_descriptor v, Mat_4 construct_quadric_from_vertex(typename boost::graph_traits<TriangleMesh>::vertex_descriptor /*v*/,
const TriangleMesh& tmesh, const TriangleMesh& /*tmesh*/,
const VertexPointMap point_map, const VertexPointMap /*point_map*/,
const GeomTraits& gt) const const GeomTraits& /*gt*/) const
{ {
return Mat_4::Zero(); return Mat_4::Zero();
} }

16
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/GarlandHeckbert_line_policies.h
View File

@ -46,19 +46,19 @@ public:
} }
template <typename VertexPointMap> template <typename VertexPointMap>
Mat_4 construct_quadric_from_edge(typename boost::graph_traits<TriangleMesh>::halfedge_descriptor he, Mat_4 construct_quadric_from_edge(typename boost::graph_traits<TriangleMesh>::halfedge_descriptor /*he*/,
const TriangleMesh& tmesh, const TriangleMesh& /*tmesh*/,
const VertexPointMap point_map, const VertexPointMap /*point_map*/,
const GeomTraits& gt) const const GeomTraits& /*gt*/) const
{ {
return Mat_4::Zero(); return Mat_4::Zero();
} }
template <typename VertexPointMap> template <typename VertexPointMap>
Mat_4 construct_quadric_from_face(typename boost::graph_traits<TriangleMesh>::face_descriptor f, Mat_4 construct_quadric_from_face(typename boost::graph_traits<TriangleMesh>::face_descriptor /*f*/,
const TriangleMesh& tmesh, const TriangleMesh& /*tmesh*/,
const VertexPointMap point_map, const VertexPointMap /*point_map*/,
const GeomTraits& gt) const const GeomTraits& /*gt*/) const
{ {
return Mat_4::Zero(); return Mat_4::Zero();
} }

3
Surface_mesh_simplification/test/Surface_mesh_simplification/CMakeLists.txt
View File

@ -13,13 +13,14 @@ create_single_source_cgal_program("test_edge_collapse_Polyhedron_3.cpp")
create_single_source_cgal_program("test_edge_profile_link.cpp") create_single_source_cgal_program("test_edge_profile_link.cpp")
create_single_source_cgal_program("test_edge_deprecated_stop_predicates.cpp") create_single_source_cgal_program("test_edge_deprecated_stop_predicates.cpp")
create_single_source_cgal_program("test_edge_collapse_stability.cpp") create_single_source_cgal_program("test_edge_collapse_stability.cpp")
create_single_source_cgal_program("test_issue_8988.cpp")
find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
include(CGAL_Eigen3_support) include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support) if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("edge_collapse_garland_heckbert_variations.cpp") create_single_source_cgal_program("edge_collapse_garland_heckbert_variations.cpp")
target_link_libraries(edge_collapse_garland_heckbert_variations PRIVATE CGAL::Eigen3_support) target_link_libraries(edge_collapse_garland_heckbert_variations PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("test_issue_8988.cpp")
target_link_libraries(test_issue_8988 PRIVATE CGAL::Eigen3_support)
else() else()
message(STATUS "NOTICE: Garland-Heckbert polices require the Eigen library, which has not been found; related examples will not be compiled.") message(STATUS "NOTICE: Garland-Heckbert polices require the Eigen library, which has not been found; related examples will not be compiled.")
endif() endif()