Commit Graph

4563 Commits

Author SHA1 Message Date
Ivan Paden 573cc53e0a Move curvature map typedef to function 2023-11-16 09:16:00 +01:00
Ivan Paden 99661dfd73 Choose betwen curvature calc for selection and whole mesh 2023-11-16 09:16:00 +01:00
Ivan Paden a61ebb545e Change face subset back to working example with vector 2023-11-16 09:16:00 +01:00
Ivan Paden 4a5283b22e Change selection option to set 2023-11-16 09:16:00 +01:00
Sébastien Loriot 63e3180517 use vector option for selection 2023-11-16 09:16:00 +01:00
Ivan Paden 677bb04ee8 (WIP) figuring out FaceRange curvature calculation 2023-11-16 09:16:00 +01:00
Ivan Paden 06db84f717 Fix sizing field calculation 2023-11-16 09:16:00 +01:00
Ivan Paden 91216f7875 Add adaptive remeshing to Polyhedorn demo, PMP plugin 2023-11-16 09:16:00 +01:00
Ivan Paden 73fd72feb9 Add constexpr to differentiate uniform and adaptive fields 2023-11-16 09:16:00 +01:00
Ivan Paden ace36a2bb6 Make tangential relaxation work with both uniform and adaptive sizing field 2023-11-16 09:16:00 +01:00
Jane Tournois cb779038f6 refs are not needed here
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2023-11-16 09:14:23 +01:00
Ivan Paden 5629f7a04b Add first code for tangential relaxation with sizing (WIP) 2023-11-16 09:13:31 +01:00
Ivan Paden fa9769b908 Prep sizing for tangential relaxation (WIP) 2023-11-16 09:13:31 +01:00
Ivan Paden c89bedb97f Replace std with cgal where applicable, fix assertion 2023-11-16 09:13:31 +01:00
Ivan Paden 947ab8f125 Make a (temp) property map for curvature calculation 2023-11-16 09:13:31 +01:00
Ivan Paden 52df5ae86e Fix default remeshing overload 2023-11-16 09:13:31 +01:00
Ivan Paden fd787c4530 Refactor sizing map update 2023-11-16 09:13:31 +01:00
Ivan Paden 92a434018a Add sizing field calculation from curvature
WIP: isotropic remeshing default overload is now broken
2023-11-16 09:12:17 +01:00
Mael Rouxel-Labbé 852056a8ac Rephrase documentation of one-sided Haussdorff distance function 2023-07-12 16:16:42 +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 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 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 557b64e4a6 boost::any ==> std::any 2023-06-15 10:57:09 +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
Laurent Rineau 0e76c32749 Merge pull request #7447 from MaelRL/CGAL-Fix_warnings-GF
Fix some warnings
2023-06-05 15:10:29 +02:00
Laurent Rineau ae1bbe7e17 Merge pull request #7488 from sloriot/PMP-coref_no_early_exit
Corefinement: remove incorrect early exit
2023-06-05 15:09:59 +02:00
Laurent Rineau e697bb386d Merge pull request #7489 from afabri/PMP-document_overload-GF
PMP: Document overload of angle_and_area_smoothing()
2023-06-05 15:09:56 +02:00
Laurent Rineau f1a717bab5 Merge pull request #7488 from sloriot/PMP-coref_no_early_exit
Corefinement: remove incorrect early exit
2023-06-05 14:01:18 +02:00
Andreas Fabri c1b9ea9d47
Update Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/angle_and_area_smoothing.h
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-06-02 12:27:28 +02:00
Andreas Fabri f3c2d9b310 polish 2023-06-01 17:25:23 +01:00
Andreas Fabri a8e3c84c78 PMP: Document overload of angle_and_area_smoothing() 2023-06-01 10:37:22 +01:00
Sébastien Loriot cb3a1e03d4 remove the early exit as we could miss the fact that some operations might be impossible 2023-06-01 11:17:45 +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
Sébastien Loriot ec274dd8e9 hide non used variable 2023-05-23 18:18:28 +02:00
Mael Rouxel-Labbé 7bf284fafa Misc minor changes 2023-05-22 14:01:17 +02:00
Mael Rouxel-Labbé 62ca575170 Simplify expression 2023-05-22 14:01:07 +02:00
Mael Rouxel-Labbé afd096cb91 Fix indentation 2023-05-22 12:30:38 +02:00
Charles Gueunet cf07ee9c91 Trailing 'l' on return statement
In CERES_SOLVER mode only
2023-05-22 10:55:52 +02:00
Ivan Paden eb2a023c31 Merge PR #6760 into gsoc2023-adaptive_remesh-ipadjen 2023-05-21 08:50:10 +02:00
Ivan Paden 5c4e6ed7b5 Create a vertex property map that will contain sizing info (WIP)
Also, update target length checks
2023-05-19 23:48:30 +02:00
Ivan Paden 7326fb52ce Add initial preparations for adaptive sizing field
Add Adaptive_sizing_field header with edge min and max limits, and tolerance
Adjust the example
2023-05-19 23:47:41 +02:00
Mael Rouxel-Labbé cb05427cf3 Remove std::move on temporary result 2023-05-16 15:49:34 +02:00
Mael Rouxel-Labbé 752aa94490 Properly initialize kernel functors 2023-05-16 15:49:18 +02:00
Mael Rouxel-Labbé eb1462ea56 Remove needless reference 2023-05-16 15:49:00 +02:00
Mael Rouxel-Labbé aa12591bc3 Use VPM's reference 2023-05-16 15:48:50 +02:00
Laurent Rineau d6581363f5
Activate CDT2 for face triangulation (#7437)
(master only)
2023-05-12 10:05:25 +02:00
Laurent Rineau bb63050ef0 Merge pull request #7436 from sloriot/PMP-doc_compta_ori
Improve doc of compatible_orientations
2023-05-11 17:37:11 +02:00
Jane Tournois 50bbb4f682 add namespace
to avoid conflicts with Uniform_sizing_field in Mesh_3
2023-05-11 16:07:10 +02:00
Sébastien Loriot 5c1e820c1e fix test and demo 2023-05-11 16:07:10 +02:00
Sébastien Loriot ad55b8cd9f fix compilation issues 2023-05-11 16:07:09 +02:00
Jane Tournois 9de41310fd use boost::optional<double> instead of a bool and a double
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
2023-05-11 16:07:08 +02:00
Jane Tournois 0ee9406235 add possibility to provide a variable sizing field to PMP::isotropic_remeshing
# Conflicts:
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
2023-05-11 16:05:48 +02:00
Sébastien Loriot dbada8d636 fix alternative call + more debug 2023-05-10 14:59:49 +02:00
Sébastien Loriot 9f056f9d09 add missing np 2023-05-10 14:59:42 +02:00
Sébastien Loriot a96af5031e improve doc 2023-05-09 18:56:29 +02:00
Laurent Rineau 7789f8a144 Merge pull request #7418 from MaelRL/PMP-Add_missing_const-GF
Add missing const
2023-05-04 17:22:43 +02:00
Laurent Rineau 038813d7e6 Merge pull request #7418 from MaelRL/PMP-Add_missing_const-GF
Add missing const
2023-05-04 17:21:16 +02:00
Laurent Rineau d2bc415a15 Merge pull request #6950 from lrineau/CGAL-allow_Epick_with_float-GF
Simple_precision_epick: an Epick-like kernel with float as FT
2023-05-04 16:37:17 +02:00
Sébastien Loriot e0eac4f388 Merge remote-tracking branch 'cgal/master' into HEAD 2023-05-03 18:37:09 +02:00
Laurent Rineau e31efe8cd9 Merge pull request #7401 from sloriot/PDemo-fix_warning
fix demo warnings
2023-05-03 15:05:41 +02:00
Mael Rouxel-Labbé aa2a87e538 Add missing const 2023-05-03 11:27:28 +02:00
Sébastien Loriot c1294a0eaa boost::integral_constant ---> std::integral_constant 2023-04-29 09:42:15 +02:00
Sébastien Loriot 769fca3597 std::size is also c++17
remove this commit before merging to master
2023-04-29 08:54:05 +02:00
Sébastien Loriot 7f2ca4cfb7 fix more warnings 2023-04-27 15:52:52 +02:00
Sébastien Loriot 731905c02c fix one more 2023-04-26 09:03:28 +02:00
Laurent Rineau 4d76e06383 Merge pull request #7392 from MaelRL/CGAL_IO-Obj_fixes-GF
Fix issues in OBJ I/O
2023-04-24 14:08:22 +02:00
Laurent Rineau 4fe208bdd3 Merge pull request #7392 from MaelRL/CGAL_IO-Obj_fixes-GF
Fix issues in OBJ I/O
2023-04-24 14:06:34 +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 b039040f73 boost::is_convertible -> std::is_convertible 2023-04-23 22:37:07 +02:00
Sébastien Loriot 5726a0a255 boost::is_floating_point -> std::is_floating_point
boost::is_float
2023-04-23 22:37:07 +02:00
Sébastien Loriot a04035879d boost::is_const -> std::is_const 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
Sébastien Loriot 8b3acae1c7 boost::remove_reference -> std::remove_reference 2023-04-23 22:36:59 +02:00
Sébastien Loriot 61834d5a26 boost::remove_const -> std::remove_const_t 2023-04-23 19:07:54 +02:00
Laurent Rineau 7cb29b5d0a Merge pull request #7353 from MaelRL/PMP-Triangulate_PS-GF
Add triangulate Polygon Soup
2023-04-21 11:21:28 +02:00
Laurent Rineau ad30839e6b Merge pull request #7370 from sloriot/PMP-soup_self_intersections
Add self-intersection test and report functions for triangle soups
2023-04-21 11:20:52 +02:00
Sébastien Loriot 5260100f88 fix warning 2023-04-21 09:07:14 +02:00
Sébastien Loriot 3705a4cfef fix typo 2023-04-19 04:09:46 +02:00
Sébastien Loriot f3f6783e8a update split candidate choice in case of presence of deg faces 2023-04-19 03:24:01 +02:00
Mael Rouxel-Labbé b8e82b9c05 Merge remote-tracking branch 'cgal/master' into PMP-Triangulate_PS-GF 2023-04-18 12:16:27 +02:00
Mael Rouxel-Labbé 451223a2e8 Fix not forwarding verbose NP to inner functions 2023-04-18 11:22:53 +02:00
Laurent Rineau 594682dde3 Merge pull request #5461 from sloriot/PMP-decimation
Add coplanar decimation
2023-04-17 10:14:07 +02:00
Laurent Rineau 318fce90e9 Merge pull request #7385 from sloriot/PMP-tr_fix_deg_tri
handle degenerate triangles (usually created with the reprojection)
2023-04-17 10:13:24 +02:00
Sébastien Loriot 054906fe7c handle degenerate triangles (usually created with the reprojection) 2023-04-13 15:17:04 +02:00
Sébastien Loriot a361f79e1f add missing parameter 2023-04-12 16:21:26 +02:00
Sébastien Loriot 304c1394e5 check source mesh before doing the split 2023-04-12 15:19:07 +02:00
Sébastien Loriot 37361b757b do not split if after split faces are not consistently oriented 2023-04-12 15:13:15 +02:00
Sébastien Loriot 6c2c6a580b remove useless variable and use existing ones 2023-04-12 15:07:16 +02:00
Sébastien Loriot ef41988c64 only one deg face is sufficient to cancel the split 2023-04-12 14:59:19 +02:00
Laurent Rineau 9e18cc6989
Unexpected backtick (#7378)
In the file: Arrangement_on_surface_2/index.html
we see:
```
The example below shows how to construct the same arrangement of five line segments built incrementally in Arrangement_on_surface_2/incremental_insertion.cpp` depicted in Figure 34.9 using the aggregate insertion
```
i.e. an unexpected backtick.
2023-04-12 09:55:42 +02:00
Sébastien Loriot 4dc91d18be directly use std::multiset as the double keys are not needed 2023-04-12 09:19:55 +02:00
albert-github 8a0b21461d Unexpected backtick
- Corrected some more redundant / missing backticks
- correctes a spelling error (Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Boolean_set_operations_2/Gps_default_dcel.h)
2023-04-11 17:38:37 +02:00
Laurent Rineau e042737ed9 Merge pull request #7352 from sloriot/PMP-one_si_test
Do not test twice for self-intersections if there is none
2023-04-11 14:19:02 +02:00
Laurent Rineau 1dce90ee79 Merge remote-tracking branch 'cgal/master' into CGAL-allow_Epick_with_float-GF 2023-04-07 10:59:51 +02:00
Sébastien Loriot 8985916382 add note 2023-04-06 19:24:04 +02:00
Sébastien Loriot 140d13a943 fix after Andreas' review 2023-04-06 19:24:04 +02:00
Sébastien Loriot 9cd2e031db fix after review from Mael 2023-04-06 19:24:04 +02:00
Sébastien Loriot 5f3d748e19 add doc for self-intersection related functions for soups 2023-04-06 19:24:04 +02:00
Sébastien Loriot 96868b9fc4 fix debug code 2023-04-06 19:24:04 +02:00
Sébastien Loriot f8ab63088a add self-intersection functions for soup
no doc for now
2023-04-06 19:24:04 +02:00
Sébastien Loriot dd4a4420f0 soup/mesh abstraction 2023-04-06 19:24:04 +02:00
Sébastien Loriot 5828644133 fix warnings 2023-04-05 17:24:04 +02:00
Sébastien Loriot cb672d4d90 Merge remote-tracking branch 'cgal/master' into PMP-decimation 2023-04-04 14:25:17 +02:00
Sebastien Loriot 964d108fd7 typo 2023-04-04 14:23:47 +02:00
Sebastien Loriot 5cf0be27c9 Fix typos 2023-04-04 14:22:32 +02:00
Andreas Fabri 8ee3eecc85 Remove unused typedefs 2023-04-04 08:33:51 +01:00
Sébastien Loriot ae57ce5f2c rephrase 2023-03-31 15:47:55 +02:00
Sébastien Loriot 077f307e01 be more precise 2023-03-31 14:39:33 +02:00
Sébastien Loriot 6330b825ad add bounds 2023-03-31 14:39:33 +02:00
Sébastien Loriot a98de00579 output is possible a polygon mesh 2023-03-31 14:39:33 +02:00
Sébastien Loriot 3e11982062 simplify 2023-03-31 14:39:33 +02:00
Sébastien Loriot c2cb6d1831 rename vertex class 2023-03-31 14:39:33 +02:00
Sébastien Loriot f730ab30d8 move to out np 2023-03-31 14:39:33 +02:00
Sébastien Loriot cfa8c2954f document the property map version of parameters 2023-03-31 14:39:33 +02:00
Sébastien Loriot e316b3fb04 fix helper 2023-03-31 14:39:33 +02:00
Sébastien Loriot 39b84d0433 fix specialization 2023-03-31 14:39:33 +02:00
Sébastien Loriot 5e4e9a9001 fix warning 2023-03-31 14:39:33 +02:00
Sebastien Loriot a34ada1cfe Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-03-31 14:39:33 +02:00
Mael dce2d9b780
Merge branch 'master' into PMP-Triangulate_PS-GF 2023-03-31 13:21:44 +02:00
hoskillua 796d7cc57d handled scale dependency and add tests for it 2023-03-31 01:55:26 +02:00
Laurent Rineau d3a91046a9 Merge pull request #7276 from afabri/PMP_smooth_scale-GF
PMP:  Add np for not scaling smoothed mesh
2023-03-30 18:04:34 +02:00
Mael Rouxel-Labbé c346b4a836 Avoid repetition 2023-03-29 15:46:42 +02:00
Mael Rouxel-Labbé 8a39016780 Visitor of triangulate_faces must be a visitor of HoleFilling too 2023-03-29 15:30:25 +02:00
Mael Rouxel-Labbé 5a47df6682 Doc fixes, thanks @albert-github 2023-03-29 15:29:10 +02:00
Mael Rouxel-Labbé 77062ed7c2 Move triangulate_polygons()'s default visitor out of internal namespace
so that it is documented
2023-03-29 12:07:57 +02:00
Mael Rouxel-Labbé 962269c03d Add see also's 2023-03-29 12:07:47 +02:00
Mael Rouxel-Labbé 9387f087e0 Refactor to properly forward NPs to triangulate_hole_polyline + other imprvmts 2023-03-29 11:53:27 +02:00
Mael Rouxel-Labbé 4a2d91e03b Document requirements on faces of triangulate_faces/triangulate_polygons 2023-03-29 10:11:04 +02:00
Mael Rouxel-Labbé 1365fac894 Move macro 2023-03-29 10:08:10 +02:00
Mael Rouxel-Labbé 4d03dbe076 Try-Catch the CDT constraint insertions 2023-03-28 22:42:40 +02:00
Mael Rouxel-Labbé c451b921ef Rename internal functions for consistency 2023-03-28 16:52:48 +02:00
Mael Rouxel-Labbé 123c2513fc Delegate construction of a 2D CDT to hole filling 2023-03-28 16:52:40 +02:00
Mael Rouxel-Labbé 7b375129fb Document triangulate_polygons() 2023-03-28 15:16:37 +02:00
Mael Rouxel-Labbé 4b2b996e08 Add visitor for triangulate_polygons() 2023-03-28 14:59:26 +02:00
Mael Rouxel-Labbé 51c1e21847 Change ITag to No intersections, and try{}catch() the CDT2 code 2023-03-28 14:58:39 +02:00
Mael Rouxel-Labbé 83e89d85a6 Fix typo 2023-03-28 14:58:22 +02:00
Sébastien Loriot 9166d28c97 do not test twice for self-intersections if there is none 2023-03-28 11:42:49 +02:00
Mael Rouxel-Labbé 20c2df0692 Add triangulate_PS prototype 2023-03-28 09:59:21 +02:00
hoskillua 2884d8b3cb using is_zero() & is_negative() for FT variables 2023-03-27 18:06:06 +02:00
hoskillua 5aa995dbe7 missing dots in ref documentation 2023-03-27 17:45:16 +02:00
hoskillua 49c12d9265 ref doc fixes 2023-03-25 13:44:36 +02:00
hoskillua 556218bf15 gaussian -> Gaussian in docs and comments 2023-03-25 11:57:22 +02:00
Sébastien Loriot 661513b16e gaussian -> Gaussian 2023-03-22 19:12:28 +01:00
Sébastien Loriot 7f4597720e the mesh does not need to be triangulated 2023-03-22 18:44:11 +01:00