Commit Graph

1544 Commits

Author SHA1 Message Date
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é c33e8b60d7 Merge remote-tracking branch 'maxgimeno/PMP-Default_pmap-maxGimeno' into CGAL_IO-maxGimeno 2020-03-17 09:33:19 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Sébastien Loriot 32813dc976 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-16 16:32:47 +01:00
Sébastien Loriot f8f369173a remove BOOST_FOREACH introduced by a merge of 4.14 release branch 2020-03-16 16:24:24 +01:00
Sébastien Loriot cf99ea072d Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-16 16:19:38 +01:00
Sebastien Loriot 075ecbb4d7
Merge pull request #4573 from sloriot/BGL-add_face_border_fix
Fix issue with border vertices in Euler::add_face
2020-03-16 15:52:31 +01:00
Mael Rouxel-Labbé 2cb71708af Use proper index type in automatically-initialized index maps 2020-03-16 09:59:52 +01:00
Mael Rouxel-Labbé f6d994c003 Do not expose internal classes in BGL::FFG's default templates 2020-03-16 09:59:52 +01:00
Sébastien Loriot 1040a5f1e4 workaround to update the vertex of non-manifold umbrellas 2020-03-13 12:30:20 +01:00
Sébastien Loriot f37aedf7ba use dynamic maps instead of "old" workaround 2020-03-13 06:27:47 +01:00
Sébastien Loriot 2782bf0816 add better overloads matching to avoid ambiguity with dynamic tags 2020-03-13 06:01:10 +01:00
Mael Rouxel-Labbé 3864f6da9d Add an overload of choose_parameter to avoid needless constructions 2020-03-12 22:20:06 +01:00
Maxime Gimeno 2424d54e30 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-12 12:10:44 +01:00
Sébastien Loriot f454510de7 if a vertex is on a border, its halfedge is not necessarily on the border 2020-03-11 10:36:17 +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é 544dbb441a Add more information about index maps in BGL/PMP's NamedParameters.txt 2020-03-09 10:53:48 +01:00
Mael Rouxel-Labbé e4ff489623 Get rid of GetVertex/FaceIndexMap
GetInitialized... should be used instead.

Complete removal instead of simply doing:
  struct GetVertexIndexMap
    : public GetInitializedVertexIndexMap
  { }

because there will anyway be a need to update code on the right side of
  GetVertexIndexMap fim = ...

and it's more obvious if it breaks on the type directly.
2020-03-09 10:41:04 +01:00
Mael Rouxel-Labbé bc84ca29a2 Remove obsolete comment 2020-03-09 10:18:43 +01:00
Mael Rouxel-Labbé ec30ebb709 Move getter structs and global functions to appropriate BGL file 2020-03-09 10:18:19 +01:00
Mael Rouxel-Labbé fd864b7d99 Add a performance warning when a dynamic property map is used as index map 2020-03-09 10:18:08 +01:00
Mael Rouxel-Labbé 5e0798c88f Add a comment to clarify assertion 2020-03-06 18:16:12 +01:00
Mael Rouxel-Labbé ad62f89a20 Use the new index map initializer functions and fix doc 2020-03-06 15:25:38 +01:00
Mael Rouxel-Labbé 798a476d63 Merge branch 'PMP-Default_pmap-maxGimeno-old' into PMP-Default_pmap-maxGimeno 2020-03-06 13:20:00 +01:00
Sébastien Loriot f0a7a8f92f add missing const 2020-03-06 12:45:26 +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
Mael Rouxel-Labbé 4334e954c0 Parameter > PropertyTag for clarity 2020-03-05 17:30:15 +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é b0cfe5a96d Don't necessarily initialize the halfedge index map in copy_face_graph 2020-03-05 15:31:03 +01:00
Laurent Rineau 79699f9fc2 Merge pull request #4259 from MaelRL/PMP-Snapping_improvements-GF
PMP: Improvements for snapping
2020-03-05 15:06:46 +01:00
Laurent Rineau 192792f524 Merge pull request #4531 from sloriot/BGL-selection_for_removal_BF
Bug fix in selection expansion for removal
2020-03-05 14:52:19 +01:00
Laurent Rineau 952e0d9cb7 Merge pull request #4531 from sloriot/BGL-selection_for_removal_BF
Bug fix in selection expansion for removal
2020-03-05 14:50:52 +01:00
Mael Rouxel-Labbé e6584bd176 Implement initialized_index_map getter with non-const graph 2020-03-05 14:26:20 +01:00
Mael Rouxel-Labbé 18a7c6900f Tiny alignment change 2020-03-05 13:23:41 +01:00
Mael Rouxel-Labbé af47c608fc Add missing & 2020-03-05 13:23:34 +01:00
Mael Rouxel-Labbé 1f7c96a660 Some constructors from () to {} for clarity 2020-03-05 11:42:30 +01:00
Mael Rouxel-Labbé aa331c0f14 Add missing hash value function for Seam_mesh's edges 2020-03-05 11:30:29 +01:00
Mael Rouxel-Labbé 2d1f3266ea Hide error message behind debug macro 2020-03-04 14:35:46 +01:00
Mael Rouxel-Labbé 432d5c724a Improve usages of get_initialized_xxx_index_map 2020-03-04 13:37:09 +01:00
Mael Rouxel-Labbé 889108e253 Update get_initialize_xxx_index_map usages to new API 2020-03-04 12:58:42 +01:00
Mael Rouxel-Labbé d6bbf2bb5f Fix implementation of initialized index map getters 2020-03-04 11:56:50 +01:00
Mael Rouxel-Labbé 7e303f421f Add 'Is_writable_property_map'
Note the following:

