Commit Graph

1170 Commits

Author SHA1 Message Date
Sébastien Loriot 3176178224 fix compilation issues 2023-11-06 11:43:29 +01:00
Guillaume Damiand 2e955e1a24 The return of GSOptions template 2023-10-23 16:07:28 +02: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 6daa2a0c3b Graphics_scene is no more templated 2023-10-23 01:30:57 +02:00
Guillaume Damiand cbe7ef2b40 Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2023-10-22 17:18:04 +02:00
Guillaume Damiand d74a3dbeac Remove template parameter for graphics scene 2023-10-22 17:12:21 +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 5cf89dadd9 Rename Drawing_functor in Graphics_scene_options (following Andreas and Sebastien review) 2023-09-28 09:51:12 +02:00
Laurent Rineau 1d29a75c9a iformat/oformat are in CGAL::IO
The calls without the `IO::` namespace are deprecated.
2023-09-25 16:09:41 +02:00
Sébastien Loriot 8700394122 boost::mpl::if_ -> std::conditional 2023-09-24 22:57:20 +02:00
Laurent Rineau aa09a28df8 Merge remote-tracking branch 'cgal/master' into STL_extension-Fix_Prevent_deref-GF 2023-09-19 16:22:49 +02:00
Guillaume Damiand 467e55f10d Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2023-08-28 14:38:58 +02:00
Sébastien Loriot a528464f31 Merge branch 'cgal/master' into PMP-BF_autorefine 2023-08-28 13:44:44 +02:00
Sébastien Loriot b86a1fed32 Merge remote-tracking branch 'sloriot/PMP-BF_autorefine' into PMP-BF_autorefine 2023-07-05 17:59:29 +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 68813c5c63 Merge pull request #7403 from sloriot/CGAL-replace_boost_by_std
Replace boost by std
2023-07-05 11:08:36 +02:00
Andreas Fabri c7eb4f9fdd Deal with prev() for graph_traits<T2>::iterator 2023-06-27 13:33:48 +01:00
Andreas Fabri 46b756da12 We know that it is bidirectional, and we prefer that to using const Vertex_handle& 2023-06-27 13:24:27 +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 04f52791d6 manually fix iterator category that seems to not work correctly when stacking boost::iterator_adaptor
also restore std::prev
2023-06-27 09:41:47 +02:00
Guillaume Damiand ef602d7aa0 draw constrained triangulation can reuse draw triangulation 2023-06-26 16:13:49 +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
Laurent Rineau 3851bc437e Merge pull request #7513 from sloriot/T23-exact_serialization
EPECK Triangulation serialization
2023-06-22 11:59:34 +02:00
Sébastien Loriot ccc5462b28 add missing include directives 2023-06-20 14:45:43 +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 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 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 2251c438fa enable exact serialization of triangulations with EPECK 2023-06-13 14:30:01 +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 4df2edd9c1 Replace draw_buffer by draw_graphic_storage 2023-04-28 12:26:31 +02:00
Guillaume Damiand 8f29e4d323 Rename class graphic buffer 2023-04-27 15:48:42 +02:00
Laurent Rineau 2a41598bd7 cosmetic changes (indent, spaces, naming) 2023-04-27 12:04:02 +02:00
Andreas Fabri 68261eb0f1 STL_extension: Add parameter for value type to Prevent_deref 2023-04-26 10:55:59 +01:00
Sébastien Loriot b039040f73 boost::is_convertible -> std::is_convertible 2023-04-23 22:37:07 +02:00
Sébastien Loriot e82d970d19 boost::next -> std::next 2023-04-23 22:37:07 +02:00
Sébastien Loriot 99619dc634 boost::prior -> std::prev 2023-04-23 22:37:07 +02:00
Mael Rouxel-Labbé 1a5826f11a Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-04-17 12:48:30 +02:00
Mael Rouxel-Labbé 8ba08771d4 Align doc variable names with the code 2023-04-17 11:53:50 +02:00
Sébastien Loriot 5905003d57 always std::array as cst 2023-04-06 19:25:46 +02:00
Sébastien Loriot cb672d4d90 Merge remote-tracking branch 'cgal/master' into PMP-decimation 2023-04-04 14:25:17 +02:00
Laurent Rineau e5ce8a7f03 Merge pull request #7330 from afabri/Triangulation_2-fix_copy-GF
Triangulation_2: Fix copy of CDT_plus_2
2023-03-31 11:10:47 +02:00
Andreas Fabri dd5989d1c4 Triangulation_2: Clarify what happens with degenerate constraints 2023-03-21 16:28:53 +01:00
Mael Rouxel-Labbé 85911f1b64 Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-03-20 10:06:38 +01:00
Andreas Fabri e8f1f2b9dc Triangulation_2: Fix copy of CDT_plus_2 2023-03-14 12:01:12 +01:00
Sébastien Loriot b1d2744821 Merge branch 'master' into PMP-decimation 2023-03-02 14:24:27 +01:00
Laurent Rineau 01e75ef345 Fix with -DCGAL_NO_DEPRECATED_CODE 2023-02-14 13:27:46 +01:00
Mael Rouxel-Labbé 68067c039f Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-02-14 12:26:50 +01:00
Sébastien Loriot fbe559adc9 Merge 'cgal/master' into PMP-decimation 2023-02-14 08:33:24 +01:00
Mael Rouxel-Labbé 8081822670 Document and enforce CDT2.dimension() == 2 in mark_domain_in_triangulation() 2023-02-09 23:14:50 +01:00
Laurent Rineau e8d1095526 Use Output_rep to display debug info 2023-02-06 10:00:58 +01:00
Laurent Rineau 5f8930db8c Merge branch '5.5.x-branch'
# Conflicts:
#	Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
#	Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
#	Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
#	Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
2023-01-27 21:16:14 +01:00
Laurent Rineau 2e67ce5d62 Merge pull request #7171 from afabri/Projection_traits_xy_3-enable_structural_filtering-GF
Projection_traits_xy_3: Enable structural filtering
2023-01-27 20:52:05 +01:00
Laurent Rineau df0fb8d316 Merge pull request #7172 from sloriot/T2-segment_cst_src_tgt
Use deduced type for source/target of a segment
2023-01-27 20:52:02 +01:00
Andreas Fabri 97b675d38d When inserting a constraint give the face of the latest inserted vertex as hint for the next point 2023-01-10 08:07:28 +00:00
Sébastien Loriot a7288b10a0 use deduced type as some kernel does not return references 2023-01-09 17:48:53 +01:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Andreas Fabri c5d3f8246b Surprising 2022-12-07 15:29:45 +00:00
albert-github c32b1f4127 spelling corrections
Some spelling corrections (Directories starting with `S` rest - `W`),
2022-11-16 13:22:39 +01:00
albert-github eed54a0ae5 spelling corrections
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
albert-github 45478184de spelling corrections
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
Laurent Rineau 8c9281f440 Merge pull request #6642 from sloriot/gsoc2022-boost_np
Replace usage of Boost parameters with CGAL named function parameters
2022-11-07 10:08:38 +01:00
Laurent Rineau d24b180293 Merge branch 'master' into gsoc2022-boost_np 2022-10-28 15:39:36 +02:00
Sébastien Loriot 0cac6a9da8 Merge remote-tracking branch 'sloriot/PMP-decimation' into PMP-decimation 2022-10-25 14:55:57 +02:00
Sébastien Loriot 98e774241b update test 2022-10-21 14:28:12 +02:00
Guillaume Damiand 8c546efe71 code review for polygon triangulation 2022-10-18 15:28:19 +02:00
Guillaume Damiand 2970aa585b review draw triangulation2 2022-10-18 11:23:34 +02:00
Guillaume Damiand 24a8004ee0
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 08:53:12 +02:00
Sébastien Loriot d86db9fa72 fix compilation issues 2022-10-05 16:51:31 +02:00
Mostafa-ashraf19 68b031e113 Uses overloading functions instead of different fill_buffer names. 2022-10-04 18:43:14 +02:00
Mostafa-ashraf19 796ec13391 Modified GraphicBuffer class name to snake case. 2022-10-03 13:27:22 +02:00
Mostafa-ashraf19 88193459ba Added two versions of add in T2 2022-10-01 18:48:41 +02:00
Mostafa-ashraf19 ac259bfc85 Fixed typo 2022-09-23 23:05:45 +02:00
Mostafa-ashraf19 53f0952e0f Modified T2. 2022-09-23 23:03:21 +02:00
Mostafa-ashraf19 cb4c77f1eb changed functor names. 2022-09-23 22:23:10 +02:00
Mostafa-ashraf19 6c95908e6c Renamed functors and GB, added handles to test functors. 2022-09-23 18:03:11 +02:00
Andreas Fabri d3fca65ae5 CGAL: No longer per package assertions 2022-09-23 12:49:40 +01:00
Mostafa-ashraf19 5fbaf43434 Modified Triangulation 2 to use new APIs version. 2022-09-23 00:23:39 +02:00
Laurent Rineau d0d0b30c12 Merge pull request #6807 from afabri/Parameterization-instantiation-GF
Parameterization: instanciation ->  instantiation
2022-09-13 12:33:05 +02:00
Mael Rouxel-Labbé 43378edd1f Minor speed up for T3::operator== 2022-09-02 14:29:15 +02:00
Mael Rouxel-Labbé 7d9d7844b1 Fix T23::operator== for dimension 0 2022-09-02 13:42:33 +02:00
Mael Rouxel-Labbé d940b5ca7e Add operator==(T2, T2) 2022-09-02 11:26:16 +02:00
Mael Rouxel-Labbé 649c401522 Add error messages to T2::is_valid() 2022-09-02 11:26:08 +02:00
Andreas Fabri 9c1ad6649d Parameterization: instanciation -> instantiation 2022-08-24 08:35:13 +01:00
Sébastien Loriot 861588abe1 Merge 'sloriot/CGAL-std_type_traits' into master 2022-08-03 20:19:51 +02:00
Sebastien Loriot f4a505ca2a
Merge pull request #6688 from gdamiand/CMap_index-gdamiand
CMap/GMap/LCC with index
2022-08-02 10:55:37 +02:00
Guillaume Damiand f2630fa4b9
Merge branch 'master' into CMap_index-gdamiand 2022-07-19 09:44:16 +02:00
Laurent Rineau 4789fcc474
Merge branch 'master' into Triangulation_2-mark_domains-GF 2022-07-11 16:38:15 +02:00
Laurent Rineau 561cc66264 Backport the patch of pull request #6602 from lrineau/Triangulation_2-fix_cdt_2-GF
Try to fix CDT_2 with inexact construction of intersections
2022-06-29 12:30:35 +02:00
Andreas Fabri 70a06b4696 Do not use CGAL::iterator_v<> as it is responsible for the ICE of VC2015 2022-06-27 08:58:17 +01:00
Laurent Rineau c84fab4d08 Detect Exact_kernel *and* exact_kernel() 2022-06-17 17:11:52 +02:00
Sébastien Loriot b96f6d5ce9 move is_iterator to type_traits 2022-06-10 09:43:59 +02:00
Sébastien Loriot 44250cb019 is_iterator_XXX<>::value --> is_iterator_XXX_v<> 2022-06-10 09:40:29 +02:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Sébastien Loriot 4f5f8341cc use std::enable_if_t 2022-06-10 07:37:53 +02:00
Laurent Rineau 9bc4918853 Better implementation of can_construct_almost_exact_intersection_v 2022-06-03 14:31:56 +02:00
Laurent Rineau 258dd55c03 Make it work with the projection traits 2022-06-02 16:17:26 +02:00
Laurent Rineau 575f7a42fe Move exact_intersection_point back to CT_2 2022-06-01 20:31:22 +02:00
Laurent Rineau 8ba010f760 Factorize the insertion of the intersection point 2022-06-01 14:42:01 +02:00
Laurent Rineau 910c930ede Better usage of the dispatch on `itag` 2022-06-01 12:26:50 +02:00
Laurent Rineau 136c6e50f5 Fix typo 2022-06-01 12:01:06 +02:00
Laurent Rineau 53b4878a94 Use exact FT instead of exact Kernel 2022-05-31 18:09:00 +02:00
Laurent Rineau feaf6a4ca2 Add Kernel::Construct_exact_intersection_point_2 2022-05-31 16:40:34 +02:00
Laurent Rineau 70bbf644a1 Ensure pi in the union of the two triangles
If `pi` is the union of the two triangles incident to the constrained
edge `[vcc, vdd]`, then the reinsertion of  `[vcc, vi]` and `[vi, vdd]`
cannot trigger new intersections.
2022-05-25 15:47:27 +02:00
Laurent Rineau 9ab9cdf898 Add comments 2022-05-25 14:29:08 +02:00
Laurent Rineau 1b4db96562 Disable the previous workaround 2022-05-24 16:53:30 +02:00
Laurent Rineau dd299873af Add comments 2022-05-24 16:53:01 +02:00
Laurent Rineau 976e8e7691 Add a check intersection_not_in_the_two_triangle 2022-05-23 16:12:54 +02:00
Andreas Fabri f6c3952308 The hopefully two last warnings 2022-05-19 06:59:29 +01:00
Andreas Fabri b435e4079d Also #include the Triangulation headers for the #else case 2022-05-18 10:08:57 +01:00
Andreas Fabri 84a35e9cba Always #include for CDT as it has its own code for the noop draw() 2022-05-18 09:29:36 +01:00
Andreas Fabri 1afc3cc099 resolve merge conflict 2022-05-18 07:20:41 +01:00
Andreas Fabri 58774ef301 Define draw as no op 2022-05-17 09:28:21 +01:00
Sébastien Loriot 143d412ede fix unused variables 2022-05-16 17:24:27 +02:00
Guillaume Damiand 999a813b35 Rename XXX_handle into XXX_descriptor for CMap, GMap, LCC 2022-05-05 13:34:19 +02:00
Laurent Rineau 9413b74310 Fix a typo in a comment (spellchecking) 2022-03-30 16:11:27 +02:00
Laurent Rineau a1b8f81af6 Fix the detection of is_in_domain 2022-03-30 15:18:47 +02:00
Sébastien Loriot da7f93bc73 add missing include directive and use std 2022-03-23 09:10:35 +01:00
Sébastien Loriot 7fe8ad163e fix type 2022-03-22 18:04:07 +01:00
Andreas Fabri 97e3f60cf2 Improve documentation 2022-03-22 17:00:06 +01:00
Andreas Fabri 6fdd3341aa WIP 2022-03-22 16:37:17 +01:00
Andreas Fabri f2bfb52903 Make draw() work for a CDT_2 even if it's Face type has no is_in_domain member function 2022-03-22 16:10:16 +01:00
Andreas Fabri 109056d592 Improve documentation of function draw() 2022-03-22 14:10:13 +01:00
Andreas Fabri f236ccc98c CDT -> CT 2022-03-15 16:31:00 +01:00
Andreas Fabri 93832aa67f Add an example for Mesh_2 2022-03-15 16:08:11 +01:00
Andreas Fabri eddfe746b1 Cleanup and add a draw() function for constrained triangulations 2022-03-15 14:59:59 +01:00
Andreas Fabri 0a04f33a94 Rename and move stuff 2022-03-15 10:36:35 +01:00
Andreas Fabri a6ae3b1ac1 Rename and move stuff 2022-03-15 10:34:36 +01:00
Andreas Fabri b1926b715a
Update Triangulation_2/include/CGAL/mark_domains.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-03-15 08:54:19 +01:00
Andreas Fabri 849e18ae6c Triangulation_2: Add CGAL::mark_domains() 2022-03-14 23:05:15 +01:00
Andreas Fabri 48c462bf72 Change in CDTplus 2022-03-09 13:46:55 +00:00
Andreas Fabri 8501386fee
Update Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-02-03 08:33:12 +01:00
Andreas Fabri c30327c3ec Triangulation_2: Quiet a warning 2022-02-02 09:38:38 +00:00
Laurent Rineau 7906e3928a Merge pull request #6174 from afabri/CGAL_Discontinue_Geomview-GF
Remove Geomview
2021-12-20 18:06:29 +01:00
Mael Rouxel-Labbé 129f427d93 Move TDS2's graph traits into the TDS2 package 2021-12-16 13:48:01 +01:00
Andreas Fabri 115fa5ab39 Remove Geomview from the manual and the demos 2021-12-14 14:01:21 +00:00
Guillaume Damiand 2bbcabe71b The size of argv array is now 2, ending with nullptr. 2021-11-11 17:23:37 +01:00
Guillaume Damiand ee11c858b5 The size of argv array is changed to 1 in all basic viewers. 2021-11-10 09:59:48 +01:00
Mael Rouxel-Labbé 8166579e55 Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_master-GF 2021-10-11 19:58:07 +02:00
Mael Rouxel-Labbé 590ddf8015 Various fixes for pmaps:
- Use `value_type` when the returned type is not a reference
- Enforce `reference = value_type` if the returned type is not
  a reference (to avoid `typename PM::reference r = get(m, k)`,
  which will take a ref to a temporary if the `reference`
  typedef is an actualy reference)
