Commit Graph

526 Commits

Author SHA1 Message Date
Andreas Fabri 89c9ed68b6 change namespace and add doc 2020-10-20 09:17:16 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Laurent Rineau d075ef4fb3 Merge pull request #4712 from MaelRL/PMP-Clip_with_self_intersections-GF
PMP: Generalize some corefinement code
2020-10-09 17:10:50 +02:00
Mael Rouxel-Labbé 46630bdaad Merge remote-tracking branch 'cgal/master' into PMP-Clip_with_self_intersections-GF 2020-09-22 11:25:01 +02:00
Jane Tournois 4745308384 use graph_visitor instead of creating new triangulate_visitor 2020-09-15 14:38:29 +02:00
Jane Tournois 39e75e7530 rename split_visitor to triangulate_visitor and add PMPTriangulateFaceVisitor 2020-09-10 12:06:10 +02:00
Jane Tournois 626ba2745c replace done() by end() to be consistent with start() 2020-09-08 21:42:00 +02:00
Jane Tournois 268c0eabee replace operator() with more explicit visit() function 2020-09-08 19:03:34 +02:00
Jane Tournois 7f154f5c41 remove trailing whitespaces 2020-09-08 18:45:47 +02:00
Andreas Fabri 903fff4751 Restore example and add one for the visitor
# Conflicts:
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example.cpp
2020-09-08 15:18:19 +02:00
Andreas Fabri f2ff13d6c4 Add a visitor that allows to map each triangle to its original face
# Conflicts:
#	BGL/include/CGAL/boost/graph/named_params_helper.h
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example.cpp
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h
2020-09-08 15:17:18 +02:00
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Mael Rouxel-Labbé 1c53aea4e2 Add missing 'const' qualifiers 2020-08-06 08:50:41 +02:00
Mael Rouxel-Labbé 2375fed008 Enhance example to use custom traits (and test array-based PS_to_PM/repair_PS) 2020-08-05 10:49:54 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Mael 6553b0dfaa
Remove deleted example from CMakeLists.txt 2020-07-16 09:27:55 +02:00
Mael bbedb5e8b4
Fix name of property maps 2020-07-13 10:19:06 +02:00
Mael Rouxel-Labbé 7e2e9d849a Remove experimental code related to clipping self-intersecting meshes
See functionality added in https://github.com/CGAL/cgal/pull/4790 instead.