'lvalue_pmap_tag' is annoying, because the property map is allowed to be non-mutable,
but boost::lvalue_property_map_tag is !always! defined as:
  struct lvalue_property_map_tag : public read_write_property_map_tag
so we can't just check that 'writable_property_map_tag' is a base of the the pmap's category.

Instead, this struct checks if the reference is non-const, which is not completely correct:
map[key] returning a non-const reference doesn't mean that 'put(map, key, val)' exists,
which is what a writable property map must define.
2020-03-04 09:02:13 +01:00
Mael Rouxel-Labbé e94da7c669 Remove trailing whitespace 2020-03-02 14:00:11 +01:00
Simon Giraudot d9c9b6e536 Update from reviews 2020-03-02 10:46:36 +01:00
Mael Rouxel-Labbé 26463ded7a Update NPs using default constructed default values to new API
+ misc cleaning
2020-02-28 11:55:17 +01:00
Mael Rouxel-Labbé 338089b2a5 Add an overload of choose_parameter with a single parameter
The previous (and only) overload of choose_parameter required two parameters,
with the default parameter often being a default constructed object
of type the type of the object being passed in named parameter.
For example:

typedef typename CGAL::GetPointMap<PointRange, NamedParameters>::type Point_map;
Point_map pm = choose_parameter(get_parameter(np, internal_np::point_map),
				Point_map());

However, this can be unpleasant, for example when passing functors that have
an underlying lambda such (function_property_map, ...) because lambdas
cannot be default constructed.

With the new API:

typedef typename CGAL::GetPointMap<PointRange, NamedParameters>::type Point_map;
Point_map pm = choose_parameter<Point_map>(get_parameter(np, internal_np::point_map));

all is well.
2020-02-28 11:48:41 +01:00
Maxime Gimeno 79c390eb6d fix warning 2020-02-26 16:17:17 +01:00
Maxime Gimeno 9a454ca7e2 Changes after review 2020-02-21 11:43:08 +01:00
Maxime Gimeno 077a129216 Merge remote-tracking branch 'cgal/master' into PMP-Default_pmap-maxGimeno 2020-02-21 10:34:14 +01:00
Maxime Gimeno 195d43bc5e Fix conversion warning 2020-02-20 16:49:54 +01:00
Mael Rouxel-Labbé bcd4f9600f Make GetPointMap work with only a PointRange template 2020-02-20 11:11:51 +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 c999ce144f Add the missing spe for Seam_mesh and dynamic_property_map 2020-02-19 10:07:53 +01:00
Maxime Gimeno 928f2bd2bb Remove unused typedef 2020-02-19 09:16:55 +01:00
Maxime Gimeno cf6fec2bbb move using 2020-02-18 16:36:05 +01:00
Maxime Gimeno aeb44510f1 Fix doc about boost/CGAL property tags 2020-02-18 15:27:34 +01:00
Maxime Gimeno 7ec84ae69c replace the functor by overloads of a free function 2020-02-18 14:42:53 +01:00
Maxime Gimeno 7d11c830e4 add some typedefs to get_ndi_map 2020-02-18 11:38:08 +01:00
Maxime Gimeno 9459df666d fix after review 2020-02-18 11:26:09 +01:00
Sébastien Loriot e759011cb5 handle cases when the traversed faces is split by a border
a non-manifold vertex might be created in this case
2020-02-17 19:11:13 +01:00
Maxime Gimeno b9a8d50b66 add missing include 2020-02-17 11:18:42 +01:00
Maxime Gimeno 5538786eff Merge remote-tracking branch 'cgal/master' into PMP-Default_pmap-maxGimeno 2020-02-14 15:00:54 +01:00
Laurent Rineau d872e134b2 Merge pull request #4508 from MaelRL/BGL-Fix_graph_has_property_doc-GF
BGL: fix doc of graph_has_property
2020-02-14 14:46:29 +01:00
Laurent Rineau 141eed441c Merge pull request #4508 from MaelRL/BGL-Fix_graph_has_property_doc-GF
BGL: fix doc of graph_has_property
2020-02-14 14:39:16 +01:00
Maxime Gimeno 249eb85060 fixes 2020-02-14 14:25:28 +01:00
Maxime Gimeno 002a3ac218 refines the Is_pmap_writable to take the reference constness into account 2020-02-14 13:40:57 +01:00
Mael Rouxel-Labbé 754cf35342 Fix graph_has_property not showing up in documentation
Consequence of the doc being split between doc/CGAL and include/CGAL...
2020-02-07 16:11:22 +01:00
Maxime Gimeno 13b2c0201e Merge remote-tracking branch 'cgal/master' into PMP-volume_segmentation 2020-01-31 15:05:51 +01:00
Mael Rouxel-Labbé 3bfbb3c805 Add missing 'typename' 2020-01-29 11:58:17 +01:00
Mael Rouxel-Labbé 7f6bf9b3cb Add skeletons for CGAL::read_PS, CGAL::read_PM, PMP::read_PM 2020-01-29 11:44:03 +01:00
Mael Rouxel-Labbé ae1c28c885 Move 3MF FaceGraph reading from SS to BGL 2020-01-29 11:34:32 +01:00
Mael Rouxel-Labbé 9de1e305cd Move a facegraph ply reader to where it belongs (SS --> BGL) 2020-01-29 11:33:20 +01:00
Mael Rouxel-Labbé 624cf89863 Some const correctness 2020-01-29 11:32:43 +01:00
Mael Rouxel-Labbé 1623a0886d Don't set stream precision 2020-01-29 10:12:33 +01:00
Mael Rouxel-Labbé 41271b67f6 Improvements to CGAL i/o across the board 2020-01-29 10:00:07 +01:00
Mael Rouxel-Labbé b1da380064 Rework Surface_mesh IO 2020-01-28 18:36:30 +01:00
Jane Tournois b4a3dc181d add facet_is_constrained_map to constrain facets 2020-01-28 15:50:57 +00:00
Jane Tournois abe46686d8 move visitor to a private named parameter
this way we can use the triangulation output by Mesh_3
in a straightforward manner, without converting it to a
Remeshing_triangulation_3

