Commit Graph

150 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé fb8463f470 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-05-22 15:17:56 +02:00
Laurent Rineau af456548af Merge pull request #4471 from MaelRL/PMP-Halfedge_comparer_for_stitch_borders-GF
PMP: Enable enforcing which edge is kept during stitching
2020-05-18 12:25:01 +02:00
Mael Rouxel-Labbé 4b9f7fe425 Merge remote-tracking branch 'cgal/master' into PMP-Halfedge_comparer_for_stitch_borders-GF 2020-05-12 19:19:41 +02:00
Maxime Gimeno 6122f27aac fix doc. 2020-05-12 15:35:29 +02:00
Simon Giraudot fefdd13f45 Merge remote-tracking branch 'mine/PSP-Cluster_points-GF' into PSP-Cluster_points-GF 2020-05-06 08:59:40 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Sebastien Loriot a860a7ea5a
Merge pull request #4404 from MaelRL/CGAL-Optimal_bounding_box-GF
New Package: Optimal Bounding Box
2020-04-16 18:10:58 +02:00
Simon Giraudot 60cb33fa31 Merge remote-tracking branch 'mine/PSP-Cluster_points-GF' into PSP-Cluster_points-GF 2020-04-16 17:02:19 +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
Mael 84bcb8ac05
Merge branch 'master' into PMP-Regularize_selection_borders-GF 2020-04-03 09:11:52 +02:00
Sébastien Loriot b0a1e84c07 Merge pull request #4104 from sgiraudot/BGL-Alpha_expansion_graphcut-GF
BGL: Alpha Expansion Graphcut
2020-04-02 14:00:16 +02:00
Simon Giraudot c2a7dd51f3 Use named parameters 2020-04-02 13:45:01 +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 9c0648a004 Merge tag 'master_before_no_tws_nor_tabs' into CGAL_IO-maxGimeno 2020-03-27 11:05:43 +01:00
Sébastien Loriot 92f5f0242e Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:04:33 +01:00
Mael Rouxel-Labbé 54d41c816b Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-24 12:03:07 +01:00
Mael 855003baa1
Merge branch 'master' into BGL-Alpha_expansion_graphcut-GF 2020-03-24 08:18:23 +01:00
Mael Rouxel-Labbé 2556196dad Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-23 08:59:49 +01:00
Sébastien Loriot eb5d1d9a95 Update from master 2020-03-20 08:58:52 +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
Simon Giraudot 7cba1cc1aa Document cluster_point_set() 2020-03-17 12:04:44 +01:00
Simon Giraudot 74070d3356 First version of clustering algorithm 2020-03-17 12:04:44 +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é 3e365756ca Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2020-03-09 16:54:25 +01:00
Mael Rouxel-Labbé 285829361b Merge branch 'PMP-Halfedge_comparer_for_stitch_borders-GF-old' into PMP-Halfedge_comparer_for_stitch_borders-GF 2020-03-06 12:41:13 +01:00
Mael Rouxel-Labbé 0133e9f2f9 Merge branch 'PMP-soup_to_mesh_add_vpm-old' into PMP-soup_to_mesh_add_vpm 2020-03-06 11:41:31 +01:00
Simon Giraudot feaa8ce598 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-03-05 15:58:17 +01:00
Mael Rouxel-Labbé 3a968a3433 Move GetPointMap to CGAL:: namespace (from CGAL::PSP_3)
Since it'll also be used in PMP
2020-02-19 17:47:43 +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 b1311fbdb3 Add a new PMP_np 2020-01-28 10:41:43 +01:00
Mael Rouxel-Labbé 88e9727717 Introduce NPs for polygon soup reading
Enable filling pmaps of surface mesh on reading

Also can write pmaps (off / obj)
2020-01-28 09:03:50 +01:00
Simon Giraudot 3cd8207f51 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-01-16 12:03:49 +01:00
Mael Rouxel-Labbé 4432031bbf Halfedges_comparator > halfedges_keeper + functor returns kept halfedge 2020-01-16 11:45:26 +01:00
Mael Rouxel-Labbé f80626749f Merge branch 'PMP-Halfedge_comparer_for_stitch_borders-GF-old' into PMP-Halfedge_comparer_for_stitch_borders-GF 2020-01-15 18:04:28 +01:00
Mael Rouxel-Labbé 24aa901970 Rename the halfedges comparator 2020-01-15 18:01:25 +01:00
Simon Giraudot 9ae5663f3e Use named parameters 2020-01-15 14:18:01 +01:00
Mael Rouxel-Labbé 30bfd877e2 Enable enforcing which edge is preserved during stitching 2020-01-15 13:21:19 +01:00
Simon Giraudot 5beaa0c164 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-01-15 10:28:10 +01:00
Simon Giraudot e657cd72f7 Add named parameter for max normal deviation 2019-12-11 12:50:44 +01:00
Mael Rouxel-Labbé 408635fe84 Add new NP 2019-12-09 16:34:29 +01:00
Mael Rouxel-Labbé 8b37309690 Add two new (undocumented for now) named parameters for PMP::Snap 2019-11-28 15:43:14 +01:00
Mael ab65cc9800
Merge branch 'master' into PMP-Remove_small_CCs 2019-10-28 09:07:45 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Maxime Gimeno 1a429d03e4 Add dry_run to keep_large_components() and remove_connected_components_of_negligible_size9) 2019-10-01 09:47:00 +02:00
Maxime Gimeno 546be7aff7 Add a `dry_run` parameter to `keep_large_connected_components()` 2019-09-30 15:49:36 +02:00