Keeping it in a commit instead of filtering the branch to keep the code
in history.
2020-07-03 15:02:00 +02:00
Mael Rouxel-Labbé 3280b9b087 Use new IO functions 2020-06-26 17:06:42 +02:00
Mael Rouxel-Labbé 9cca59ba36 Actually use the new IO functions + some example improvements 2020-06-23 18:24:39 +02:00
Maxime Gimeno ea53a8d70d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-06-17 14:25:21 +02:00
Maxime Gimeno 25c8313859 Replace IO functions in examples and fix Surface_mesh read_OFF() 2020-06-16 14:36:24 +02:00
Maxime Gimeno 7de5f28310 Fix pmp example about eigen 2020-06-12 09:41:02 +02:00
Mael Rouxel-Labbé e7fd86c2ef Add example of clipping w/ SI 2020-06-12 09:16:41 +02:00
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Mael Rouxel-Labbé fb8463f470 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-05-22 15:17:56 +02:00
Maxime Gimeno 20898e4b31 fix functions calls 2020-05-14 13:46:57 +02:00
Sébastien Loriot 7c4586be1b Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-05-12 16:59:02 +02:00
Sébastien Loriot fb83386f44 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-05-12 16:58:32 +02:00
Maxime Gimeno 098cc6abde Fix a PMP example 2020-05-06 11:31:13 +02:00
Sébastien Loriot 0c85cbfcf4 simplify example 2020-05-05 12:16:14 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Mael Rouxel-Labbé c16c1a7ea3 Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-04-10 16:10:11 +02:00
Sébastien Loriot 34299f037c Merge pull request #4140 from MaelRL/PMP-Make_remove_self_intersections_local-GF
PMP: Self-intersection local removal
2020-04-02 13:55:49 +02:00
Maxime Gimeno 6fce467f0c remove whitespaces 2020-03-31 17:02:02 +02:00
Mael Rouxel-Labbé 28500eae87 Remove undocumented examples using experimental functions!!!!! 2020-03-30 17:24:52 +02:00
Mael c766178456
Merge branch 'master' into PMP-Make_remove_self_intersections_local-GF 2020-03-30 09:44:36 +02:00
Maxime Gimeno 5ff8d88151 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:15:38 +01:00
Maxime Gimeno b13e863065 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:12:19 +01:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Maxime Gimeno 9c0648a004 Merge tag 'master_before_no_tws_nor_tabs' into CGAL_IO-maxGimeno 2020-03-27 11:05:43 +01:00
Sébastien Loriot 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +01:00
Sébastien Loriot 68728f4cd8 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:05:04 +01:00
Sébastien Loriot 92f5f0242e Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:04:33 +01:00
Sébastien Loriot 754699b33d extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:59:49 +01:00
Sébastien Loriot 4c094fd3c2 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:59:19 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Mael Rouxel-Labbé 6f90060e7d Flush before std::exit (otherwise nothing is printed) 2020-03-24 11:37:55 +01:00
Mael Rouxel-Labbé af1c69354b Merge remote-tracking branch 'cgal/master' into PMP-Make_remove_self_intersections_local-GF 2020-03-20 15:44:51 +01:00
Mael de563e9844
Merge branch 'master' into PMP-new_functions-GF 2020-03-20 08:48:39 +01:00
Sébastien Loriot 8eeee9c9a8 Update from master after default initialized index maps
Merge-commit + default map fixes
2020-03-18 08:10:54 +01:00
Sébastien Loriot cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF
Third party libs: improve documentation + introduce new CMake functions
2020-03-17 18:19:40 +01:00
Sébastien Loriot dc85217d5a fixes after @afabri's review 2020-03-17 15:49:46 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Maxime Gimeno 2424d54e30 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-12 12:10:44 +01:00
Mael Rouxel-Labbé e3efff2d7e Disable remove_self_intersections examples/tests 2020-03-06 12:15:11 +01:00
Mael Rouxel-Labbé 8d4313f7a8 Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-03-06 12:13:30 +01:00
Mael Rouxel-Labbé fb64638173 Clean example/test 2020-02-27 16:10:09 +01:00
Mael Rouxel-Labbé 5f542ffa00 Remove snap examples from PMP-examples' CMakeLists.txt (for now) 2020-02-26 08:58:26 +01:00
Mael Rouxel-Labbé 374870a6cb Misc minor fixes 2020-02-19 16:07:55 +01:00
Mael Rouxel-Labbé a520ac8285 Clean examples 2020-02-11 16:43:10 +01:00
Maxime Gimeno 4716359ca6 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-02-10 14:29:56 +01:00
Maxime Gimeno e3ace2289d First batch of fixes after review 2020-02-10 14:28:45 +01:00
Simon Giraudot ea30bcc85d Fix remaining CMakeLists.txt 2020-02-10 11:57:56 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Mael Rouxel-Labbé cb3e5cd83c Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-02-07 17:09:59 +01:00
Mael bb4247e143
Merge branch 'master' into PMP-Snapping_improvements-GF 2020-02-07 16:31:28 +01:00
Laurent Rineau 49a06e9201 Merge pull request #4362 from afabri/Box_intersection_d-accelerate-GF
PMP::self_intersections: Add Concurrency
2020-02-07 16:25:06 +01:00
Laurent Rineau 0fd7bbc4ff Merge pull request #4364 from afabri/CGAL-Parallel_if_available_tag
CGAL:: Add Parallel_if_available_tag
2020-02-07 16:25:03 +01:00
Laurent Rineau 226462c295 Merge pull request #4414 from oleg-alexandrov/master
Set the precision when saving a mesh
2020-02-07 16:25:00 +01:00
Laurent Rineau 3e8b1cc503 Merge pull request #4455 from oleg-alexandrov/holeFill
Add control over hole size in the hole-filling example
2020-02-07 16:24:42 +01:00
Mael Rouxel-Labbé 84215c95c4 Merge branch 'Box_intersection_d-accelerate-GF-old' into Box_intersection_d-accelerate-GF 2020-02-07 11:03:07 +01:00
Mael Rouxel-Labbé 81f04ac2d9 Move remove_self_intersections to PMP::experimental 2020-02-03 18:12:45 +01:00
Mael Rouxel-Labbé 32aa902bf5 Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-02-03 13:05:52 +01:00
Mael 42a03ae168
Add missing header 2020-02-03 10:29:35 +01:00
Maxime Gimeno 13b2c0201e Merge remote-tracking branch 'cgal/master' into PMP-volume_segmentation 2020-01-31 15:05:51 +01:00
Maxime Gimeno 28ee64dbf2 Add missing data 2020-01-31 09:29:54 +01:00
Mael 8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag 2020-01-29 16:42:54 +01:00
Mael Rouxel-Labbé 41271b67f6 Improvements to CGAL i/o across the board 2020-01-29 10:00:07 +01:00
Maxime Gimeno 82f0f86733 Fixes and example 2020-01-28 10:44:23 +01:00
Mael Rouxel-Labbé 828e47f61e Fix some header includes 2020-01-17 17:55:53 +01:00
Maxime Gimeno dd6cf454dc add precision(17) to most examples involving surface_mesh or polyhedron. 2020-01-17 09:58:44 +01:00
Mael Rouxel-Labbé 57a86afc3b Merge branch 'PMP-Snapping_improvements-GF-old' into PMP-Snapping_improvements-GF 2020-01-15 18:18:24 +01:00
Mael Rouxel-Labbé a1115c2ef1 Merge branch 'PMP-Snapping_improvements-GF-old' into PMP-Snapping_improvements-GF 2020-01-15 10:44:49 +01:00
Mael Rouxel-Labbé 5089dcf40a Tiny compilation fix 2020-01-15 10:41:50 +01:00
Sébastien Loriot def8ebda4b improve example by using CGAL functions 2020-01-09 08:19:30 +01:00
Oleg Alexandrov cec720a69c Add control over hole size in the hole-filling example 2020-01-08 18:25:25 -08:00
Mael Rouxel-Labbé 743228a250 Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-01-02 16:02:08 +01:00
Mael 0f4986f82b Merge branch 'master' into PMP-New_vertex_normal_computations-GF 2019-12-26 19:37:59 +01:00
Mael Rouxel-Labbé a1adb5fc94 Use correct parallel tags in the example 2019-12-03 12:00:09 +01:00
Mael Rouxel-Labbé 7cdd079820 Add two examples for PMP::snap (self-snapping and organic/fixed snapping) 2019-11-28 15:47:46 +01:00
Mael Rouxel-Labbé e73b973b62 Use Parallel_if_available_tag to simplify code that used CGAL_LINKED_WITH_TBB 2019-11-20 12:24:54 +01:00
Mael Rouxel-Labbé 47c0ce254e Enrich example 2019-11-19 18:40:34 +01:00
Mael Rouxel-Labbé ac86fadd7a Misc code formatting improvements 2019-11-19 12:51:17 +01:00
Andreas Fabri a44674a694 Add ConcurrencyTag in Box_intersection_d 2019-11-15 21:45:19 +01:00
Andreas Fabri bef2b5f1b8 Parallelize using 2 or 4 parallel threads 2019-11-15 16:21:25 +01:00
Andreas Fabri f033e0a244 Cleanup 2019-11-14 11:45:37 +01:00
Andreas Fabri 5ea8d36129 Do not use a concurrent_vector 2019-11-13 09:35:48 +01:00
Andreas Fabri 343ca0b4a7 Add the version that reports all pairs of faces and performs the intersection tests in parallel 2019-11-12 18:27:32 +01:00
Andreas Fabri 732d1d8f8a Add overloads with ConcurencyTag 2019-11-12 16:32:08 +01:00
Andreas Fabri 899d8f7b59 cleanup 2019-11-12 13:01:26 +01:00
Andreas Fabri ead0da3c77 WIP: not the same number of intersections for Tuyaeaux.stl 2019-11-12 11:40:40 +01:00
Andreas Fabri b6bc521c22 WIP does not even compile 2019-11-08 16:21:20 +01:00
Mael Rouxel-Labbé 413d4986bc Add an example showing the usage of PMP::Locate 2019-10-08 15:55:17 +02:00
Mael Rouxel-Labbé 677908e405 Fix NP usage 2019-09-26 13:02:45 +02:00
Maxime Gimeno ccf338b9b7 Merge remote-tracking branch 'cgal/master' into PMP-volume_segmentation 2019-09-04 14:58:16 +02:00
Mael Rouxel-Labbé c6d20b9c7c Tiny verbose addition 2019-08-28 14:56:44 +02:00
Mael Rouxel-Labbé e9d1841a5f Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2019-08-26 16:00:37 +02:00
Mael Rouxel-Labbé 61ef88f2de Clean example 2019-08-26 13:24:43 +02:00
Martin Skrodzki e7e724e4f9 Include Benchmark examples in the Hausdorff examples file. 2019-08-23 07:44:08 +02:00
Mael Rouxel-Labbé d60d7c578e Add an example and a test for self intersection removal (wip) 2019-08-07 15:32:23 +02:00
Martin Skrodzki 156cac5107 Implement benchmarking on both time and number of culled triangles. 2019-07-20 19:05:55 +02:00
Martin Skrodzki c91c780cae Add timing to the example file and restore all tests in the test file. 2019-07-19 11:27:59 +02:00
Sébastien Loriot 9fda0ffcc9 move example of using undocumented feature into test 2019-07-18 20:04:10 +02:00
Mael 9ba0870ebd
Merge branch 'master' into PMP-Snap_pp-GF 2019-07-18 17:43:04 +02:00
Mael Rouxel-Labbé 13e87ad3bd Parallelize AABB tree traversal 2019-07-18 14:32:56 +02:00
Mael Rouxel-Labbé 98723ca104 Add an example for snap 2019-07-17 14:58:12 +02:00
Martin Skrodzki 000604faa9 Comment naive comparison method. 2019-07-15 14:20:15 +02:00
Martin Skrodzki e78cbff8a1 Implement naive bounded Hausdoff computation by simple subdivision. 2019-07-15 14:12:01 +02:00
Martin Skrodzki 0332d9f00f Enable reading of real meshes and perturbation of them for distance computation. 2019-07-12 18:55:55 +02:00
Martin Skrodzki d8b6e7dfb1 Results of Code Review with Sebastien. 2019-07-12 18:04:08 +02:00
Mael Rouxel-Labbé f65fb45105 Tiny verbose change 2019-07-03 12:04:06 +02:00
Mael f40f8e4190
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-01 11:24:11 +02:00
Martin Skrodzki 2a523825a7 Implement a non-trivial toy example to test subdivision with. Intended solution is: Hausdorff distance will be attained at Point (0,0,1) and should be sqrt(3). 2019-06-24 03:42:48 +02:00
Mael Rouxel-Labbé 33c589cb61 Further Ceres-related CMakeLists.txt simplifications 2019-06-21 12:45:23 +02:00
Mael Rouxel-Labbé 7c82c96dfd Proper usage of CMake to find and use Ceres
done with the help of @lrineau
2019-06-21 11:24:32 +02:00
Mael Rouxel-Labbé 10c7aa373a Add new example data file 2019-06-20 14:06:00 +02:00
Mael Rouxel-Labbé 7b72fcbf6c Enable passing nb_iter/time step in command line arg
Also nb_iterations is an unsigned int, not a std::size_t
2019-06-20 13:38:21 +02:00
Mael Rouxel-Labbé cad9a0aaa8 Make things work when Ceres is not available 2019-06-20 13:04:15 +02:00
Mael Rouxel-Labbé 325af6823c Improve examples 2019-06-19 14:39:22 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 3b53ce20e3 Rename smooth/smooth_along_curvature_flow to smooth_mesh/shape
Also fix edge protection in the demo
2019-06-19 10:17:26 +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é bd7fd4a91e Clean useless code 2019-06-05 10:39:08 +02:00
Mael Rouxel-Labbé 6e3f2c3510 Factorize smoothers and clean obsolete code 2019-05-29 15:59:50 +02:00
Mael Rouxel-Labbé cb1d28bf85 Misc cleaning 2019-05-24 13:34:50 +02:00
Martin Skrodzki 82e8e4bb46 Initial version of bounded_error_hausdorff method. 2019-05-21 11:56:22 +02:00
Mael Rouxel-Labbé bcec5d8fe4 Cosmetic changes 2019-05-20 12:50:40 +02:00
Mael Rouxel-Labbé a120290675 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-05-15 14:31:00 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +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
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Sébastien Loriot 91330c8c8b add an example for volume decomposition 2018-10-23 11:39:46 +02:00