also make sure that it compiles with the Regular_triangulation
used in the Mesh_3 demo plugin

and fix a doc typo
2020-01-28 15:50:56 +00:00
Jane Tournois 56003ec27e apply Laurent's review and rename some parameters 2020-01-28 15:50:56 +00:00
Jane Tournois 97651adbec add very first version of tetrahedral remeshing package 2020-01-28 15:50:49 +00:00
Mael Rouxel-Labbé adb8410266 Fix output precision 2020-01-28 12:10:59 +01:00
Mael Rouxel-Labbé 39ca37bd4e Remove extra ; 2020-01-28 12:10:59 +01:00
Mael Rouxel-Labbé 4058da8ce1 Restore name/color reading from GOCAD 2020-01-28 12:10:59 +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
Mael Rouxel-Labbé b4862c2361 Fix typo 2020-01-27 09:46:24 +01:00
Mael Rouxel-Labbé 9e2289c63d Clean code 2020-01-25 18:18:31 +01:00
Mael Rouxel-Labbé 944df2c1ae Add generic facegraph printer 2020-01-25 13:02:27 +01:00
Mael Rouxel-Labbé d8053f8198 Use file writer for WRL output 2020-01-25 13:00:43 +01:00
Mael Rouxel-Labbé 128009fd57 Only check for structure validity, not manifoldness 2020-01-25 12:59:56 +01:00
Mael Rouxel-Labbé 97eddd9135 Fix some I/O returns 2020-01-24 23:28:04 +01:00
Mael Rouxel-Labbé 135595ca92 Misc cleaning 2020-01-24 23:17:33 +01:00
Mael Rouxel-Labbé 7bb2788d6f Use polygon soup OFF reader in polygon mesh OFF reader 2020-01-24 18:13:09 +01:00
Mael Rouxel-Labbé 423ae6ec84 Re-organize and improve BGL IO 2020-01-24 17:48:02 +01:00
Mael Rouxel-Labbé 6a5972cc3b Continue reorganization of CGAL I/O 2020-01-23 16:33:23 +01:00
Mael Rouxel-Labbé e317c689aa Misc compilation fixes 2020-01-17 18:28:57 +01:00
Mael Rouxel-Labbé 828e47f61e Fix some header includes 2020-01-17 17:55:53 +01:00
Sébastien Loriot 858bb72abf Update branch by a merge of PMP-corefine_non_manifold into cgal/master
also fix new np issues
2020-01-17 14:58:44 +01:00
Mael Rouxel-Labbé d620198049 Merge branch 'CGAL_IO-maxGimeno-old' into CGAL_IO-maxGimeno 2020-01-17 12:34:08 +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
Simon Giraudot 020c63bcf9 Fix licenses 2020-01-16 10:57:18 +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é 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
Laurent Rineau 3b660310ee Merge pull request #4428 from sloriot/BGL-selection_border_case
Handle "border" case
2020-01-15 17:31:55 +01:00
Laurent Rineau ed4cf46ee0 Merge pull request #4065 from MaelRL/PMP-New_vertex_normal_computations-GF
PMP: add a new way to compute vertex normals
2020-01-15 17:24:02 +01:00
Laurent Rineau 631e383e20 Merge pull request #4132 from MaelRL/PMP-Remove_small_CCs
PMP: remove small connected components
2020-01-15 17:24:00 +01:00
Laurent Rineau f37e107523 Merge pull request #4428 from sloriot/BGL-selection_border_case
Handle "border" case
2020-01-15 17:19:30 +01:00
Simon Giraudot 9ae5663f3e Use named parameters 2020-01-15 14:18:01 +01:00
Simon Giraudot 764fa731ee Merge remote-tracking branch 'mine/BGL-Alpha_expansion_graphcut-GF' into BGL-Alpha_expansion_graphcut-GF 2020-01-15 13:45:30 +01:00
Mael Rouxel-Labbé c09741f1f2 Improve PMP::stitching tests 2020-01-15 13:25:09 +01:00
Mael Rouxel-Labbé 30bfd877e2 Enable enforcing which edge is preserved during stitching 2020-01-15 13:21:19 +01:00
Simon Giraudot 1b900e8b86 Update with reviews 2020-01-15 12:46:53 +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
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
Mael 0f4986f82b Merge branch 'master' into PMP-New_vertex_normal_computations-GF 2019-12-26 19:37:59 +01:00
Sébastien Loriot e80f869147 Merge remote-tracking branch 'cgal/master' 2019-12-20 09:35:45 +01:00
Sébastien Loriot 056ce68477 handle "border" case
hard to put in a test because it depends on the starting
point of the iteration
2019-12-20 09:06:55 +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 7db5153f6d
Merge branch 'master' into PMP-Remove_small_CCs 2019-12-05 12:19:31 +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 Rouxel-Labbé 8bbd34168e Add a default template parameter to getVPM for convenience 2019-11-28 15:38:50 +01:00
Laurent Rineau 416cbbcf47 Merge pull request #4277 from MaelRL/PMP-Locate_rework_traits-GF
PMP: Replace `Location_traits` by a simpler API
2019-10-29 15:23:41 +01:00
Mael ab65cc9800
Merge branch 'master' into PMP-Remove_small_CCs 2019-10-28 09:07:45 +01:00
Mael fe681a2edb
Merge branch 'master' into PMP-New_vertex_normal_computations-GF 2019-10-28 08:52:52 +01:00
Mael Rouxel-Labbé ff09c5d0c8 Merge branch 'SMS-Add_GH_simplification-GF-old' into SMS-Add_GH_simplification-GF 2019-10-25 16:35:53 +02: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
Mael Rouxel-Labbé 09bd731ff9 Finish documentation 2019-10-18 23:09:21 +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
Mael Rouxel-Labbé 0f7de56d76 Move a number of Named Parameter type extractor from CGAL::PMP:: to PMP::
These are used in a number of pacakges other than PMP and the code
is also already in /BGL. None are documented.
2019-10-17 12:41:30 +02:00
Mael Rouxel-Labbé 79026c255e Fix documentation of CGAL::make_grid (bad line break, bad links) 2019-10-08 15:35:29 +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
Maxime Gimeno fe78af0029 Update comment 2019-09-27 08:52:59 +02:00
Maxime Gimeno 97a3390457 Wrap the mechanism in 3 functions with 3 types to reduce the number of template parameters to 2. 2019-09-26 16:31:38 +02:00
Maxime Gimeno bf0e52cf6e Incorporate the initialization of the map to the helpers. 2019-09-24 16:36:57 +02:00
Maxime Gimeno e8ae9c36eb more doc 2019-09-24 15:37:36 +02:00
Maxime Gimeno 0372d7713e bglize the OBJ I/O 2019-09-24 15:07:24 +02:00
Maxime Gimeno d18191db46 rename helper and add detect if map is writable (need_init is true in that case) 2019-09-24 14:15:01 +02:00
Maxime Gimeno 01c7259d0d Fixing read_OBJ() 2019-09-24 13:42:38 +02:00
Maxime Gimeno c022bb2faf WIP tables and missing formats 2019-09-19 15:59:15 +02:00
Maxime Gimeno c8c46d6f00 Finished the `Supported file formats` page 2019-09-19 13:27:06 +02:00
Laurent Rineau 166213806d Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-09 14:42:52 +02:00
Sébastien Loriot 17df9b5484 available only if c++11 is available 2019-09-09 10:48:05 +02:00
Laurent Rineau 5075a895f7 Merge branch 'releases/CGAL-4.14-branch' 2019-09-06 14:14:29 +02:00
Laurent Rineau 73500e8d3c Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-06 14:14:13 +02:00
Sébastien Loriot 67ce5dd976 add code to prevent silent bad usage of boost::get_param 2019-09-04 15:59:44 +02:00
Maxime Gimeno ccf338b9b7 Merge remote-tracking branch 'cgal/master' into PMP-volume_segmentation 2019-09-04 14:58:16 +02:00
Maxime Gimeno d285d4aae2 Fix mechanism and adapt cc test for polyhedron with no id 2019-09-04 14:00:08 +02:00
Simon Giraudot 851a5f8566 Add undocumented named parameter to read a pointmatcher config file 2019-09-02 09:47:23 +02:00
Simon Giraudot fff368c351 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2019-09-02 09:46:54 +02:00
Sébastien Loriot 7fd73c3919 use the new function to implement orient_to_bound_a_volume
the former implementation was recursive

    this makes the implementation non-recursive
