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

Merge remote-tracking branch 'cgal/6.0.x-branch'

This commit is contained in:
Sébastien Loriot 2024-11-08 16:11:22 +01:00
parent 0466731cf9 79ac9d9d33
commit 797dde5985
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Basic_viewer/include/CGAL/Graphics_scene_options.h
View File

@ -74,14 +74,17 @@ struct Graphics_scene_options<DS, VertexDescriptor, EdgeDescriptor, FaceDescript
void disable_vertices() { m_enabled_vertices=false; } void disable_vertices() { m_enabled_vertices=false; }
void enable_vertices() { m_enabled_vertices=true; } void enable_vertices() { m_enabled_vertices=true; }
bool are_vertices_enabled() const { return m_enabled_vertices; } bool are_vertices_enabled() const { return m_enabled_vertices; }
void ignore_all_vertices(bool b) { m_enabled_vertices=!b; }
void disable_edges() { m_enabled_edges=false; } void disable_edges() { m_enabled_edges=false; }
void enable_edges() { m_enabled_edges=true; } void enable_edges() { m_enabled_edges=true; }
bool are_edges_enabled() const { return m_enabled_edges; } bool are_edges_enabled() const { return m_enabled_edges; }
void ignore_all_edges(bool b) { m_enabled_edges=!b; }
void disable_faces() { m_enabled_faces=false; } void disable_faces() { m_enabled_faces=false; }
void enable_faces() { m_enabled_faces=true; } void enable_faces() { m_enabled_faces=true; }
bool are_faces_enabled() const { return m_enabled_faces; } bool are_faces_enabled() const { return m_enabled_faces; }
void ignore_all_faces(bool b) { m_enabled_faces=!b; }
protected: protected:
bool m_enabled_vertices, m_enabled_edges, m_enabled_faces; bool m_enabled_vertices, m_enabled_edges, m_enabled_faces;
@ -117,6 +120,7 @@ struct Graphics_scene_options:
void disable_volumes() { m_enabled_volumes=false; } void disable_volumes() { m_enabled_volumes=false; }
void enable_volumes() { m_enabled_volumes=true; } void enable_volumes() { m_enabled_volumes=true; }
bool are_volumes_enabled() const { return m_enabled_volumes; } bool are_volumes_enabled() const { return m_enabled_volumes; }
void ignore_all_volumes(bool b) { m_enabled_volumes=!b; }
protected: protected:
bool m_enabled_volumes; bool m_enabled_volumes;

13
Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt
View File

@ -99,15 +99,10 @@ if(TARGET CGAL::Eigen3_support)
point_set_shape_detection_plugin point_set_shape_detection_plugin
PRIVATE scene_surface_mesh_item scene_points_with_normal_item PRIVATE scene_surface_mesh_item scene_points_with_normal_item
scene_polygon_soup_item scene_callback_signaler CGAL::Eigen3_support) scene_polygon_soup_item scene_callback_signaler CGAL::Eigen3_support)
if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1910)
find_package(OpenGR QUIET) find_package(OpenGR QUIET)
include(CGAL_OpenGR_support) include(CGAL_OpenGR_support)
else()
message(
STATUS
"NOTICE : OpenGR does not support your compiler."
)
endif()
find_package(libpointmatcher QUIET) find_package(libpointmatcher QUIET)
include(CGAL_pointmatcher_support) include(CGAL_pointmatcher_support)

10
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
View File

@ -122,14 +122,8 @@ if(TARGET CGAL::Eigen3_support)
endif() endif()
# Executables that require OpenGR # Executables that require OpenGR
if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1910) find_package(OpenGR QUIET)
find_package(OpenGR QUIET) include(CGAL_OpenGR_support)
include(CGAL_OpenGR_support)
message(
STATUS
"NOTICE : OpenGR does not support your compiler, registration_with_OpenGR will not be compiled."
)
endif()
if(TARGET CGAL::OpenGR_support) if(TARGET CGAL::OpenGR_support)
create_single_source_cgal_program("registration_with_OpenGR.cpp") create_single_source_cgal_program("registration_with_OpenGR.cpp")

2
Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h
View File

@ -64,7 +64,7 @@ typedef unspecified_type Construct_cartesian_const_iterator_d;
/*! /*!
Function used to construct an object of type `Construct_cartesian_const_iterator_d`. Function used to construct an object of type `Construct_cartesian_const_iterator_d`.
*/ */
Construct_cartesian_const_iterator_d construct_construct_cartesian_const_iterator_d_object(const Point_d& p) const; Construct_cartesian_const_iterator_d construct_cartesian_const_iterator_d_object() const;
/// @} /// @}