Commit Graph

1056 Commits

Author SHA1 Message Date
Sébastien Loriot c411ae69d0 Merge pull request #2951 from kkatrio/PMP-smoothing-kkatrio
PMP: Mesh and shape smoothing
2019-07-18 16:49:05 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF
PMP: Add locate.h and rewrite Triangulation_2 graph traits
2019-07-18 16:40:49 +02:00
Sébastien Loriot adff92f8f8 missing namespace 2019-07-15 08:49:12 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Sébastien Loriot cebf0657d8 Use a full CGAL version of named function parameters
no longer rely on boost
2019-07-14 22:45:47 +02:00
Mael 47c247ae72
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-10 15:36:25 +02:00
Laurent Rineau 8051ff5c5e Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-10 13:36:31 +02:00
Mael Rouxel-Labbé a4fc736001 Merge branch 'BGL-Tiny_is_valid_fix-GF' into BGL-Tiny_is_valid_fix-GF-5.0 2019-07-04 14:00:30 +02:00
Mael Rouxel-Labbé 43a08f5303 Give in to the 'goto' censorship bureau's pressures 2019-07-04 13:47:57 +02:00
Mael Rouxel-Labbé 2592d6b0bd Fix is_valid_pm verbosity
Some error messages were not printed. Some messages were printed too much
(since as soon as 'valid' was wrong, everything below was printed, even
if the test was not actually failing).
2019-07-04 09:04:28 +02:00
Mael Rouxel-Labbé 0d1759e996 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-20 15:02:32 +02:00
Mael Rouxel-Labbé 7a5486962d Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-20 14:49:25 +02:00
Mael Rouxel-Labbé 77711e4e71 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-19 11:34:48 +02:00
Mael Rouxel-Labbé 22bd8a943b Merge smooth_areas and smooth_angles, rework AABB tree, document everything 2019-06-18 16:02:42 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Mael Rouxel-Labbé 19de8eda04 Merge branch 'PMP-Generalize_keep_largest_CC-GF-old' into PMP-Generalize_keep_largest_CC-GF 2019-06-17 15:18:33 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Laurent Rineau 96912aaa20 Merge branch 'releases/CGAL-4.14-branch' 2019-06-17 13:53:42 +02:00
Laurent Rineau 377d707dfe Merge pull request #3996 from sloriot/BGL-split_fix_fct_pos
Put declaration before the call to the function
2019-06-17 13:51:31 +02:00
Sébastien Loriot d6fe7d485a add declaration before usage 2019-06-13 07:44:58 +02:00
Mael Rouxel-Labbé 6c4d873338 Get rid of the explicit curvature flow smoothing scheme
It's just worse all the time anyway
2019-06-07 10:27:21 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Mael Rouxel-Labbé 6e3f2c3510 Factorize smoothers and clean obsolete code 2019-05-29 15:59:50 +02:00
Mael Rouxel-Labbé ea7885e348 Add new named parameter: use_safety_constraints
Used in PMP::smooth_areas() / PMP::smooth_angles()
2019-05-24 13:32:18 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Mael Rouxel-Labbé a120290675 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-05-15 14:31:00 +02:00
Mael c53e7e2c68
Merge branch 'master' into PMP-Locate-GF 2019-05-15 07:59:52 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 423c4fbd11 Merge pull request #3266 from MaelRL/PMP-Snap_boundary-GF
PMP: boundary snapping
2019-05-14 16:48:00 +02:00
Laurent Rineau b7bb3f74ac Merge pull request #3858 from MaelRL/BGL-Fix_is_valid_polygon_mesh-GF
BGL: Fix is_valid_polygon_mesh not breaking away from potential infinite loops
2019-05-14 16:26:19 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau d5b2621076 Merge pull request #3858 from MaelRL/BGL-Fix_is_valid_polygon_mesh-GF
BGL: Fix is_valid_polygon_mesh not breaking away from potential infinite loops
2019-05-14 16:15:29 +02:00
Mael Rouxel-Labbé 0528592011 Fix cyclical header dependencies 2019-05-10 12:41:01 +02:00
Mael Rouxel-Labbé 1e9ca61fba Doc fixes 2019-05-10 11:45:49 +02:00
Mael Rouxel-Labbé 408ebbb784 Dependency fixes 2019-05-10 11:44:58 +02:00
Mael Rouxel-Labbé 75f9c7798e Add a forward declaration 2019-05-09 08:06:10 +02:00
Mael Rouxel-Labbé d4ad35b136 Resolve conflicts between 4.13 branch and master 2019-05-09 07:56:38 +02:00
Mael Rouxel-Labbé 9664d8f774 Whether coordinate snapping is used or not is now a named parameter 2019-05-08 18:20:32 +02:00
Mael Rouxel-Labbé f14f9ce447 Move some functions from PMP to BGL 2019-05-08 16:05:26 +02:00
Mael Rouxel-Labbé 9e8524c29e Rename BGL/polyhedra.h to BGL/generators.h 2019-05-08 15:16:25 +02:00
Mael Rouxel-Labbé 1e21492b9e Extract polyhedron genetion functions from helpers.h into a new header 2019-05-08 14:37:03 +02:00
Mael 21ebdb737c
Merge branch 'master' into PMP-Snap_boundary-GF 2019-05-06 15:53:56 +02:00
Laurent Rineau d466ea50cd Merge pull request #3884 from MaelRL/BGL-Fix_FFG_master-GF
BGL: Fix `Face_filtered_graph`'s `is_selection_valid()` (5.0)
2019-05-06 15:30:33 +02:00
Laurent Rineau c9beac61ca Merge pull request #3862 from MaelRL/BGL-Fix_is_valid_selection-GF
BGL: Fix `Face_filtered_graph`'s `is_selection_valid()`
2019-05-06 15:02:10 +02:00
Mael Rouxel-Labbé af142c7416 Add new named parameter: face_size_map
Used to pass custom maps to keep_large(st)_CCs
2019-05-06 09:00:09 +02:00
Mael Rouxel-Labbé ccf98605ab Fix Face_filtered_graph::is_selection_valid() (master) 2019-04-26 09:20:36 +02:00
Sébastien Loriot 564a6c72f4 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-23 10:46:32 +02:00
Mael Rouxel-Labbé 6ed5f5d064 Fixed CGAL::Face_filtered_graph::is_selection_valid()
The walk was wrong:
  hd = next(opposite(hd, _graph), _graph);