2019-08-30 17:25:21 +02:00
Sébastien Loriot 8c27d11fdb use the new function to implement does_bound_a_volume
this makes the implementation non-recursive
2019-08-27 08:10:12 +02:00
Mael Rouxel-Labbé 14e33d62ec Add a convenience default template parameter 2019-08-26 13:01:10 +02:00
Sébastien Loriot 242cce424b add parameters to collect pair of cc intersecting 2019-08-25 13:53:32 +02:00
Sébastien Loriot 83fcb5d24e add new named parmeters to extract more info from the function 2019-08-25 09:46:56 +02:00
Mael Rouxel-Labbé 68419d1e65 Remove_negligible_CCs now take two new NP: area and volume thresholds
If no treshold is provided, a default value is computed based on the length
of the diagonal of the bbox.
2019-08-23 09:24:17 +02:00
Maxime Gimeno a8bccc6e41 restore the bool parameter and use ittogether with the `init_XXX_indices` helper functions. 2019-08-19 12:55:17 +02:00
Maxime Gimeno 4f0d883b27 WIP map_getter helper 2019-08-16 16:01:26 +02:00
Maxime Gimeno 6638d51fe8 - Unify the Facegraph builders (GOCAD and STL for now)
- Make a BGL STL_reader
- Add a test for it.
2019-08-09 13:53:33 +02:00
Maxime Gimeno 6dbf2d3d78 Move STL bgl writer into BGL, and replace it by a soup writer in Stream_support.
Write a SS test for read and write soups in STL
2019-08-09 12:09:20 +02:00
Maxime Gimeno 88b5d1916a some fixes in write_vtp and add read_vtp in BGL 2019-08-08 15:35:23 +02:00
Maxime Gimeno ebbe8571ee Move GOCAD's IO BGL code to BGL. 2019-08-08 11:46:10 +02:00
Sebastien Loriot aca05d36fa
Merge pull request #4119 from sloriot/CGAL-named_function_parameters-5.0
Named function parameters (5.0)
2019-08-08 10:10:45 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot aa47744c36 update the usage for the new CGAL named function parameters 2019-07-28 22:30:17 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Necip Yildiran c482d356d7 Merging with OpenGR_wrapper, further documentation
Merging with OpenGR_wrapper branch of remote https://github.com/necipfazil/cgal/
2019-07-26 14:18:27 +03:00
Simon Giraudot 475e9fdec6 Update with reviews 2019-07-25 09:16:16 +02:00
Mael Rouxel-Labbé ae44cf3ff9 Do not return a const& for Named Parameters' default values
Since 'd' is in general some default constructed value, things can get weird,
for example with default constructed std::function
2019-07-23 11:58:21 +02:00
Simon Giraudot c06c778ca9 Move MaxFlow back to segmentation and fix documentation 2019-07-23 09:21:20 +02:00
Simon Giraudot 497c121e55 Finalize API of alpha expansion + doc 2019-07-23 08:43:17 +02:00
Necip Yildiran 23eb9768fa Take initial transform for data point set as opt. namedparam to icp regist. method 2019-07-19 23:58:12 +03:00
Necip Yildiran dbc173d04c changed namedparameters, convenience overloads for pointmatcher::icp 2019-07-19 11:35:12 +03:00
Sébastien Loriot 8ca71ec60c doc fixes 2019-07-18 20:41:49 +02:00
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
Necip Yildiran a87cc959d4 added named parameters for pointmatcher icp config
Using CGAL::pointmatcher::ICP_config, config (name,params) could be passed to registration method through named parameters. Having pointmatcher style (name,params) pair as ICP_config allows to use extended pointmatcher configurations without needing to change wrapper implementation.
2019-07-17 17:14:17 +03: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
Sébastien Loriot 2e4881dcbd add a helper indicating from the types if a named parameter contains a given parameter 2019-06-26 12:05:19 +02:00
Sébastien Loriot 956d02109d add a new named parameter to pass a map of non-manifold features 2019-06-26 12:05:19 +02:00
Sébastien Loriot b536b8a232 use non-manifold edges map to filter intersection of edges and faces 2019-06-26 12:04:03 +02:00
Simon Giraudot 927474eecd Modify named parameters and begin ref manual 2019-06-26 11:31:02 +02:00
Sébastien Loriot d36aa97573 add named parameters for OpenGR options 2019-06-26 11:29:41 +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
Andreas Fabri eb688df5e0
BGL: Fix doc of Face_filtered_graph
Fix typo in documentation.
2018-11-26 15:00:07 +01:00
Sébastien Loriot 75aca45157 do no ignore user provided traits 2018-11-24 18:40:15 +01:00
Mael 49033c14ad
Merge branch 'master' into PMP-Snap_boundary-GF 2018-11-13 22:38:58 +01:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Sébastien Loriot 4dd6526022 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2018-11-08 17:21:29 +01:00
Sébastien Loriot 20b8205952 Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2018-11-08 17:21:00 +01:00
Sebastien Loriot d718870772
Merge pull request #3426 from maxGimeno/BGL-Fix_make_grid_doc-GF
BGL: Fix make_grid() documentation
2018-11-08 16:17:04 +01:00
Balázs Ludmány 5d35c33316 Fix type missmatch in adjacent_vertices
The adjacent_vertices uses the wrong iterator type in it's body. This commit changes it to the same as the function's return type.
2018-11-06 07:47:11 +01:00
Sébastien Loriot 6b8a36ba0c update clipping code for surface case and use Face_graph_output_builder
This fixes a bug when a patch with no input vertex must be
classified wrt the clipper
2018-11-05 16:26:33 +01:00
Maxime Gimeno b7d546eebb Remove ifdef 2018-11-05 14:02:39 +01:00
Maxime Gimeno e4f5455d2f Use the default 2018-11-05 13:57:22 +01:00
Maxime Gimeno 7f14d79292 Fix doc and only use 2 arguments in functor 2018-11-05 11:12:37 +01:00
Maxime Gimeno 985f34202d Adds missing information in the doc of make_grid and adds the 3rd argument of the functor. 2018-11-05 11:12:25 +01:00
Sébastien Loriot d940632471 Merge pull request #3258 from MaelRL/PMP-Filter_degenerate_polygon_soup_input-GF
PMP: repair polygon soup
2018-11-02 10:37:58 +01:00
Sébastien Loriot 056c778305 Merge pull request #3370 from maxGimeno/AABB_tree-Change_facegraph_triangle_primitive_id-GF
Aabb_tree: change the id of AABB_face_graph_triangle_primitive and AABB_halfedge_graph_segment_primitive
2018-11-02 10:34:26 +01:00
Sébastien Loriot cdbe19b480 Merge pull request #3369 from maxGimeno/AABB_tree-AABB_transformed_traits-GF
[Small Feature] Add collision detection in PMP
2018-10-30 15:49:38 +01:00
Laurent Rineau aba922e2d4 Merge pull request #3395 from sloriot/BGL-selection_issue
Fix selection issue with boundary vertices

