Commit Graph

1488 Commits

Author SHA1 Message Date
Sebastien Loriot f497bd4f33
Merge pull request #4558 from sloriot/BGL-Euler_add_faces
Add CGAL::Euler::add_faces()
2020-04-16 16:21:51 +02:00
Mael Rouxel-Labbé 48bd92b4dd Proof read all NP changes 2020-04-13 13:03:05 +02:00
Sébastien Loriot 2dd06eb296 add overload for point 2020-04-13 10:44:26 +02:00
Sébastien Loriot 38d1745db2 Get back to the small_vector version that is faster in the end 2020-04-13 09:57:25 +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
Andreas Fabri d5cf4c504e Call target() so that we do not need a vertex as key 2020-04-10 13:55:40 +01:00
Andreas Fabri a79c6720c7 trivalize data structure 2020-04-10 12:20:08 +01:00
Andreas Fabri e496af793e Use a full map 2020-04-09 20:08:44 +01:00
Andreas Fabri b7744674d1 Use the Small_unordered_mapV2 in add_faces 2020-04-09 14:48:12 +01:00
Simon Giraudot d3e9b3b56b Fix outdated variable name 2020-04-08 14:24:51 +02:00
Sébastien Loriot 76bc8b6b32 remove trailing whitespace 2020-04-07 11:24:05 +02:00
Simon Giraudot 06de83628c Fix missing inclusion 2020-04-07 08:57:59 +02:00
Mael Rouxel-Labbé 80f6f659f3 Update to new named parameters macros 2020-04-05 17:56:50 +02:00
Mael Rouxel-Labbé a1b0abfb08 Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-04-04 15:40:38 +02:00
Andreas Fabri 1f2caf4971 Use a boost::containersmall_vector 2020-04-03 14:03:43 +01:00
Maxime Gimeno a40605fbbf WIP ply BGL reader 2020-04-03 14:55:38 +02:00
Mael 970119b2c2
Remove unused typedefs 2020-04-03 09:13:59 +02:00
Mael 84bcb8ac05
Merge branch 'master' into PMP-Regularize_selection_borders-GF 2020-04-03 09:11:52 +02:00
Simon Giraudot abc0a578c3 Fix unused typedef 2020-04-02 15:33:06 +02:00
Sébastien Loriot 8795725dba fix no link issue 2020-04-02 15:25:32 +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 bb95599ae2 Remove trailing whitespace 2020-04-02 13:45:25 +02:00
Simon Giraudot 238d5e7c54 Update from latest remarks 2020-04-02 13:45:03 +02:00
Simon Giraudot f64d2c4585 Add missing geom_trait parameters 2020-04-02 13:45:03 +02:00
Sébastien Loriot dba7c3eb73 extra run of the script to remove tabs and trailing whitespaces 2020-04-02 13:45:03 +02:00
Simon Giraudot 3b8c8f200e Fix capitalization 2020-04-02 13:45:03 +02:00
Simon Giraudot 7792514a32 Fix missing word 2020-04-02 13:45:02 +02:00
Simon Giraudot 06999247de Fix typo 2020-04-02 13:45:02 +02:00
Simon Giraudot c1259c8408 Fix facets -> faces 2020-04-02 13:45:02 +02:00
Simon Giraudot abae12955b Fix type 2020-04-02 13:45:01 +02:00
Simon Giraudot eba52f2a70 Finalize doc 2020-04-02 13:45:01 +02:00
Simon Giraudot c2a7dd51f3 Use named parameters 2020-04-02 13:45:01 +02:00
Simon Giraudot 5afc4bbc59 Update with new alpha expansion API 2020-04-02 13:45:01 +02:00
Simon Giraudot 86d5788480 Improve vertex label map 2020-04-02 13:45:01 +02:00
Simon Giraudot 80a4b95f01 Use identity face map 2020-04-02 13:45:01 +02:00
Simon Giraudot bdbd360490 Change weights normalization if deselection is not prevented 2020-04-02 13:45:01 +02:00
Simon Giraudot dc54b326f4 Separate regularization functions 2020-04-02 13:45:01 +02:00
Simon Giraudot 1c5bc70b7b Start working on public API for alpha expansion 2020-04-02 13:45:00 +02:00
Simon Giraudot 461bb19e2d Use BGL API in regularize_selection 2020-04-02 13:45:00 +02:00
Simon Giraudot 6b79764dbb Add alternative algorithm for regularization using local minimization 2020-04-02 13:45:00 +02:00
Simon Giraudot f64702e640 Make API weight between 0 and 1 2020-04-02 13:45:00 +02:00
Simon Giraudot 8bcbc8ea5e Remove useless parameter 2020-04-02 13:45:00 +02:00
Simon Giraudot 67ac0d80b1 Normalize weights 2020-04-02 13:45:00 +02:00
Simon Giraudot d505837264 First version of selection regularization via graphcut 2020-04-02 13:45:00 +02:00
Simon Giraudot 8089907795 Remove trailing whitespace 2020-04-02 13:44:17 +02:00
Jane Tournois dca97faad6 Merge remote-tracking branch 'cgal/master' into Tetrahedral_remeshing-new-jtournois 2020-04-01 12:25:59 +01:00
Jane Tournois e0171c2f24 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-01 07:07:46 +01:00
Sébastien Loriot fa163a5be1 remove unused type 2020-03-31 09:11:12 +02:00
Simon Giraudot 3350f9d05e Fix warnings 2020-03-30 08:10:23 +02:00
Mael Rouxel-Labbé e7d52999a8 Update PMP NPs to new macros 2020-03-29 17:16:50 +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 620dfa40fc extra run of the script to remove tabs and trailing whitespaces 2020-03-27 08:37:32 +01:00
Sébastien Loriot ba42fcb6ca Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:36:40 +01:00
Sébastien Loriot 1cfd991f4b extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:34:32 +01:00
Sébastien Loriot df0e632c65 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:34:12 +01:00
Sébastien Loriot 9f2eafd06e extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:17:02 +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 92f5f0242e Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:04:33 +01:00
Sébastien Loriot 47027d6f5b extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:59:19 +01:00
Sébastien Loriot 4421fff65f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:50 +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
Simon Giraudot 1c3176468e Use real tags to select implementation 2020-03-26 11:08:12 +01:00
Simon Giraudot 522a8b2e49 Fix implementation getter 2020-03-25 16:17:01 +01:00
Simon Giraudot c4597c74a1 Fix unused arg warning 2020-03-25 15:13:36 +01:00
Simon Giraudot b77e138438 Fix capitalization 2020-03-24 16:30:01 +01:00
Simon Giraudot 6ffc79eca6 Fix comparison warning 2020-03-24 16:09:00 +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
Sébastien Loriot 13f19889c3 doc 2020-03-24 11:03:17 +01:00
Sébastien Loriot bd3f47c16e fix 3 args put for open mesh 2020-03-24 11:02:57 +01:00
Sébastien Loriot 179c89803b use default initialzed vertex index map
there is no named param in Euler so do not introduce it here
2020-03-24 10:48:54 +01:00
Mael Rouxel-Labbé 9cfe453995 Tiny indentation fix 2020-03-24 10:25:16 +01:00
Simon Giraudot d303a1cd2b Fix mismatch class/struct declaration 2020-03-24 10:06:54 +01:00
Sébastien Loriot b79422c140 tm -> pm 2020-03-24 09:26:30 +01:00
Sébastien Loriot 3171d23804 handle hand fans attached to non-manifold vertices affected by the insertion of faces 2020-03-24 09:18:47 +01:00
Mael Rouxel-Labbé 8a8b5e3765 Fix assuming a descriptor range is a range
Concepts (BGL's and CGAL's) say it's an iterator pair
2020-03-24 08:35:23 +01:00
Mael Rouxel-Labbé 6b67e0b350 Use the new API for initialized index maps 2020-03-24 08:34:41 +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 0212619875 fix special case when a patch is appended 2020-03-23 07:16:28 +01:00
Sébastien Loriot 397601460e add first version of function add_faces 2020-03-23 07:16:28 +01:00
Sébastien Loriot 400ca78690 restrict properties for Dual
I totally removed the generic put as I don't see any
generic usage
2020-03-20 15:43:01 +01:00
Sébastien Loriot 437dec193e fix ambiguity 2020-03-20 15:42:48 +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
Maxime Gimeno 0f56294ebc fix read_PLY and add a test to bgl for the ply writing 2020-03-18 17:29:02 +01:00
Maxime Gimeno 340623febd Clean-up 2020-03-18 16:30:25 +01:00
Maxime Gimeno 82bee3fd55 Add some doc for the PLY_writer 2020-03-18 16:07:24 +01:00
Maxime Gimeno f3dfd786e5 remove the UV parts of the BGL write_PLY and add NPs for the vpm and vimap. Missing doc. Also fix the STL_ASCII reader. 2020-03-18 15:52:15 +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
Mael Rouxel-Labbé 618a72b739 Merge remote-tracking branch 'cgal/master' into PMP-soup_to_mesh_add_vpm 2020-03-17 20:00:31 +01:00
Sebastien Loriot 1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno
PMP: Default Property_maps for Index_maps
2020-03-17 18:27:55 +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é 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
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