Commit Graph

5133 Commits

Author SHA1 Message Date
Sebastien Loriot 3a64aef083 Fix working 2022-05-23 17:57:56 +02:00
Sébastien Loriot ca2362629c get rid of the removed halfedges 2022-05-23 17:57:56 +02:00
Sébastien Loriot 38135b884f be more permissive with orient 2022-05-23 17:57:49 +02:00
Andreas Fabri ee0df2c47f PMP::Add function triangle(face_descriptor, tmesh) returning a Triangle_3 2022-05-16 16:08:33 +01:00
Sebastien Loriot 709f123256
Merge pull request #6461 from afabri/Box_intersection-progress-GF
Fast Box Intersection:  Add progress tracking
2022-05-13 17:22:43 +02:00
Sébastien Loriot 7bf54e9de1 Merge pull request #6450 from afabri/PMP-hole_filling_progress-GF
PMP::triangulate_hole(): Add Visitor
2022-05-13 17:20:26 +02:00
Sebastien Loriot 269a391fa0
Merge pull request #6558 from lrineau/Installation-remove_wd4503-GF
CMake script updates: version of CMake and /wd4503 is only for MSVC 2015
2022-05-13 15:53:36 +02:00
Sebastien Loriot 8b5c57e225
Merge pull request #6537 from MaelRL/PMP-Approximate_Hausdorff_empty_meshes-GF
Fix GT/VPM usage in approximate Hausdorff distance computations
2022-05-13 15:51:12 +02:00
Sébastien Loriot 64979f79fa use non-deprecated np 2022-05-13 15:36:24 +02:00
Sébastien Loriot 083edccc39 remove verbose flag 2022-05-13 09:35:52 +02:00
Sébastien Loriot 58e589fdcb fix typos and missing dots 2022-05-12 12:23:21 +02:00
Sebastien Loriot 28213a70f0
Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-05-12 12:18:21 +02:00
Sébastien Loriot 66fc559586 add missing beginning 2022-05-12 10:09:20 +02:00
Sébastien Loriot 880ece7faa avoid empty map case 2022-05-12 10:06:42 +02:00
Andreas Fabri 88345b6ca4 polish 2022-05-12 08:12:37 +01:00
Sébastien Loriot 51d525778a fixes after review 2022-05-11 17:48:24 +02:00
Andreas Fabri eaa70a7520 int -> std::size_t (only catched with /W3) 2022-05-11 07:06:41 +01:00
Sébastien Loriot f966d9b0b9 more uniform naming scheme 2022-05-10 17:58:54 +02:00
Sébastien Loriot 7fdc5da83d add doc + renaming 2022-05-10 17:41:42 +02:00
Sébastien Loriot a8621f370a clean up and add more visitor calls 2022-05-10 15:07:10 +02:00
Jane Tournois 3fe4c316a7 remove extra empty lines 2022-05-10 09:47:09 +02:00
Jane Tournois aeb28afe4a improve test 2022-05-10 09:46:57 +02:00
Jane Tournois 3f5ecbe9d9
Update Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-05-10 09:23:58 +02:00
Andreas Fabri d01fa7bddd int -> std::size_t 2022-05-10 07:16:14 +01:00
Laurent Rineau 734c96e951 Merge branch 'master' into pr/lrineau/6558 2022-05-06 16:25:32 +02:00
Andreas Fabri aef14430b6 typos 2022-05-06 14:55:37 +01:00
Laurent Rineau 90accc92ea Merge pull request #6499 from MaelRL/STL-Merge_is_defaults-GF
Merge parameters::Is_default and parameters::is_default_parameter
2022-05-06 14:22:02 +02:00
Sébastien Loriot c18c3af6ac fix conversion warnings 2022-05-06 09:47:17 +02:00
Sébastien Loriot b42501514a fix broken API 2022-05-06 09:36:28 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Sébastien Loriot ea39f5def6 mention the visitor in the user manual 2022-05-05 14:46:51 +02:00
Sébastien Loriot 91cb65b0c2 add np doc 2022-05-05 14:22:30 +02:00
Sébastien Loriot 531ab922b4 add visitor calls for refine and fair phases 2022-05-05 14:16:53 +02:00
Sébastien Loriot 95f3850a73 improve doc 2022-05-05 13:48:07 +02:00
Sébastien Loriot 78e638b748 restore example and create a one dedicated to the visitor 2022-05-05 13:34:38 +02:00
Laurent Rineau 83fb998a66 Fix the non-determinism 2022-05-04 17:15:39 +02:00
Mael 4d9c7cd49a
Remove superfluous assertion
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-05-02 14:07:09 +02:00
Mael Rouxel-Labbé 7b12171671 Do not take references to potential temporary objects 2022-04-29 17:15:52 +02:00
Mael Rouxel-Labbé 8820db7b86 Minor test improvements 2022-04-29 16:24:15 +02:00
Mael Rouxel-Labbé 0535203605 Clarify requirements of PMP/distance.h functions (non-empty ranges/TMs) 2022-04-29 16:23:52 +02:00
Mael Rouxel-Labbé daddb6416a Fix not properly using GeomTraits / VertexPointMap in approx. Hausdorff 2022-04-29 16:19:14 +02:00
Jane Tournois 3b25bc1e0d improve test 2022-04-29 16:19:06 +02:00
Jane Tournois a547404f8c improve test
this test is failing for now
2022-04-29 15:20:22 +02:00
Jane Tournois f0022a5e21 change API to return triangulation instead of modifying Tr& out
and fix compilation errors after merging master
2022-04-29 13:53:39 +02:00
Jane Tournois c21fe46525 Merge remote-tracking branch 'cgal/master' into PMP-add_surface_mesher-jtournois
# Conflicts:
#	Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
2022-04-29 10:48:08 +02:00
Andreas Fabri a186d5205e int -> std::size_t 2022-04-27 08:53:41 +01:00
Andreas Fabri 30056cf3b1 int ->? std::size_t 2022-04-26 08:04:43 +01:00
Sébastien Loriot ec53e0a8dd avoid spamming the console if CERES is not available 2022-04-21 06:51:12 +02:00
Sébastien Loriot a0a3c1fa24 fix warning 2022-04-20 21:10:34 +02:00
Mael Rouxel-Labbé 052d24083a Fix compilation issue caused by wrong template parameter order 2022-04-20 19:44:10 +02:00
Mael Rouxel-Labbé 477353d5eb Merge parameters::Is_default and parameters::is_default_parameter 2022-04-20 16:01:02 +02:00
Andreas Fabri b04c6bf39b fix typo 2022-04-20 13:40:51 +01:00
Andreas Fabri 734e284af1 int -> std::size_t 2022-04-20 13:05:54 +01:00
Laurent Rineau 2ecf1b64f8 Merge pull request #6212 from sloriot/PMP-patch_compatible_orientation
Add function bitset orientation compatible patches
2022-04-12 16:35:14 +02:00
Laurent Rineau 2b9305698d Merge pull request #6466 from MaelRL/PMP-Hausdorff_more_bug_fixes-GF
PMP: more bounded Hausdorff fixes
2022-04-12 16:35:09 +02:00
Andreas Fabri 144fed2be4 Fix \cgalParamType 2022-04-12 08:51:12 +01:00
Andreas Fabri 3056de0758 Add example for progress tracking 2022-04-11 17:03:42 +01:00
Andreas Fabri 91e2e24d30 Add documentation 2022-04-11 16:43:42 +01:00
Andreas Fabri d6e6ce9dfb Add progress tracking of the planar algorithm 2022-04-11 16:00:05 +01:00
Sébastien Loriot 2093e60645 fixes after review 2022-04-11 15:43:08 +02:00
Mael Rouxel-Labbé cb9cf1d0e3 Add some debug info 2022-04-08 13:29:57 +02:00
Mael Rouxel-Labbé 720c52f00a Do not miss global_bounds.upper updates by not pushing subdivide faces into PQ 2022-04-08 13:28:04 +02:00
Mael Rouxel-Labbé 898382be0f Fix unused warning 2022-04-08 13:27:52 +02:00
Laurent Rineau a4f4c276f3
Merge branch 'master' into PMP-patch_compatible_orientation 2022-04-07 21:56:38 +02:00
Sébastien Loriot 086476bc30 improve example 2022-04-07 17:30:40 +02:00
Sebastien Loriot c253a64361
Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-04-07 12:25:20 +02:00
Sebastien Loriot 4d6ddfbc76
Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-04-07 12:24:38 +02:00
Mael Rouxel-Labbé ac8755df07 Remove assertion that can sometimes fail due to numerical errors 2022-04-07 11:41:38 +02:00
Mael Rouxel-Labbé 699c0aae9c Do not pollute the queue with meaningless triangles 2022-04-07 11:41:15 +02:00
Mael Rouxel-Labbé c38758db66 Replace custom stop criterion with paper's 2022-04-07 11:40:56 +02:00
Mael Rouxel-Labbé aa5fd2e0ce Switch back to non-squared values for comparisons 2022-04-07 11:40:30 +02:00
Sébastien Loriot f69dbcc893 mesh is const
thanks @lrineau
2022-04-07 09:59:44 +02:00
Sébastien Loriot 39331c3b65 use non-deprecated function 2022-04-07 09:19:33 +02:00
Sébastien Loriot 6c93fd68f2 fix missing include directive 2022-04-07 09:11:16 +02:00
Sébastien Loriot 599d77cb8e remove const& to avoid confusion 2022-04-06 18:56:28 +02:00
Sébastien Loriot fe9e559bd1 add an example 2022-04-06 18:24:53 +02:00
Sébastien Loriot 3c3995e54d clean up and add doc 2022-04-06 18:01:57 +02:00
Sébastien Loriot c9b7b76a81 remove unused lambda 2022-04-06 16:16:27 +02:00
Sébastien Loriot 0d87e44327 new function indicating orientation constraint of connected components in a mesh 2022-04-06 16:16:25 +02:00
Laurent Rineau fd75e5ab12 Merge pull request #5979 from sloriot/PMP-relax
Extract tangential relaxation  from isotropic_remeshing

