Commit Graph

4372 Commits

Author SHA1 Message Date
Laurent Rineau 26ad68e486 Merge pull request #5649 from sloriot/CGAL-no_boost_shared_ptr
Replace internal use of boost shared_ptr
2021-05-18 18:14:12 +02:00
Laurent Rineau 1ac4c2903a Merge pull request #5589 from MaelRL/Number_types-Fix_approx_sqrt_mpq-GF
Fix approximate_sqrt return types
2021-05-18 17:32:26 +02:00
Laurent Rineau 49aff67985 Merge pull request #5689 from janetournois/PMP-isotropic_remeshing_fixes-jtournois
PMP::isotropic_remeshing - fixes about "isolated constraints"

# Conflicts:
#	Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
2021-05-18 17:31:55 +02:00
Laurent Rineau e0a4dd0680 Merge pull request #5677 from sloriot/CGAL-IO_namespace
CGAL IO namespace

# Conflicts:
#	Installation/test/Installation/test_gmp_mpfr_dll.cpp
2021-05-18 17:31:40 +02:00
Laurent Rineau b33a2f17bd Merge pull request #5689 from janetournois/PMP-isotropic_remeshing_fixes-jtournois
PMP::isotropic_remeshing - fixes about "isolated constraints"

# Conflicts:
#	Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
2021-05-18 17:06:45 +02:00
Jane Tournois 74e2ee9734 do not collapse isolated constraints 2021-05-06 19:40:52 +02:00
Jane Tournois 14385aaf15 add a test with isolated constraints, on and away from mesh borders 2021-05-06 17:48:39 +02:00
Jane Tournois 3a6e31de65 do not split isolated constraints 2021-05-06 15:56:23 +01:00
Jane Tournois 64e568f748 an isolated constraint can be on the mesh border
the halfedge status for a pair of opposite halfedges can be
MESH_BORDER and ISOLATED_CONSTRAINT, but MESH_BORDER has
priority
2021-05-06 16:56:05 +02:00
Jane Tournois 49fc218c45 avoid iterating over all halfedges, but only the ones of the patch to be remeshed 2021-05-06 15:55:19 +01:00
Jane Tournois 9d3d29fd6d encapsulate debug code in debug macro 2021-05-06 16:55:02 +02:00
Sébastien Loriot 79057f3cdd allow to remesh a patch with boundary cycles of edges if genus is not to be preserved 2021-05-06 14:32:32 +02:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Laurent Rineau c091c7f86e Merge pull request #5532 from lrineau/Kernel_23-Do_interesect__without_division-GF
Remove operator/ from CGAL::Mpzf and implement Do_intersect_3 with RT only (without division)
2021-04-28 15:24:15 +02:00
Laurent Rineau ab887fd909 Merge pull request #5634 from sloriot/PMP-improve_conditionnal_code
Simplify conditional code
2021-04-28 15:24:05 +02:00
Laurent Rineau b775b04eb8 Merge pull request #5637 from sloriot/PMP-hole_filling_empty_range_warning
Fix use of empty range
2021-04-28 15:24:01 +02:00
Laurent Rineau 795c931b55 Merge pull request #5637 from sloriot/PMP-hole_filling_empty_range_warning
Fix use of empty range
2021-04-28 15:22:41 +02:00
Sébastien Loriot 1faa0e2992 replace internal use of boost::shared_ptr by std::shared_ptr 2021-04-28 10:55:26 +02:00
Sébastien Loriot 0eea836f1e handle empty point range 2021-04-23 08:46:28 +02:00
Sébastien Loriot b0a05ab501 fix default 2021-04-21 17:50:47 +02:00
Sébastien Loriot 8a3d9ad124 restrict the usage of the macro
everything is local now
2021-04-21 17:48:08 +02:00
Sébastien Loriot f513a791e2 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-21 15:48:36 +02:00
Sébastien Loriot eef92fbef7 Merge remote-tracking branch 'cgal/5.1.x-branch' 2021-04-21 15:47:06 +02:00
Sebastien Loriot fa4a31a87b
Merge pull request #5583 from sloriot/PMP-face_epsilon_map
Polyhedral_envelope: face epsilon map
2021-04-21 15:26:48 +02:00
Mael Rouxel-Labbé c489b7ffa5 Add missing Coercion_traits specialization for custom FT in PMP test 2021-04-20 15:59:29 +02:00
Sébastien Loriot 0efe2459dc remove whitespace introduced during merge 2021-04-17 14:13:28 +02:00
Sébastien Loriot 39367c2313 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-17 11:14:29 +02:00
Sebastien Loriot e9c97d2b59
Merge pull request #5539 from sloriot/PMP-coref_check_si
Collect faces incident to edges too
2021-04-17 11:04:38 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Sebastien Loriot 66441af8c6
Merge pull request #5566 from afabri/PMP-accelerate_Envelope-GF
PMP - Polyhedral Envelope :  Make it faster by making combinatorial tests
2021-04-17 10:53:22 +02:00
Sébastien Loriot 4436fd62a5 Merge pull request #5266 from janetournois/PMP-isotropic_remeshing_collapse_step-jtournois
PMP isotropic_remeshing() - improve edge flip step
2021-04-17 10:51:15 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Jane Tournois d61cf58f2f add ISOLATED_CONSTRAINT halfedge status
this type is needed for edges that are part of the input constrained
edges property map, and are incident to a face to be remeshed only by a
vertex.
These edges contribute to creating corner vertices (incident to >= 3
constrained edges), but should still not be considered as patch borders

