Commit Graph

2961 Commits

Author SHA1 Message Date
Jane Tournois 4324445fcb Merge remote-tracking branch 'mine/Installation-findOpenMesh-jtournois' into BGL-Openmesh_selection-GF
# Conflicts:
#	BGL/examples/BGL_OpenMesh/CMakeLists.txt
2024-09-05 10:14:54 +02:00
Sébastien Loriot 4cf1f4b214 CONFIG options is only needed if a FindXXX.cmake exists 2024-09-04 14:48:07 +02:00
Jane Tournois 3f6083e6ff use CGAL::OpenMesh_support in examples and tests 2024-08-27 14:06:16 +02:00
Andreas Fabri 4832f06ae4 Add plugin to read OpenMesh .om files 2024-08-22 11:40:27 +01:00
Andreas Fabri 5d4ba30a10 Avoid need for conversion operator 2024-08-20 16:26:33 +01:00
Andreas Fabri 0e25e333a1 put code in header file 2024-08-20 16:20:33 +01:00
Andreas Fabri 2c4fc75e17 Add CGAL::IO::read_OM() 2024-08-20 15:41:21 +01:00
Andreas Fabri 0c8e489f46 store/retrieve selection and features of an OM 2024-08-20 15:16:13 +01:00
Andreas Fabri b2d5dc4bfc Fix options 2024-08-20 13:38:11 +01:00
Andreas Fabri 457ee55801 Store selection in Status 2024-08-20 12:09:15 +01:00
Sébastien Loriot ce678a62b9 Merge remote-tracking branch 'cgal/5.6.x-branch' 2024-08-19 11:23:25 +02:00
Sébastien Loriot 060f81452a Merge remote-tracking branch 'cgal/5.5.x-branch' into HEAD 2024-08-19 11:19:24 +02:00
Sebastien Loriot 47c417a785
Deal with duplicate lines (#8396)
## Summary of Changes

Deal with Issue #8348 

## Release Management

* Affected package(s):  Triangulation_2 and Periodic_triangulation_2
* Issue(s) solved (if any): fix #8348 
* License and copyright ownership:  unchanged
2024-08-19 11:17:50 +02:00
Sebastien Loriot 862a3b6539
Update CMakeLists.txt for recent VTK to fix CMake Warning (#8279)
## Summary of Changes

Versions >= 9 of VTK trigger the following CMake warning using CGAL's
CMakeLists
```
CMake Deprecation Warning at C:/dev/VTK-9.2.2/build/lib/cmake/vtk-9.2/vtk-use-file-deprecated.cmake:1 (message):
  The `VTK_USE_FILE` is no longer used starting with 8.90.
Call Stack (most recent call first):
  CMakeLists.txt:32 (include)
```

I suggest this modification of the CMakeLists of Mesh_3 examples, that
also requires moving to VTK 9 (9.0 was released in 2020).
If this modification and new requirement are validated, I can apply the
change everywhere.

## Release Management

* Affected package(s): Mesh_3 for now
* License and copyright ownership: unchanged
2024-08-19 11:14:31 +02:00
Andreas Fabri 99539be5c5 explain why duplicate 2024-08-13 08:50:04 +01:00
Sébastien Loriot 35195e311a undo incorrect simplification 2024-08-12 18:11:39 +02:00
Sébastien Loriot eeffa4b752 speed up copy_face_graph
mostly when tm is not empty and almost make it less
dependent on tm size
2024-08-12 09:44:43 +02:00
Andreas Fabri 12468ccf4a Address #8401 2024-08-09 11:32:26 +01:00
Sébastien Loriot f6936400cc Merge pull request #8366 from sloriot/BGL-hx_param
Restore order of template parameters
2024-07-23 17:20:52 +02:00
Sébastien Loriot 630e58f484 Merge remote-tracking branch 'cgal/5.6.x-branch' 2024-07-23 17:18:09 +02:00
Sébastien Loriot f93cb3c552 Merge branch 'cgal/5.5.x-branch' into 'cgal/5.6.x-branch' 2024-07-23 17:15:05 +02:00
Sébastien Loriot 747e6a5fd7 Merge pull request #8365 from sloriot/BGL-doc
Workaround missing links
2024-07-23 17:09:37 +02:00
Sébastien Loriot 1f316e82fd better doc fixes 2024-07-22 17:10:38 +02:00
Sébastien Loriot ffa8c0eac6 also workaround link issue in the user manual 2024-07-22 15:48:28 +02:00
Sébastien Loriot 2984acda0a restore order of template parameters modified by 6b75fea 2024-07-22 09:12:30 +02:00
Sébastien Loriot 583fec51c6 workaround missing links 2024-07-22 09:07:33 +02:00
Laurent Rineau 0de060acd6 Fix clang/llvm 19 compilation issue in iterator.h
Confirmed fix to compilation issue in clang//llvm 19 (https://github.com/CGAL/cgal/issues/8313)
2024-07-17 18:04:07 +02:00
Mael Rouxel-Labbé 67aba3fefe Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-06-20 10:18:49 +02:00
Laurent Rineau 32893b91c0 Merge pull request #8263 from lrineau/CGAL-update_minimal_cmake-GF
cmake_minimum_required(VERSION 3.12...3.29)
2024-06-12 10:06:12 +02:00
Laurent Rineau f3b409a807 require VTK version 9.0 or later 2024-06-11 15:57:25 +02:00
Laurent Rineau 3a223ebd1e cmake_minimum_required(VERSION 3.12...3.29) 2024-06-06 20:19:44 +02:00
albert-github dac6466aa6 Spelling correction
Another batch of spelling corrections in doxygen and normal comments
2024-05-30 18:32:30 +02:00
Mael Rouxel-Labbé c12be3782d Add Euler::remove_degree_2_vertex 2024-05-28 16:19:10 +02:00
Sébastien Loriot ddbd2e6818 Merge remote-tracking branch 'cgal/master' 2024-05-24 14:18:24 +02:00
Sven Oesau ab2ca20aac some more cases 2024-05-14 16:38:47 +02:00
Laurent Rineau c4165fe5f9 Merge pull request #7439 from MaelRL/PMP-Remove_degen_faces-no-clear-GF
Introduce remove_all_elements(Graph)
2024-04-22 14:54:18 +02:00
Laurent Rineau 4db6bc6d16 Merge pull request #6967 from gdamiand/gsoc2022-EBVs-Mostafa-ashraf19
GSoC'22: New CGAL's design to handle basic viewers
2024-04-10 18:04:25 +02:00
Sébastien Loriot dc06506a04 fix a2b7a72752 2024-04-09 13:43:25 +02:00
Laurent Rineau 4677ece3da Merge pull request #7712 from sloriot/BGL-dynamic_with_default
Adding a default to dynamic property maps
2024-04-05 14:25:20 +02:00
Andreas Fabri caa8aaaa21 merge master 2024-04-03 14:09:39 +01:00
Sven Oesau 490c99f32b Merge remote-tracking branch 'cgal/master' into Kinetic_shape_reconstruction-new_package-soesau 2024-03-26 17:29:04 +01:00
Sébastien Loriot 12c80ac512 Merge remote-tracking branch 'cgal/master' into HEAD 2024-03-25 10:21:41 +01:00
Sébastien Loriot f3c9181718 add documentation 2024-03-25 10:18:34 +01:00
Mael Rouxel-Labbé 5e38ed54df Fix double "Figure" in doc 2024-03-22 17:33:43 +01:00
Andreas Fabri a2b7a72752 Create a doxygen grup for generators 2024-03-15 13:11:30 +01:00
Andreas Fabri ebee48b81e More #includes 2024-03-15 08:48:40 +01:00
Sébastien Loriot dc3d4a7c51 use the right config flag 2024-03-14 16:24:56 +01:00
Andreas Fabri a42d56fc67 Add several #include 2024-03-14 10:09:07 +01:00
Jane Tournois 6b75fea902 move triangulation step into make_hexahedron(8 points) 2024-03-06 14:48:01 +01:00
Jane Tournois ff3db1e0d7
doc suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2024-03-06 11:11:27 +01:00
Jane Tournois c21fc4f238 remove circular dependency and corresponding fwd declarations
include in helpers.h was introduced by 0528592011
in 2019 for backward compatibility, it can now be removed
2024-03-06 10:42:53 +01:00
Jane Tournois a4d6523f4a add missing forward declaration for copy_face_graph() 2024-03-05 14:36:52 +00:00
Jane Tournois 78872aca27 move NP do_not_triangulate to make_hexahedron(isocuboid)
and fix nb of faces of hexahedron from 8 to 6
2024-03-05 13:38:14 +00:00
Jane Tournois 685f6e7f84 create an overload of CGAL::make_hexahedron for Iso_cuboid_3 2024-03-04 17:04:06 +01:00
Guillaume Damiand 3bc56024d3 Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2024-01-11 14:08:05 +01:00
Guillaume Damiand 1e189930b6 solve a todo 2024-01-08 13:43:14 +01:00
Sebastien Loriot caecbe29c7
Replace boost::mpl (#7813)
- `boost::mpl::if_` --> `std::conditional`
- `boost::enable_if` -> `std::enable_if`
- `boost::mpl::and_` -> `&&`
- `boost::mpl::or_` -> `||`
- `boost::constant::bool_` -> `std::bool_constant`
- ...
2023-12-26 17:33:36 +01:00
Mael Rouxel-Labbé 61ad28c80c Swap the contents of CGAL/IO/polygon_mesh_io.h and CGAL/BGL/IO/polygon_mesh_io.h 2023-12-13 09:58:06 +01:00
Mael 935a0faf2f
Update macro name
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2023-12-12 10:09:06 +01:00
Mael Rouxel-Labbé 81972df60e Add a convenience IO header 2023-12-12 09:39:35 +01:00
Laurent Rineau 222fafc411 Merge pull request #7805 from MaelRL/AW3-Resume_aw3-GF
Alpha wrapping: re-use and resume functionalities
2023-12-11 13:56:29 +01:00
Guillaume Damiand b8c5b1ca27 A (last) verification step for all draw functions (nyf). 2023-11-30 12:49:42 +01:00
Laurent Rineau bbf5d0d05b Merge pull request #7880 from sloriot/BGL-workaround_clang18_error
workaround error with clang++-18
2023-11-29 17:18:47 +01:00
Laurent Rineau 44e740cc93 Merge pull request #7880 from sloriot/BGL-workaround_clang18_error
workaround error with clang++-18
2023-11-29 17:16:06 +01:00
Mael Rouxel-Labbé 1dc0ba2c3a Merge remote-tracking branch 'cgal/master' into AW3-Resume_aw3-GF 2023-11-29 16:53:37 +01:00
Guillaume Damiand 0655006622 Merge with master: now viewers use Qt6 2023-11-29 14:36:38 +01:00
Sébastien Loriot 9e45a2982a workaround error with clang++-18 2023-11-23 09:52:46 +01:00
Sven Oesau b26e22bca8 Merge remote-tracking branch 'remotes/orth/orthtree-generalization' into Kinetic_shape_reconstruction-new_package-soesau 2023-11-08 08:58:25 +01:00
Sébastien Loriot 6383bf9676 revert changes to not block the integration of new Orthtree 2023-11-07 08:35:37 +01:00
Sébastien Loriot 999ad9b787 Merge remote-tracking branch 'cgal/master' into HEAD 2023-11-07 08:19:19 +01:00
Laurent Rineau bdfe153cd9 Merge pull request #7784 from janetournois/BGL-warning_fixed-jtournois
BGL - no need to workaround boost 1.54 anymore
2023-11-06 12:52:24 +01:00
Sébastien Loriot 3176178224 fix compilation issues 2023-11-06 11:43:29 +01:00
Guillaume Damiand 761fde02be add_in_graphics_scene -> add_to_graphics_scene; plus remove template parameter NumberType 2023-10-23 01:52:38 +02:00
Guillaume Damiand d74a3dbeac Remove template parameter for graphics scene 2023-10-22 17:12:21 +02:00
Mael Rouxel-Labbé 318258963f Add a generic, empty collect_garbage(Graph) 2023-10-13 10:53:11 +02:00
Jane Tournois 6b8eaa4e5c remove CGAL workaround from cpp files 2023-10-12 10:12:09 +02:00
Jane Tournois 6e6598cd5e no need to workaround boost 1.54 anymore
because CGAL now requires boost 1.66 or higher
2023-10-10 19:32:59 +02:00
Guillaume Damiand a5ee74cb66 Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2023-09-29 08:36:37 +02:00
Guillaume Damiand 9f22d67ed0 Rename Graphic_storage in Graphics_scene (Andreas and Sebastien review) 2023-09-28 12:49:00 +02:00
Guillaume Damiand fd115bd321 Rename Graphic_storare into Graphics_scene (Andreas and Sebastien review) 2023-09-28 11:06:53 +02:00
Guillaume Damiand ebd13c8551 Rename Drawing_functor in Graphics_scene_options (following Andreas and Sebastien review) 2023-09-28 09:13:44 +02:00
Sven Oesau 10cda49c66 Merge remote-tracking branch 'remotes/orth/orthtree-generalization' into Kinetic_shape_reconstruction-new_package-soesau 2023-09-25 12:37:38 +02:00
Sébastien Loriot 8700394122 boost::mpl::if_ -> std::conditional 2023-09-24 22:57:20 +02:00
JacksonCampolattaro f021c0c941 Use optional vpm for all property maps 2023-09-24 16:52:09 +02:00
JacksonCampolattaro aced88517a More optional non-nullable maps 2023-09-24 16:33:59 +02:00
JacksonCampolattaro c67bec24cc More optionals for non-nullable maps 2023-09-16 18:38:32 +02:00
Sébastien Loriot da33014535 Merge remote-tracking branch 'cgal/master' 2023-09-14 09:07:00 +02:00
Laurent Rineau 46923342ad Merge pull request #7576 from albert-github/feature/issue_7395
issue #7395 Improvement of layout of model relations

# Conflicts:
#	Kernel_23/doc/Kernel_23/CGAL/Vector_2.h
2023-09-07 10:48:34 +02:00
Laurent Rineau cdd4b2cc75 Merge pull request #7595 from MaelRL/BGL-Generalize_FFG_doc-GF
Generalize documentation of Face_filtered_graph
2023-09-07 10:46:35 +02:00
Mael Rouxel-Labbé 5425d089da Merge remote-tracking branch 'cgal/master' into PMP-Remove_degen_faces-no-clear-GF 2023-09-05 14:52:16 +02:00
Sébastien Loriot 28dc304676 Merge branch 'cgal/master' 2023-09-01 13:03:05 +02:00
Guillaume Damiand 467e55f10d Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2023-08-28 14:38:58 +02:00
albert-github 93001308f4 Merge branch 'master' into feature/issue_7395
# Conflicts:
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
2023-08-18 11:10:42 +02:00
Sébastien Loriot 28f904f4e2 Merge remote-tracking branch 'cgal/master' 2023-08-15 07:16:14 +02:00
Sébastien Loriot eada3ee8ca Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl' 2023-08-14 14:19:25 +02:00
albert-github 1cce66c343 Spelling corrections
Spelling corrections `a e...` -> `an e...`
2023-07-30 12:59:17 +02:00
albert-github 32054661c7 issue #7395 Improvement of layout of model relations
Replacing the `cgalModelsBare` construct with a `begin` / `end` construct so no less understandable constructs with `\,` and `\n` are necessary.
2023-07-21 19:21:09 +02:00
Mael Rouxel-Labbé 7f85651e82 Merge remote-tracking branch 'cgal/master' into PMP-Remove_degen_faces-no-clear-GF 2023-07-19 13:55:35 +02:00
Mael Rouxel-Labbé 146f9ecb21 Add specializations for Surface_mesh and Polyhedron_3 2023-07-19 13:48:34 +02:00
Mael Rouxel-Labbé 178d063536 Improve the doc of Face_filtered_graph: patch IDs can be more than size_t 2023-07-18 11:46:42 +02:00
albert-github de3ba0f47c Merge remote-tracking branch 'upstream/master' into feature/issue_7395 2023-07-17 10:17:34 +02:00
albert-github 4e5578d469 issue #7395 Improvement of layout of model relations
- based on review
2023-07-15 13:12:15 +02:00
Mael Rouxel-Labbé b9819d55fc Keep up with the ever-changing moods of the Named Parameters committee
:>
2023-07-13 17:49:34 +02:00
albert-github a0320dd7b4 Merge branch 'master' into feature/issue_7395
# Conflicts:
#	Polyhedron/doc/Polyhedron/Concepts/PolyhedronItems_3.h
2023-07-13 10:33:18 +02:00
Laurent Rineau d10e9387c2 Merge branch 'master' into CGAL-add_missing_test
# Conflicts:
#	STL_Extension/test/STL_Extension/test_skiplist.cpp
2023-07-12 15:48:42 +02:00
Mael Rouxel-Labbé 5cc57d4c58 Minor doc fix 2023-07-12 14:45:29 +02:00
Mael Rouxel-Labbé 7d86ca5b95 Test FFG constructors more thoroughly 2023-07-12 14:40:31 +02:00
Mael Rouxel-Labbé 6fbbb70b20 Generalize FFG doc: the selection's value_type needs not be faces_size_type 2023-07-12 14:39:03 +02:00
albert-github 301728a8a9 issue #7395 Improvement of layout of model relations
- Completed the cgalModels part
2023-07-09 12:43:36 +02:00
albert-github 5673ccfc71 Spelling corrections
Spelling correction `a edge` to `an edge`
2023-07-06 18:04:38 +02:00
albert-github ee2a55279d issue #7395 Improvement of layout of model relations
- Completed the cgalHasModel part
- corrected spelling of `Has Model` and `Is Model Of` to `Has model` and `Is model of`
2023-07-06 17:35:34 +02:00
Sébastien Loriot b66afab814 Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD 2023-07-05 11:29:35 +02:00
Sébastien Loriot 3e4120c81d Merge branch 'master' into orthtree-generalization 2023-07-03 17:15:55 +02:00
Andreas Fabri a469d128e7 Deduplicate file names for IO test 2023-06-29 09:11:07 +01:00
Andreas Fabri 28383a9faf Remove a test_Surface_mesh.cpp as incomplete code 2023-06-29 09:07:34 +01:00
Andreas Fabri be83ab856e Undo of accidental change 2023-06-27 12:57:54 +01:00
Andreas Fabri 61ec729952 The category is just bidirectional when the reference IS a reference, otherwise input 2023-06-27 12:55:18 +01:00
Sébastien Loriot efd8b2d38b add more missing tests 2023-06-27 11:18:20 +02:00
Sébastien Loriot 0cddd1abf5 don't recurse 2023-06-27 10:38:24 +02:00
Guillaume Damiand fe23441eab Merge master 2023-06-26 14:42:33 +02:00
Guillaume Damiand 7da9812bda Rename graphic_buffer into graphic_storage. 2023-06-22 15:18:34 +02:00
Sébastien Loriot dfc386d65b Merge branch 'master' into HEAD 2023-06-22 14:05:45 +02:00
Sébastien Loriot 0ee31a5d4f remove extra parenthesis 2023-06-19 19:17:49 +02:00
Sébastien Loriot f936680600 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 18:48:39 +02:00
Sébastien Loriot 11a5b394b8 use Range::size() 2023-06-15 18:44:20 +02:00
Sébastien Loriot cb840ac84b boost::optional::get -> std::optional::value 2023-06-15 11:34:14 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot 9a0bdb5d96 boost::variant ---> std::variant 2023-06-15 10:57:10 +02:00
Sébastien Loriot 604dcdc435 boost::optional => std::optional 2023-06-15 10:57:09 +02:00
Sébastien Loriot bbc4d08ee0 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 10:47:07 +02:00
Sébastien Loriot c8a88b9014 remove CGAL_static_assertion* 2023-06-15 10:42:10 +02:00
Sébastien Loriot 852b3b664b expand -CGAL_CPP17_INLINE macro 2023-06-15 10:40:54 +02:00
Sébastien Loriot b724def918 Merge pull request #6605 from sloriot/PMP-snap_no_deg_faces_created
Avoid creating degenerate faces in snap
2023-05-30 19:15:30 +02:00
JacksonCampolattaro c066a18fe2 Fix issues with the simpler unit tests 2023-05-18 11:36:06 +02:00
Sébastien Loriot 02b126d961 maps are not necessarily default constructible 2023-05-17 17:08:01 +02:00
JacksonCampolattaro ac6fbf0467 Add partly-working adaptation of Surface_mesh to use the new Property map system 2023-05-17 16:49:46 +02:00
Mael Rouxel-Labbé a69a2f54c6 Rename to avoid conflict with STL 2023-05-16 14:21:27 +02:00
Mael Rouxel-Labbé 7a2e5412e9 Clarify that empty() does not clean garbage or remove property maps 2023-05-15 12:42:42 +02:00
Mael Rouxel-Labbé 34a9756836 Use BGL API instead of assuming graph.clear() exists 2023-05-15 12:42:13 +02:00
Mael Rouxel-Labbé 931270b66d Introduce CGAL::empty(), which only clears combinatorial information
And leaves everything else like internal property maps and garbage.
2023-05-15 12:35:52 +02:00
Laurent Rineau 1b84329710 Merge pull request #7229 from GilesBathgate/General-safe_bool_idiom-GilesBathgate
Remove use of the safe-bool idiom, replace with explicit operator bool
2023-05-03 15:05:45 +02:00
Sébastien Loriot af337edf4d boost::reference_wrapper ---> std::reference_wrapper 2023-04-29 08:35:13 +02:00
Sébastien Loriot 4fb4ca2b53 std::empty needs c++17
remove this commit before merging in 6.0
2023-04-28 23:39:37 +02:00
Guillaume Damiand 519c7cc1a5 rename add_in_graphic_buffer into add_in_graphic_storage 2023-04-28 15:25:40 +02:00
Guillaume Damiand 8f29e4d323 Rename class graphic buffer 2023-04-27 15:48:42 +02:00
Sébastien Loriot 2f7d150531 boost::begin/end/empty/size -> std::begin/end/empty/size 2023-04-23 23:01:35 +02:00
Sébastien Loriot a04035879d boost::is_const -> std::is_const 2023-04-23 22:37:07 +02:00
Sébastien Loriot d4d2225801 boost::is_reference -> std::is_reference 2023-04-23 22:37:07 +02:00
Sébastien Loriot 8740b244a2 boost::distance -> std::distance
boost's version is working on std::pair but we decided to no longer
consider iterator pairs as ranges
2023-04-23 22:37:07 +02:00
Sébastien Loriot e82d970d19 boost::next -> std::next 2023-04-23 22:37:07 +02:00