# Conflicts:
#	Installation/CHANGES.md
2022-04-06 09:13:56 +02:00
Mael 30e0a5d021
Restore consistency between bounds and candidates queue 2022-04-05 16:43:29 +02:00
Mael Rouxel-Labbé 6fcc5f64a5 Do not .top() an empty queue 2022-04-04 15:50:41 +02:00
Mael Rouxel-Labbé 14a9abcca6 Fix assertion: global lbound is init. w/ the initial bound, not the error bound 2022-04-04 15:50:15 +02:00
Mael Rouxel-Labbé f46d4d1fae Do not add triangles that cannot realize the distance to the priority queue 2022-04-04 15:50:07 +02:00
Mael Rouxel-Labbé bd29b976f5 Use tighter initialization during computation of subdivided faces' local bounds 2022-04-04 15:49:54 +02:00
Mael Rouxel-Labbé fe21d98345 Improve Hausdorff distance debug code + more assertions 2022-04-04 15:49:45 +02:00
Laurent Rineau 2659228efa Merge pull request #5983 from MaelRL/PMP-Shape_predicates_with_predicates-GF
Filter the needle/cap predicates of PMP::shape_predicates.h
2022-03-31 16:58:07 +02:00
Laurent Rineau fd6451e452 Merge pull request #6460 from CGAL/afabri-patch-2
PMP:  Avoid link in documentation with a %
2022-03-31 16:57:56 +02:00
Sébastien Loriot 0d2b1cbc57 add missing endcond 2022-03-31 16:50:40 +02:00
Sébastien Loriot 1dd4b8462f Merge remote-tracking branch 'sloriot/PMP-relax' 2022-03-31 16:47:06 +02:00
Andreas Fabri 9f8897b84a Move the counting step as we currently also count the last recursive call which does nothing 2022-03-31 13:10:02 +01:00
Andreas Fabri 9c8ace1912 Initialize at start_..(); Use 3D Delaunay 2022-03-31 13:08:55 +01:00
Laurent Rineau dc6b0835b1 Merge pull request #6441 from sloriot/PMP-rncc_call_measure
PMP repair: Avoid large DAG when using Lazy
2022-03-30 16:43:10 +02:00
Laurent Rineau d68488daea Merge pull request #6441 from sloriot/PMP-rncc_call_measure
PMP repair: Avoid large DAG when using Lazy
2022-03-30 16:42:57 +02:00
Andreas Fabri 591c065bcb merge master 2022-03-30 15:21:51 +01:00
Andreas Fabri 709a1c7da5 Add callbacks to Default_surface_intersection_visitor 2022-03-30 14:57:29 +01:00
Andreas Fabri 0afbfc9c65 Improve reporting 2022-03-30 14:17:58 +01:00
Andreas Fabri ef19ead48a Add visitors for coplanar faces and build_output 2022-03-30 11:42:24 +01:00
Andreas Fabri 0d1042a841 Add callbacks to Default_visitor 2022-03-30 10:06:57 +01:00
Mael Rouxel-Labbé 4045d1265c Merge remote-tracking branch 'cgal/master' into PMP-Shape_predicates_with_predicates-GF 2022-03-30 10:41:40 +02:00
Mael Rouxel-Labbé d9d983b2de Remove unused typedefs and variables 2022-03-30 10:32:40 +02:00
Andreas Fabri 11de847009 Progress tracking of the triangulation step 2022-03-30 09:30:44 +01:00
Sébastien Loriot 763c5e99f4 Merge pull request #6190 from MaelRL/gsoc2021-Surface_mesh_simplification-probabilistic-komaromy
Probabilistic surface mesh simplification
2022-03-30 08:05:20 +02:00
Sébastien Loriot 010bcfc27b Merge pull request #6389 from MaelRL/PMP-Doc_smoothing-GF
PMP doc fixes and enhancements
2022-03-30 08:03:50 +02:00
Sébastien Loriot 3a03201ff1 Merge pull request #6338 from MaelRL/PMP-Orient_PS_with_PS-GF
Add orient_triangle_soup_with_reference_triangle_soup()
2022-03-30 08:03:29 +02:00
Andreas Fabri 6873b3418d Fix API of Default visitor 2022-03-29 17:36:04 +01:00
Andreas Fabri 28fa5ecd2b Fix API of Default visitor 2022-03-29 17:17:26 +01:00
Andreas Fabri 8bf1b630d9 Add progress tracking to corefinement 2022-03-29 16:55:03 +01:00
Sébastien Loriot f6f158a121 fix confusing namespace 2022-03-29 15:15:54 +02:00
Sebastien Loriot f4327cb289
use helper function 2022-03-29 15:09:56 +02:00
Andreas Fabri 3fd0a03cfb
Update corefinement.h 2022-03-29 12:04:59 +02:00
Sebastien Loriot 8286dcbcb0
Improve wording
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2022-03-29 08:24:22 +02:00
Andreas Fabri b9d8c8c682 Please enter the commit message for your changes. Lines starting 2022-03-28 11:20:50 +01:00
Andreas Fabri e0016532cb polish example 2022-03-28 06:39:44 +01:00
Andreas Fabri 398c4d2353 Thow an exception based on a timeout while tracking progress 2022-03-25 17:34:22 +01:00
Andreas Fabri 2c07eaf6fe Add progress tracking for the quadratic phase 2022-03-25 14:18:24 +01:00
Andreas Fabri 81e85bc908 fixes 2022-03-24 18:00:12 +01:00
Andreas Fabri 9e3a36cde6 Real progress 2022-03-24 17:12:45 +01:00
Andreas Fabri 8132fad631 Add parameter to functions inside an #if 0 block 2022-03-24 13:51:49 +01:00
Mael Rouxel-Labbé 22da333de0 Re-enable EPECK tests 2022-03-24 13:51:01 +01:00
Mael Rouxel-Labbé 7f44a15a7a Clean comment 2022-03-24 12:43:30 +01:00
Andreas Fabri d1ba40e21c Remove template parameter 2022-03-24 12:37:29 +01:00
Mael Rouxel-Labbé 115f3d202e Merge remote-tracking branch 'cgal/master' into PMP-Shape_predicates_with_predicates-GF 2022-03-24 12:31:01 +01:00
Andreas Fabri 679897a755 PMP::triangulate_hole(): Add Visitor as template parameter and as parameter 2022-03-24 12:05:14 +01:00
Sébastien Loriot b56027ba42 typo 2022-03-24 09:07:00 +01:00
Sébastien Loriot 7ab2c079b3 add an option to forbid some moves 2022-03-23 23:53:00 +01:00
Sébastien Loriot 1b5632fcdc do not care a ref as it will be update to the new position 2022-03-23 22:56:23 +01:00
Sébastien Loriot f4098ebe65 fix warning 2022-03-23 22:55:47 +01:00
Sébastien Loriot dbe2cda538 fix compilation issue 2022-03-23 22:41:29 +01:00
Sébastien Loriot 689da92ae4 Merge remote-tracking branch 'PMP-relax' into master 2022-03-23 22:09:20 +01:00
Mael Rouxel-Labbé d5b51a84ef PMP misc spring cleaning 2022-03-23 18:39:31 +01:00
Sébastien Loriot b56b36815f use initial version with additional calls to exact
dealing with a custom mesh vpm in FFG is not simple +
it is not optimal to traverse all the faces for each
connected component
2022-03-21 11:31:12 +01:00
Sébastien Loriot 8186023fba forgot about area per cc 2022-03-21 10:44:21 +01:00
Sébastien Loriot ff5ae14d8d remove unused variables 2022-03-21 08:54:34 +01:00
Sébastien Loriot 3b77d101ef cc_volume should be positive 2022-03-21 07:15:00 +01:00
Sébastien Loriot 302a2707ea use PMP functions (already dealing with Lazy calls) 2022-03-21 07:11:41 +01:00
Mael Rouxel-Labbé 57704eea95 Make point range 'const' 2022-03-15 13:06:49 +01:00
albert-github bea89479f5 Polygon_mesh_processing: Missing end command for cgalParam
A `\cgalParamEnd` was missing, resulting in an incorrect sequence of HTML tags.
2022-03-15 10:59:59 +01:00
Mael Rouxel-Labbé efd9456e15 Enrich test of orient_PS family (non trivial NPs) 2022-03-15 10:45:06 +01:00
Mael Rouxel-Labbé 62f784357e Document double named parameters + doc fixes 2022-03-15 10:44:34 +01:00
Mael Rouxel-Labbé 97979d4cb2 Complete the named parameters of orient_PS_with_reference + proper traits usage 2022-03-15 10:44:04 +01:00
Mael d9eb5eb3d9
Apply suggestions from @sloriot review
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-03-15 09:20:40 +01:00
Mael Rouxel-Labbé c66e1275a8 Fix bad parameter name in documentation 2022-03-15 00:49:12 +01:00
Mael Rouxel-Labbé f827e69498 Add orient_triangle_soup_with_reference_triangle_soup() to the ref manual 2022-03-15 00:09:35 +01:00
Mael Rouxel-Labbé 90ba4c5e92 Test orient_triangle_soup_with_reference_triangle_soup() 2022-03-15 00:07:35 +01:00
Mael Rouxel-Labbé f73cebe997 Misc cleaning 2022-03-15 00:07:23 +01:00
Mael Rouxel-Labbé a6e62f43f0 Fix point map usage and document orient_TS_with_reference_TS 2022-03-15 00:07:04 +01:00
Mael Rouxel-Labbé f8215a1858 Merge remote-tracking branch 'cgal/master' into PMP-Orient_PS_with_PS-GF 2022-03-14 23:32:51 +01:00
Mael Rouxel-Labbé fe0c31074c Modernize and improve test of orient_PS family 2022-03-14 23:32:24 +01:00
Mael Rouxel-Labbé d3239dee82 tm_ref is const, TriangleMesh does not need to be mutable 2022-03-14 23:29:14 +01:00