Commit Graph

5813 Commits

Author SHA1 Message Date
Ivan Paden 1f9142bfc2 Try to fix failing test 2023-11-16 09:31:20 +01:00
Ivan Paden f5d23db40a Add template argument to constructor 2023-11-16 09:31:19 +01:00
Ivan Paden dccf973186 Fix templating error in isotropic remeshing overload 2023-11-16 09:31:19 +01:00
Ivan Paden 9e91abb539 First attempt at sizing field docs 2023-11-16 09:31:19 +01:00
Ivan Paden 98a3f14c73 Add PMPSizingField concept to docs 2023-11-16 09:31:19 +01:00
Ivan Paden e3727e4a88 Remove todos 2023-11-16 09:31:19 +01:00
Ivan Paden ff4bbaa155 Target length fix 2023-11-16 09:31:19 +01:00
Ivan Paden 6ee23c6fdd Replace pmesh with vertex property maps in sizing field classes 2023-11-16 09:31:19 +01:00
Ivan Paden ee640c91dd Handle the special case when target_edge_length is 0 2023-11-16 09:31:19 +01:00
Ivan Paden 66721bbcd9 Add precondition 'remeshing mesh == sizing field mesh' 2023-11-16 09:31:19 +01:00
Ivan Paden f589b054ed Documentation update in remesh.h 2023-11-16 09:31:19 +01:00
Ivan Paden 050c7f9512 Add split_long_edges functionality using adaptive sizing field as an input 2023-11-16 09:31:19 +01:00
Ivan Paden 4a8974d256 Move sizing classes to 'public' headers 2023-11-16 09:31:19 +01:00
Ivan Paden 36f8d39f92 Remove extra code in tangential smoothing 2023-11-16 09:31:19 +01:00
Ivan Paden 64257b9c66 Add remeshing quality test 2023-11-16 09:31:17 +01:00
Ivan Paden 00b4b93d1c Remove the adaptive sizing field dependency in remesh.h 2023-11-16 09:30:10 +01:00
Ivan Paden 1f2c0f2471 Remove extra 2023-11-16 09:30:10 +01:00
Ivan Paden 15ad1f78eb Change example input to be analogous to uniform sizing 2023-11-16 09:30:10 +01: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 5cc58a4080 don't do collinear test for a triangle to be collapsed 2023-08-17 15:02:48 +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
Sebastien Loriot b534d12620
Locate.h: Use Face_location / Barycentric_coordinates everywhere (#7638)
## Release Management

* Affected package(s): `PMP`
* Issue(s) solved (if any): -
* Feature/Small Feature (if any): -
* License and copyright ownership: no change
2023-08-14 14:11:02 +02:00
Sebastien Loriot 65764b5c6f
Minor improvements to the documentation of `PMP::orient_polygon_soup()` (#7639)
## Release Management

* Affected package(s): `PMP`
* Issue(s) solved (if any): -
* Feature/Small Feature (if any): -
* License and copyright ownership: no change
2023-08-14 12:00:31 +02:00
Sébastien Loriot 44e143e931 Merge remote-tracking branch 'cgal/5.6.x-branch' into 'cgal/master' 2023-08-14 11:54:13 +02:00
Sébastien Loriot db9b8e70b3 Merge remote-tracking branch 'cgal/5.5.x-branch' into 'cgal/5.6.x-branch' 2023-08-14 10:22:35 +02:00
Sébastien Loriot 71347f28a8 remove unused variable 2023-08-09 09:00:38 +02:00
Mael Rouxel-Labbé 33d70dd95f Minor improvements to orient_PS's doc 2023-08-04 14:32:48 +02:00
Mael Rouxel-Labbé 361f6e2f63 Clean code to use Face_location / Barycentric_coordinates everywhere 2023-08-04 13:30:26 +02:00
Sébastien Loriot 06db9ccad8 reproject barycenter to avoid boundary shrinking 2023-08-02 17:25:58 +02:00
Jane Tournois b7aeab378f Merge remote-tracking branch 'cgal/master' into PMP-add_sizing_in_isotropic_remeshing-GF 2023-08-01 12:22:15 +02:00
Ivan Paden 1c597a07cf Move sizing map calculation to constructor 2023-11-16 09:16:00 +01:00
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 c8a96328bd Use C++17 CTAD in example 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
albert-github ad41766454 issue #7395 Improvement of layout of model relations
Corrected `cgalModels` to `cgalHasModes` inside `cgalHasNodelsBegin` / `cgalHasModelsEnd`
2023-07-18 13:23:37 +02:00
albert-github de3ba0f47c Merge remote-tracking branch 'upstream/master' into feature/issue_7395 2023-07-17 10:17:34 +02:00
Laurent Rineau f21cafc3cd Merge pull request #7596 from MaelRL/PMP-Rephrase_bounded_Hausdorff_doc-GF
Rephrase documentation of one-sided Haussdorff distance function
2023-07-17 09:52:18 +02:00
albert-github 4e5578d469 issue #7395 Improvement of layout of model relations
- based on review
2023-07-15 13:12:15 +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
Mael Rouxel-Labbé 852056a8ac Rephrase documentation of one-sided Haussdorff distance function 2023-07-12 16:16:42 +02:00
Laurent Rineau 4a2c7a668d Merge pull request #7571 from albert-github/feature/issue_7454
issue #7454 Consistency of BigO notations
2023-07-12 15:29:56 +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 68813c5c63 Merge pull request #7403 from sloriot/CGAL-replace_boost_by_std
Replace boost by std
2023-07-05 11:08:36 +02:00
albert-github b3af96caa1 issue #7454 Consistency of BigO notations
Create `cgalBigO` marco and used it.
(`The macro `cgalBigOLarge` is for special situations where we need bigger round brackets)
2023-07-04 16:23:14 +02:00
Sébastien Loriot dfc386d65b Merge branch 'master' into HEAD 2023-06-22 14:05:45 +02:00
Laurent Rineau 70ac38bed0 Merge pull request #7523 from nmnobre/doc_segmentation
Fix typos in multiple manuals
2023-06-22 11:59:32 +02:00
Nuno Miguel Nobre 0469f46105 Fix plurals in a number of manuals 2023-06-20 13:29:44 +01: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 56499e017d do not use API that did not go into the standard 2023-06-15 10:57:10 +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
Sébastien Loriot bf1ffb3cae move tests into the testsuite 2023-06-01 11:38:03 +02:00
Andreas Fabri a8e3c84c78 PMP: Document overload of angle_and_area_smoothing() 2023-06-01 10:37:22 +01:00
Sébastien Loriot e0f48fb51a fix script 2023-06-01 11:18:33 +02: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
Sebastien Loriot 32da057717
PMP: Test with class derived from Surface_mesh (#7422)
## Summary of Changes

Add the class `CGAL::Testsuite::DerivedSurfaceMesh` that will enable us
to check if a class derived from ` CGAL::Surface_mesh` passes the
Polygon Mesh Processing testsuite (and others). To get started and early
feedback this is currently only used in a single testcase.

This is related to PR #7418 as we would have detected the issue.

## Release Management

* Affected package(s): PMP

* License and copyright ownership: unchanged
2023-05-22 09:20:40 +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
Andreas Fabri 257a03e198 PMP: Test with class derived from Surface_mesh 2023-05-04 11:38:44 +01: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
hoskillua 83bf49bf39 Computing curvatures mentioned in the outline section (1.3) 2023-05-01 12:29:25 +02:00
hoskillua ae5d32ba2e citing/referencing "corrected curvature measures"
+ refining the theo background
2023-05-01 12:23:20 +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 585e79b67e add authors from the history section 2023-04-26 13:06:19 +02:00
Sébastien Loriot 731905c02c fix one more 2023-04-26 09:03:28 +02:00
Laurent Rineau b8f23d4feb Merge pull request #7255 from lrineau/CGAL-rename_ctest_test_names-GF
CGAL CTest support: rename the test names
2023-04-24 14:08:27 +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
Laurent Rineau 205236832e Merge remote-tracking branch 'cgal/master' into CGAL-rename_ctest_test_names-GF
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
2023-04-21 10:47:17 +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
hoskillua 261eac81e9 user manual - incomplete 2023-04-18 14:30:37 +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é 82e130d951 Minor example improvements 2023-04-18 12:14:10 +02:00
Mael Rouxel-Labbé 451223a2e8 Fix not forwarding verbose NP to inner functions 2023-04-18 11:22:53 +02:00
hoskillua f8a9862abf incomplete update to user man doc 2023-04-17 15:14:37 +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 824976a003 Merge pull request #7236 from albert-github/feature/issue_7231
issue #7231 Improvement of layout of refines relations.
2023-04-17 10:14:01 +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 2393258370 add triangle soup specific tests 2023-04-12 16:59:05 +02:00
Sébastien Loriot b123ccf125 copy mesh test for soup 2023-04-12 16:21:42 +02:00