does not walk around the target.

It also didn't properly test all types of non-manifoldness
2019-04-18 11:26:54 +02:00
Mael Rouxel-Labbé c8767d3487 Fixed is_valid_polygon_mesh() (and family) not breaking away from invalid loops
also reduced verbosity and improved indentation
2019-04-17 16:32:05 +02:00
Sébastien Loriot bd955e57d3 fix conversion warnings 2019-04-10 14:28:35 +02:00
Sébastien Loriot 9c39f2260f add calls to reserve before creating meshes 2019-04-02 21:54:30 +02:00
Sébastien Loriot 0ce7fc09b5 turns iterator pairs into iterable ranges 2019-03-29 13:28:22 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Laurent Rineau 0d5009e582 Merge branch 'releases/CGAL-4.13-branch' 2019-03-26 16:43:41 +01:00
Laurent Rineau 0aa49e3549 Merge pull request #3783 from afabri/BGL_add_seams-GF
BGL:  Seam_mesh::add_seams() requires .selection.txt
2019-03-26 16:42:59 +01:00
Mael f1dceb79ee
fix typo 2019-03-20 11:43:33 +01:00
Andreas Fabri d31f685a0b polish 2019-03-20 11:42:06 +01:00
Andreas Fabri a9c3f9bc6c BGL: Seam_mesh::add_seams() requires .selection.txt 2019-03-20 11:34:21 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau 69fad29842 Merge branch 'releases/CGAL-4.13-branch' 2019-02-28 20:49:15 +01:00
Laurent Rineau b22f210fd4 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-02-28 20:48:05 +01:00
Sébastien Loriot 5ee640be6c add missing function required by the concept 2019-02-26 09:11:07 +01:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers
Update of headers
2019-02-22 16:39:09 +01:00
Andreas Fabri 84e118266d BGL: Return Iterator_range instead of std::pair 2019-02-20 11:44:20 +01:00
Sébastien Loriot a5576cd3fb replace markdown subsections by \cgalHeading 2019-02-14 10:53:48 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Laurent Rineau c9164a0660
Merge branch 'master' into Stream_support-Dont_use_vtk_for_vtu-GF 2019-01-22 12:06:08 +01:00
Laurent Rineau f5a8686cf3 Merge pull request #3439 from aboudev/VSA-lingjie
New package: Surface_mesh_approximation
2019-01-22 09:17:35 +01:00
Laurent Rineau 28e520b121 Merge pull request #3594 from sloriot/PMP-remove_null_edges_on_border
Null edges removal fix on the border
2019-01-22 09:15:08 +01:00
Sébastien Loriot eadb08d976 replace mode by a np 2019-01-17 16:03:48 +01:00
Laurent Rineau 40cf3869ba My changes for write_vtp 2019-01-16 16:15:01 +01:00
Sébastien Loriot c5cef4ce06 handle triangles attached by non-manifold vertices
cherry-picking of c697c2086f
2019-01-16 15:29:44 +01:00
Sébastien Loriot c697c2086f handle triangles attached by non-manifold vertices 2019-01-16 15:24:57 +01:00
Andreas Fabri 53816ffc2c Fix Seam_mesh 2019-01-15 17:59:03 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Andreas Fabri cd6bf144fe Simplify Seam_mesh 2019-01-10 13:54:16 +01:00
Laurent Rineau c9fb876574
Merge branch 'master' into VSA-lingjie 2019-01-10 10:13:09 +01:00
Andreas Fabri 608c5c6ac8 Fix Seam_mesh and Dispatch_output_iterator 2019-01-09 17:43:45 +01:00
Simon Giraudot 0396dd1118 Patch to improve normal orientation using user-defined seed points 2019-01-04 14:34:56 +01:00
Sébastien Loriot 551be55235 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2018-12-31 10:29:57 +01:00
Mael Rouxel-Labbé 2c6e9c2b70 Fixed memory leaks in partition code 2018-12-20 15:57:51 +01:00
Laurent Rineau 57b2fbdbfb Merge pull request #3485 from afabri/BGL-write_wrl-GF
BGL: Add write_wrl() for FaceGraph
2018-12-19 16:12:26 +01:00
Laurent Rineau 4bf2499b52 Merge pull request #3512 from maxGimeno/BGL-Fix_make_hexahedron_API-GF
Fix make_hexahedron doc
2018-12-19 16:08:58 +01:00
Laurent Rineau 0ec8873a37 Merge pull request #3538 from maxGimeno/BGL-Fix_add_face-GF
BGL: Fix Euler::add_face()
2018-12-19 16:01:14 +01:00
Laurent Rineau eb51562fe9 Merge pull request #3538 from maxGimeno/BGL-Fix_add_face-GF
BGL: Fix Euler::add_face()
2018-12-19 15:45:45 +01:00
Maxime Gimeno 51f8877e60 Replace the assertion about n>2 by a if 2018-12-13 09:31:35 +01:00
Maxime Gimeno 31b68de8b2 use std::copy and adjacent_find 2018-12-13 09:31:28 +01:00
Maxime Gimeno 266fee1c4c Check for uniqueness of the vertices in add_face 2018-12-13 09:31:10 +01:00
Maxime Gimeno 629b41e69d Remove garbage 2018-12-05 16:33:44 +01:00
Maxime Gimeno b04523f8c3 add images to doc 2018-12-04 13:27:02 +01:00
Maxime Gimeno 20899df7a7 Make the hexahedron creation clearer and fix examples and tests 2018-12-04 11:46:48 +01:00
Laurent Rineau eb1d7ecd68 Merge pull request #3480 from afabri/patch-3
BGL: Fix doc of Face_filtered_graph
2018-12-01 16:31:11 +01:00
Laurent Rineau c137f9f252 Merge pull request #3476 from sloriot/BGL_PSP-fix_getK_helper
Fix in PSP named parameters
2018-12-01 16:31:09 +01:00
Sébastien Loriot 7bf5cff4cf accomodate update from master 2018-11-30 15:32:34 +08:00
Sébastien Loriot cb4c3b47cf fix back-ticking 2018-11-29 14:53:21 +01:00
Andreas Fabri c570e86661 Removed unused typedef; Added to CHANGES.md 2018-11-29 08:12:26 +01:00
Andreas Fabri 5f007da461 Remove unused variables 2018-11-28 07:56:14 +01:00
Andreas Fabri 7ac3dcd63b Add write_wrl() for FaceGraph 2018-11-27 10:04:32 +01:00