- Do not use `put_get_helper` if the property map is not a `lvalue`
  **mutable** property map: the `put()` is `map[k] = v`, which
  is broken if `operator[]` does not return a reference
- The concept `boost::lvalue_property_map_tag` requires `operator[](key)`,
  not a reference in `get(map, key)`. You can have a readable property map
  returning a reference through its `get(map, key)`, but if there is
  no `operator[]`, it's just a `boost::readable_property_map_tag`
- Some const correctness to avoid copying maps with state
  or heavy keys in `get(map, key)` / `put(map, key, value)`
- Base the category of a wrapping pmap on what it offers instead
  of just forwarding the base property map's category
- Tried to do something like mutable lvalue pmap:
  * `value_type& operator[](key&)`
  * `ref get(map, const key&)`
  * `put(map, const key&, const value_type&)`
  and non-mutable lvalue pmap:
  * `const value_type& operator[](const key&)`
  * `ref get(map, const key&)`
  but not everything fits properly...
2021-10-08 15:38:47 +02:00
Sébastien Loriot 5945e48a3e restore sub-directories accidently removed in 98e471849b 2021-09-17 08:14:06 +02:00
Sébastien Loriot dacbd186d1 accomodate changes of internal -> Pkg/internal 2021-08-30 12:35:34 +02:00
Sébastien Loriot 4454c5b3ed Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-08-30 12:25:51 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Mael Rouxel-Labbé bcce76c062 Fix test & warnings 2021-08-26 11:08:16 +02:00
Maxime Gimeno f7df517f57 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-08-09 09:14:23 +02:00