# Conflicts:
#	BGL/test/BGL/test_Manifold_face_removal.cpp
2018-10-29 10:42:21 +01:00
Laurent Rineau 821f9c015e Merge pull request #3311 from sloriot/Doc-Pkg_link_name
Update the name of package names reference links
2018-10-29 10:27:53 +01:00
Laurent Rineau 2721f9a35b Merge pull request #3395 from sloriot/BGL-selection_issue
Fix selection issue with boundary vertices
2018-10-29 10:27:15 +01:00
Sébastien Loriot 915c3e7fec use a vector for dynamic properties of const Surface_mesh
also done for OpenMesh types
2018-10-25 17:05:21 +02:00
Sébastien Loriot 53a5bbbedc add named parameters to export error codes and nesting info 2018-10-19 23:05:13 +02:00
Sébastien Loriot 8c10366486 add named parameters for orientation and SI tests 2018-10-12 19:17:54 +02:00
Sébastien Loriot 8b6a2b8aef fix issue with boundary vertices 2018-10-11 14:30:49 +02:00
Sébastien Loriot eb8e5e5b35 change the Id in the base class + update pmaps to handle also pairs 2018-10-09 14:15:26 +02:00
Sébastien Loriot bfa9844b1a make default vpm of mesh convertible to default vpm of const mesh 2018-10-09 10:28:45 +02:00
Mael Rouxel-Labbé d18e21cfe7 Merge branch 'PMP-Filter_degenerate_polygon_soup_input-GF-old' into PMP-Filter_degenerate_polygon_soup_input-GF 2018-10-08 16:19:26 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Mael Rouxel-Labbé 1676cd7405 Merge branch 'repair_functions-old' into repair_functions 2018-09-17 15:10:39 +02:00
Laurent Rineau 3686015045 Merge pull request #3310 from sloriot/BGL_SMS-fix_link_condition
Handle the case of degenerate volumes in the link condition
2018-09-17 11:36:37 +02:00
Sébastien Loriot 376bc42716 update URL and use https 2018-09-04 13:29:51 +02:00
Sébastien Loriot e474d61fa7 handle the case of degenerate volumes in the link condition
a volume is degenerate if it consists only of twice the same face
with opposite orientation
2018-09-04 10:09:08 +02:00
Mael Rouxel-Labbé ab9b0479b3 Removed unnecessary 'do_' in named parameters 2018-08-17 15:32:26 +02:00
Mael Rouxel-Labbé 46bd7dc832 Merge branch 'PMP-Filter_degenerate_polygon_soup_input-GF-old' into PMP-Filter_degenerate_polygon_soup_input-GF 2018-08-03 09:34:15 +02:00
Mael Rouxel-Labbé 0aabaf3025 Added some functions to snap mesh borders onto another mesh 2018-08-01 08:44:30 +02:00
Mael Rouxel-Labbé 5a8d6c67e8 Merge branch 'repair_functions-old' into repair_functions 2018-07-30 15:53:37 +02:00
Mael Rouxel-Labbé 4e31832136 Added a function to detect and merge duplicate faces 2018-07-30 13:08:16 +02:00
Laurent Rineau f3b9d03ccf Merge pull request #3234 from sloriot/BGL-fix_copy_fg_with_garbage
Fix copy_face_graph with target mesh having garbage
2018-07-26 17:31:15 +02:00
Mael Rouxel-Labbé 16a9bc4d7c Fixed some links / concepts related to sgi.com and cppreference 2018-07-26 16:27:58 +02:00
Sébastien Loriot b0d012fe01 Merge pull request #3243 from sloriot/BGL-clear_fix
Fix CGAL::clear
2018-07-25 18:56:39 +02:00
Sébastien Loriot c8c1c11c9c Merge pull request #3234 from sloriot/BGL-fix_copy_fg_with_garbage
Fix copy_face_graph with target mesh having garbage
2018-07-25 18:55:26 +02:00
Mael Rouxel-Labbé 072b2376b8 Merge branch 'repair_functions-old' into repair_functions 2018-07-23 17:59:43 +02:00
Sébastien Loriot e5ec40abe9 use itself as next instead of null_halfedge
some models might call set_prev on null_halfedge
2018-07-19 18:23:01 +02:00
Sébastien Loriot 0561f62d43 simplify patch 2018-07-19 18:03:15 +02:00
Sébastien Loriot f0605c818c do not remove element you iterate on
+ as for std::vector, clear() does not always imply a change of capacity
2018-07-19 10:58:27 +02:00
Sébastien Loriot 869f1c01b0 init next pointer we rely on in the algorithm 2018-07-17 09:56:47 +02:00
Laurent Rineau 87715e3342 Merge pull request #3224 from sloriot/BGL-fix_getGT
Fix GetGeomTraits
2018-07-16 11:12:53 +02:00
Sébastien Loriot 080b2a70d1 we should also check whether a vertex point map was given as parameter 2018-07-11 16:52:36 +02:00
Konstantinos Katrioplas 032ee2828a named parameters for duplicate non-manifold vertices 2018-07-03 15:38:57 +02:00
Konstantinos Katrioplas 903df8106a corrections after the review 2018-07-03 15:37:20 +02:00
Maxime Gimeno e961746dd3 fix make_functor and doc. 2018-07-03 11:47:52 +02:00
Sébastien Loriot b66ffa3df1 fix merge issues 2018-07-02 10:37:57 +02:00
konstantinos katrioplas 9901ed78ef Merge branch 'master' into PMP-smoothing 2018-07-01 20:07:19 +03:00
Maxime Gimeno a584af827b Fix Conflicts 2018-06-29 18:21:24 +02:00
Laurent Rineau 2d9000efde Merge pull request #3111 from sloriot/PMP-coref_preserve_face_attributes
Add a visitor to track the creation of faces in corefinement functions
2018-06-28 16:09:37 +02:00
Laurent Rineau c68cf8fc4c Merge pull request #3129 from sgiraudot/Point_set_processing-Callbacks-GF
Point Set Processing: Callbacks
2018-06-27 10:21:40 +02:00
Laurent Rineau 0e4e50f2e7 Merge pull request #3060 from maxGimeno/BGL-read_write_off_use_np-GF
BGL: Use Named Parameters in OFF I/O
2018-06-27 10:21:33 +02:00
Laurent Rineau b44ad18983
Merge branch 'master' into PMP-stitch_after_orient-GF 2018-06-21 12:31:26 +02:00
Sébastien Loriot 0abfba8ac0 Update branch 'PMP-coref_preserve_face_attributes' from master@5ceb529d0f 2018-06-21 10:53:59 +02:00
Laurent Rineau b08fb6c4ed Merge pull request #3069 from sloriot/PMP-isotropic_remeshing_user_projection
Fix constrained edge map update and add user projection functor as input
2018-06-20 17:21:10 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Maxime Gimeno 158d292435 Add missing overload 2018-06-13 10:22:11 +02:00
Maxime Gimeno 1d4b1f9183 Merge master to solve conflicts 2018-06-13 09:48:07 +02:00
Sébastien Loriot e1e1512869 Merge 'PMP-isotropic_remeshing_user_projection' into PMP-isotropic_remeshing_user_projection 2018-06-06 18:00:32 +02:00
Konstantinos Katrioplas 60cbb2fc6a Merge remote-tracking branch 'cgal/master' into PMP-smoothing-kkatrio 2018-06-06 15:50:14 +02:00
Sébastien Loriot 6e1d9b2a3e clip_volumes -> clip_volume 2018-06-06 13:30:36 +02:00
Sébastien Loriot e26bee1a61 rename new_face_visitor -> visitor 2018-06-06 09:50:05 +02:00
Sébastien Loriot 7d69c199af the variable is name graph_visitor and not visitor (visitor is the function) 2018-06-06 09:37:14 +02:00
Simon Giraudot beb3408663 Add forward declarations and remove dependency to Solver_interface 2018-06-05 14:50:17 +02:00
Maxime Gimeno b18f5e5546 Fix warning. 2018-06-05 09:30:58 +02:00
Sébastien Loriot aecefd2e6d include_clipper_boundary -> use_compact_clipper 2018-06-04 15:20:31 +02:00
Maxime GIMENO 0517c35f59
Merge branch 'master' into BGL-Copy_face_graph_use_np-GF 2018-06-04 11:58:43 +02:00
Sébastien Loriot 2569c271e5 improve doc and plugin 2018-06-01 16:50:39 +02:00
Sébastien Loriot 94a73232d5 document clip functions 2018-06-01 11:06:29 +02:00
Sébastien Loriot 13cb7d250c make the function collapsing edges with constraints always keep the target 2018-05-29 16:17:41 +02:00
Sébastien Loriot 460f49d64f move code to swap edges in a function 2018-05-29 15:59:55 +02:00
Sébastien Loriot 1f1c97050b move code swapping vertices in an internal helper function 2018-05-29 15:59:55 +02:00
Sébastien Loriot acf969560d try improving phrasing 2018-05-29 15:59:54 +02:00
Maxime Gimeno 127b0c68d5 Fix doc 2018-05-29 15:59:54 +02:00
Maxime Gimeno 0b2436d062 Clean-up after review 2018-05-29 15:59:54 +02:00
Sébastien Loriot 4e580a6450 update documentation 2018-05-29 15:59:10 +02:00
Sébastien Loriot 0695f30c17 always preserve q at collapse by swapping p and q if q is of degree 2
the advantage is that we have an easy way to document which
halfedges are removed
2018-05-29 15:59:10 +02:00
Maxime Gimeno 5586622829 Update doc for edge_collapse 2018-05-29 15:59:10 +02:00
Maxime Gimeno f1724b3f4c Make collapse_edge always keep the target vertex. 2018-05-29 15:58:19 +02:00
Simon Giraudot 6daa40c4aa Add callback named parameter 2018-05-29 11:42:02 +02:00
Sébastien Loriot d3a9f655af replace bool parameter throw_on_self_intersection with a named parameter
used it at the same time in Boolean operation functions
2018-05-28 17:37:17 +02:00
Sébastien Loriot a207317cf5 add a parameter in corefinement functions to track the creation of new faces 2018-05-28 17:36:07 +02:00
Laurent Rineau 851dfabd29 Merge pull request #2757 from maxGimeno/BGL-Add_facegraph_validity_check_function-GF
BGL:  Add a  FaceGraph validity check function
2018-05-28 13:58:07 +02:00
Sébastien Loriot edf7527b3f simplify call 2018-05-17 13:42:42 +02:00
Maxime Gimeno 4b90bca4e3 Clean-up and fixes 2018-05-17 11:49:31 +02:00
Maxime Gimeno e0cf352319 Revert changes to Emptyset_iterator and modifies default map management to use a dummy functor instead 2018-05-17 10:50:23 +02:00
Maxime Gimeno cd6ffdc12a Add property maps for simplex mapping.
Also adds an operator()(const T&){} to Emptyset_iterator so it can be used by boost::function_output_iterator().
2018-05-17 10:49:58 +02:00
Maxime Gimeno 6623d3633f Clean-up and fixes 2018-05-17 10:49:58 +02:00
Maxime Gimeno 5fc0022d92 make copy_face_graph use NamedParameters 2018-05-17 10:49:58 +02:00
Sébastien Loriot e08c1cdc4d add an option to prevent the collapse of constrained edges 2018-05-15 12:21:05 +02:00
Sébastien Loriot 0c61d13e2f add missing include directive 2018-05-04 10:45:15 +02:00
Maxime Gimeno 861a6a16c5 Fixes 2018-05-03 12:49:34 +02:00
Maxime Gimeno 68de1819cf Move the code to the PMP functio nand document. 2018-05-03 12:49:34 +02:00
Maxime Gimeno d3c874bd83 Add some info about what a valid graph is. 2018-05-03 12:03:15 +02:00
Maxime Gimeno 4c309c4564 Fix doc 2018-05-03 12:03:15 +02:00
Maxime Gimeno a45ac9e470 Split is_valid_polygon_mesh into 3 : adding is_valid_halfedge_graph() and is_valid_face_graph() 2018-05-03 12:03:14 +02:00
Maxime Gimeno 9ec26cdccd WIP : Split is_valid_polygon_mesh into 3 functions. 2018-05-03 12:03:14 +02:00
Maxime Gimeno fd7def35c7 remove useless rule in doc 2018-05-03 12:03:14 +02:00
Maxime Gimeno 3d39a78838 typo 2018-05-03 12:03:14 +02:00
Maxime Gimeno c68c188286 Add definition of polygonmesh validity 2018-05-03 12:03:14 +02:00
Maxime Gimeno b1b8e71b44 Remove unused typedef 2018-05-03 12:03:14 +02:00
Maxime Gimeno 132cf694a0 remove is_valid() from the graph_traits 2018-05-03 12:03:14 +02:00
Maxime Gimeno 153bc0c76a Fixes 2018-05-03 12:03:14 +02:00
Maxime Gimeno 0cc59505b6 add some doc 2018-05-03 12:03:14 +02:00
Maxime Gimeno 6dfa8d0ba3 replace CGAL_is_valid(Mesh) by CGAL::is_valid_polygon_mesh(Mesh) 2018-05-03 12:03:14 +02:00
Sébastien Loriot 95d76709e8 isotropic remeshing can now use a user defined projection functor
you can pass it using a named parameter
2018-04-27 16:20:54 +02:00
Maxime Gimeno c4da8690cb Add NamedParameters to the off IO functions. 2018-04-26 14:00:06 +02:00
Laurent Rineau d57df10832 Merge pull request #2991 from afabri/BGL-fix_add_vertex_and_face_to_border-GF
Fix Euler::add_vertex_and_face_to_border()
2018-04-24 17:33:13 +02:00
Laurent Rineau 5d0858a379 Merge pull request #2991 from afabri/BGL-fix_add_vertex_and_face_to_border-GF
Fix Euler::add_vertex_and_face_to_border()
2018-04-24 17:31:47 +02:00
Laurent Rineau 77e461d1f6 Merge pull request #2976 from maxGimeno/BGL-Fix_make_icosahedron-GF
BGL: fix orientation of make_icosahedron()
2018-04-06 17:23:58 +02:00