without dealing with these "isolated constraints", the corner vertices that
are incident to 2 patch borders and 1 of these edges was not considered
as a corner but as a simple patch border vertex, hence it could be
moved/deleted by a collapse or relaxation steps
2021-04-13 15:20:21 +02:00
Sébastien Loriot 0e6754b15e typos 2021-04-10 09:19:46 +02:00
Jane Tournois 371706e92a Merge remote-tracking branch 'cgal/master' into PMP-isotropic_remeshing_collapse_step-jtournois
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
2021-04-08 11:11:51 +02:00
Sebastien Loriot dfe70d17e7
Fix typo 2021-04-08 08:56:54 +02:00
Sébastien Loriot 667817ece0 test new API 2021-04-07 15:27:56 +02:00
Sébastien Loriot d8cdbbdc28 avoid an extra is-degenerate test 2021-04-07 15:10:32 +02:00
Sébastien Loriot 5b554abce8 add named parameter for triangle soup 2021-04-07 14:52:51 +02:00
Maxime Gimeno 17602e589e Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF 2021-04-07 09:17:51 +02:00
Laurent Rineau 1b54449dc5 Merge pull request #4878 from danston/Kernels-decltypes-danston
Improve decltype/result_of/invoke_result
2021-04-06 15:13:21 +02:00
Laurent Rineau 58ddf16295 Merge pull request #5507 from afabri/PMP-vtune_isotropic_remeshing-GF
PMP:  Accelerate isotropic remeshing
2021-04-06 15:13:11 +02:00
Laurent Rineau d46dcec5e5 Merge pull request #5510 from pentacular/wasm
Round-to-nearest support for intervals
2021-04-06 15:13:09 +02:00
Laurent Rineau 8247232cf1 Merge pull request #5535 from sloriot/CGAL-more_cmake_support_files
Add more cmake support files
2021-04-06 15:13:04 +02:00
Laurent Rineau 791d4abfec Merge pull request #5555 from sloriot/PMP-exception_inheritance
Inherit from a std exception
2021-04-06 15:12:55 +02:00
Laurent Rineau 9b442d1595 Merge pull request #5570 from MaelRL/PMP-Repair_PS_invalid_polygons_speed_up-GF
Speed up invalid polygon removal in repair_PS
2021-04-06 15:12:47 +02:00
Laurent Rineau a11a7578f6 Merge pull request #5570 from MaelRL/PMP-Repair_PS_invalid_polygons_speed_up-GF
Speed up invalid polygon removal in repair_PS
2021-04-06 15:11:41 +02:00
Sébastien Loriot b7bafa1a34 do not build vector if not needed 2021-04-03 11:22:14 +02:00
Sébastien Loriot dd19b506ed first version to add epsilon per face 2021-04-03 11:14:15 +02:00
Andreas Fabri ab75cbea46 Add data set that shows the performance gain when running self_intersections_example.cpp (4.6 sec master, 0.6 sec this PR when run sequentially 2021-04-01 18:42:05 +01:00
Andreas Fabri c97d3ffb65 Take into account that obtuse vertices are not clipped. 2021-04-01 16:47:07 +01:00
Andreas Fabri 6c4835f8db Introduce a struct for Prism so that we can also store which corner is obtuse 2021-04-01 15:35:16 +01:00
Sébastien Loriot f4a79aebd8 catch const ref 2021-03-31 14:12:43 +02:00
Mael Rouxel-Labbé dc854d8088 Use std::remove_if to speed-up invalid polygon removal 2021-03-31 11:54:38 +02:00
Andreas Fabri ebbe978291 Do not test combinations of planes where we know that there is no intersection point 2021-03-30 13:56:28 +01:00
Sébastien Loriot e3b0302b2b inherit from a std exception 2021-03-26 09:53:29 +01:00
Laurent Rineau 79ba1af61f Merge pull request #5492 from sloriot/PMP-coref_full_edge_visitor
Add missing visitor calls for the output_builder part
2021-03-24 15:05:24 +01:00
Jane Tournois f9eb2439bd Merge branch 'PMP-isotropic_remeshing_collapse_step-jtournois' of github.com:janetournois/cgal into PMP-isotropic_remeshing_collapse_step-jtournois 2021-03-22 16:50:00 +01:00
Jane Tournois a79fe08fcf Merge remote-tracking branch 'cgal/master' into PMP-isotropic_remeshing_collapse_step-jtournois 2021-03-22 16:46:08 +01:00
Brian Spilsbury b05f6061ab Merge branch 'master' into wasm 2021-03-20 17:57:57 +09:00
Andreas Fabri 29a40dc40b Remove the timer and the output of the result 2021-03-19 15:47:12 +01:00
Sébastien Loriot f5a6ff424e collect face incident to edges too 2021-03-19 14:47:54 +01:00
Jane Tournois 109a893657 remove #ifdef that should be defined 2021-03-19 11:30:05 +01:00
Sébastien Loriot ac15312260 add Ceres support cmake file 2021-03-18 14:47:56 +01:00
Dmitry Anisimov 00c185b028
Merge branch 'master' into Kernels-decltypes-danston 2021-03-12 12:06:20 +01:00
Andreas Fabri da17681a06 Avoid computing degree several times 2021-03-10 15:28:56 +00:00
Laurent Rineau b2ed4e5f7e Merge pull request #5423 from afabri/PMP-corefine_OM-GF
PMP:: Use operator<  instead of operator> as OM only implements the former

Conflicts:
	Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_consecutive_bool_op.cpp
	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h
2021-03-10 11:33:30 +01:00
Laurent Rineau 4dc8a341f9 Merge pull request #5423 from afabri/PMP-corefine_OM-GF
PMP:: Use operator<  instead of operator> as OM only implements the former
2021-03-10 10:33:17 +01:00
Andreas Fabri cea8cca6af WIP: less computations of degree 2021-03-09 15:45:18 +00:00
Andreas Fabri b1c2dd8db6 WIP: early exit in the static filter 2021-03-07 18:25:18 +00:00
Andreas Fabri 45265a7e34 Replace vector with optional by two vectors. No idea what is better yet 2021-03-04 10:46:46 +00:00
Andreas Fabri 2e3bfa8743 Reduce calls to target @sloriot please double check the correctness 2021-03-04 09:27:05 +00:00
Sébastien Loriot a177ed01a4 fix warnings 2021-03-04 09:34:56 +01:00
Sébastien Loriot 0710924d3b accomodate is_badly_shape API update 2021-03-04 09:34:40 +01:00
Sébastien Loriot a4669bc39f Merge remote-tracking branch 'cgal/master' into HEAD 2021-03-04 09:34:26 +01:00
Sebastien Loriot ec8bfa577a
missing typename 2021-03-04 09:02:33 +01:00
Laurent Rineau fb00e173d6 Merge pull request #5405 from maxGimeno/PMP-Move_operations_for_collision_detector-maxGimeno
PMP Move assign for Rigid_triangle_mesh_collision_detection
2021-03-03 17:33:12 +01:00
Laurent Rineau 83244deabb Merge pull request #5429 from sloriot/PMP-coref_face_patch_init
Corefine: always init faces of patches
2021-03-03 17:33:02 +01:00
Laurent Rineau dcf9dfd0fe Merge pull request #5435 from afabri/Intersect_3-fix_isocuboid_plane-GF
Intersect_3: Fix Iso_cuboid_3/Plane_3 and Tetrahedon_/Plane_3 intersection using PMP::clip internal function

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h
2021-03-03 17:30:04 +01:00
Laurent Rineau adc8d9b686 Merge pull request #5442 from MaelRL/PMP-stitch_borders_reintroduce_zipping-GF
Re-introduce some kind of zipping as a first step to boundary cycle stitching
2021-03-03 17:29:45 +01:00
Laurent Rineau 8f9009e793 Merge pull request #5476 from sloriot/PMP-needle_caps_ecm_bug
PMP: Remove needles&caps fixes
2021-03-03 17:21:38 +01:00
Laurent Rineau ea7fa2dada Merge pull request #5480 from afabri/Filtered_kernel-Document_functor_for_Envelope-GF
Kernel_23:  Rename internal function and functor
2021-03-03 17:21:35 +01:00
Laurent Rineau 15263250a4 Merge pull request #5485 from danston/PMP-tbb_exception_fix-danston
Use TBB captured exception in PMP
2021-03-03 17:21:31 +01:00
Laurent Rineau fd353e84e9 Merge pull request #5509 from sloriot/PMP-coref_robust_side_of
Robustify internal side-of-triangle-mesh calls
2021-03-03 17:18:11 +01:00
Laurent Rineau 325436540f Merge pull request #5429 from sloriot/PMP-coref_face_patch_init
Corefine: always init faces of patches
2021-03-03 17:10:16 +01:00
Laurent Rineau 3c3dad3243 Merge pull request #5435 from afabri/Intersect_3-fix_isocuboid_plane-GF
Intersect_3: Fix Iso_cuboid_3/Plane_3 and Tetrahedon_/Plane_3 intersection
2021-03-03 16:56:31 +01:00
Laurent Rineau b5e6ef261f Merge pull request #5442 from MaelRL/PMP-stitch_borders_reintroduce_zipping-GF
Re-introduce some kind of zipping as a first step to boundary cycle stitching
2021-03-03 16:39:54 +01:00
Laurent Rineau e522630610 Merge pull request #5476 from sloriot/PMP-needle_caps_ecm_bug
PMP: Remove needles&caps fixes
2021-03-03 16:34:46 +01:00
Laurent Rineau 7e61495ef5 Merge pull request #5429 from sloriot/PMP-coref_face_patch_init
Corefine: always init faces of patches
2021-03-03 16:31:17 +01:00
Laurent Rineau 2800c8c587 Merge pull request #5435 from afabri/Intersect_3-fix_isocuboid_plane-GF
Intersect_3: Fix Iso_cuboid_3/Plane_3 and Tetrahedon_/Plane_3 intersection
2021-03-03 16:31:15 +01:00
Andreas Fabri dad0287b69 Remove trailing whitespace 2021-03-03 14:34:56 +00:00
Andreas Fabri 82e5b3a02d Do not collect in a vector per patch, but do the tests directly (@janetournois please double-check this commit) 2021-03-03 14:23:56 +00:00
Brian Spilsbury 4a6706755d Cleanup 2021-03-03 19:58:56 +09:00
Brian Spilsbury 85c6b3b3b6 Revert PMP example 2021-03-03 19:57:51 +09:00
Brian Spilsbury d3d24faf04 Add tests 2021-03-03 19:45:40 +09:00
Sébastien Loriot fa47c35271 remove unused variable 2021-03-03 08:28:28 +01:00
Andreas Fabri 22789f6f6b Replace geometric by combinatorial test 2021-03-02 21:56:54 +00:00
Sébastien Loriot c1dcaac020 remove TODOs 2021-03-02 16:21:06 +01:00
Sébastien Loriot 313f682b8c use custom functor for bbox and split primitives
aabb tree build runtime is similar to using EPICK
2021-03-02 16:16:07 +01:00