Commit Graph

719 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé b597aa8aab Add is_valid_*_descriptor() overloads for Surface_mesh 2022-10-04 22:19:35 +02:00
Sven Oesau 80eb8601e6
Merge branch 'CGAL:master' into Region_growing-revision-soesau 2022-09-02 16:42:41 +02:00
Sébastien Loriot d729450b00 add missing commas 2022-08-05 13:42:39 +02:00
Sébastien Loriot cc9f183164 fix typedef 2022-08-05 13:42:15 +02:00
Sébastien Loriot 684f48e14c const_cast is useless 2022-08-05 13:41:39 +02:00
Sébastien Loriot d95d834af1 Surface_mesh iterator should not return a reference 2022-08-05 13:40:28 +02:00
Sébastien Loriot 861588abe1 Merge 'sloriot/CGAL-std_type_traits' into master 2022-08-03 20:19:51 +02:00
Sven Oesau 5be7fd53fb removing unused parameters 2022-07-19 14:35:27 +02:00
Sébastien Loriot ff8a28731b unsued variable 2022-06-29 13:10:41 +02:00
Sébastien Loriot 25cacd2237 remove unused typedef 2022-06-29 09:24:22 +02:00
Sven Oesau 7c29cd42ad added missing typename 2022-06-28 09:04:32 +02:00
Sven Oesau 37eb6a5118 fixed saving of face colors using property maps from named parameters 2022-06-28 08:45:31 +02:00
Sébastien Loriot aa9f5215c4 factorize 2022-06-24 17:21:37 +02:00
Sébastien Loriot c9c6b30cf0 Merge sloriot/CGAL-std_type_traits into master 2022-06-23 16:35:37 +02:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Andreas Fabri 06e5884b9c Add documentation 2022-05-24 15:00:02 +01:00
Sebastien Loriot b9fabbe116
Merge pull request #6550 from afabri/BGL-adjacency_iterator-GF
BGL: Add adjacency_iterator for several classes
2022-05-13 15:51:44 +02:00
Niklas Hambüchen 59d70a5018 PLY: Support writing per-face/vertex property lists 2022-05-12 12:51:42 +02:00
Laurent Rineau 6da27847c5 Merge pull request #6495 from afabri/Surface_mesh-move-GF
Surface_mesh: Add move semantics
2022-05-06 14:22:06 +02:00
Andreas Fabri fd20beeef7 Use vertices_around_target() 2022-05-03 15:09:05 +01:00
Andreas Fabri abb54bf0b8 BGL: Add adjacency_iterator for several classes 2022-05-03 14:02:21 +01:00
Laurent Rineau 3072b93942 After review 2022-04-23 16:11:18 +02:00
Laurent Rineau df43db067a Use std::move instead of std::forward 2022-04-20 17:09:35 +02:00
Laurent Rineau 090c61c6b7 Swap capacity_ as well 2022-04-20 17:08:05 +02:00
Laurent Rineau 9e964b0797 Simplify constructors with default member initializers 2022-04-20 17:03:31 +02:00
Mael Rouxel-Labbé 477353d5eb Merge parameters::Is_default and parameters::is_default_parameter 2022-04-20 16:01:02 +02:00
Andreas Fabri 5098cad841 Test the move semantics 2022-04-19 16:52:18 +01:00
Sébastien Loriot 514e4de9b7 add no-move copy 2022-04-19 07:18:31 +02:00
Sébastien Loriot 92f7344f3c fix syntax errors 2022-04-18 20:55:56 +02:00
Andreas Fabri 13f00211d3 Surface_mesh: Add move semantics 2022-04-18 16:34:14 +01:00
Sébastien Loriot 07e917ca09 Merge remote-tracking branch 'MaelRL/PMP-Improve_SI_repair-GF' into HEAD 2022-01-18 09:18:20 +01:00
Sébastien Loriot 10b0af3092 rename macro since Named_function_parameter is part of STL_Extension 2022-01-13 14:43:34 +01:00
Sébastien Loriot 4fa826b3ed keep only the static version of is_default_parameter 2022-01-10 18:36:37 +01:00
Sébastien Loriot 75b03e6c0a use_default_values() -> default_values() 2022-01-10 18:36:37 +01:00
Sébastien Loriot 6d3176e061 move Named_parameters class in STL_extension
helpers stay in BGL because it depends on BGL tags
2022-01-07 15:12:22 +01:00
Sébastien Loriot 54d09a788b fix value 2022-01-07 14:10:23 +01:00
Sébastien Loriot c78dfa3d61 restore too agressive removal 2022-01-07 10:18:12 +01:00
Sébastien Loriot e7dcb31417 replaces overloads with default parameters (Surface_mesh/IO) 2022-01-06 15:11:32 +01:00
Sébastien Loriot a6d9b99466 move macros in BaseDoxyfile 2022-01-04 11:10:09 +01:00
Mael Rouxel-Labbé 515b97d905 Also check the validity of the index in Surface_mesh::is_valid(Element) 2021-12-14 10:42:49 +01:00
Guillaume Damiand 2bbcabe71b The size of argv array is now 2, ending with nullptr. 2021-11-11 17:23:37 +01:00
Guillaume Damiand ee11c858b5 The size of argv array is changed to 1 in all basic viewers. 2021-11-10 09:59:48 +01:00
Sébastien Loriot 07421357a7 fix phrasing 2021-11-02 11:52:53 +01:00
Sébastien Loriot 08b1457649 add CGAL::CGAL_Basic_viewer target 2021-11-01 11:07:55 +01:00
Mael Rouxel-Labbé 8166579e55 Merge branch 'PM-Fix_pmaps_reference_types-GF' into PM-Fix_pmaps_reference_types_master-GF 2021-10-11 19:58:07 +02:00
Mael Rouxel-Labbé 590ddf8015 Various fixes for pmaps:
- Use `value_type` when the returned type is not a reference
- Enforce `reference = value_type` if the returned type is not
  a reference (to avoid `typename PM::reference r = get(m, k)`,
  which will take a ref to a temporary if the `reference`
  typedef is an actualy reference)
- Do not use `put_get_helper` if the property map is not a `lvalue`
  **mutable** property map: the `put()` is `map[k] = v`, which
  is broken if `operator[]` does not return a reference
- The concept `boost::lvalue_property_map_tag` requires `operator[](key)`,
  not a reference in `get(map, key)`. You can have a readable property map
  returning a reference through its `get(map, key)`, but if there is
  no `operator[]`, it's just a `boost::readable_property_map_tag`
- Some const correctness to avoid copying maps with state
  or heavy keys in `get(map, key)` / `put(map, key, value)`
- Base the category of a wrapping pmap on what it offers instead
  of just forwarding the base property map's category
- Tried to do something like mutable lvalue pmap:
  * `value_type& operator[](key&)`
  * `ref get(map, const key&)`
  * `put(map, const key&, const value_type&)`
  and non-mutable lvalue pmap:
  * `const value_type& operator[](const key&)`
  * `ref get(map, const key&)`
  but not everything fits properly...
2021-10-08 15:38:47 +02:00
Mael Rouxel-Labbé df560987a6 Whitespace & cleaning changes 2021-10-08 12:13:43 +02:00
Laurent Rineau fb9333f0d0 Merge pull request #6028 from MaelRL/CGAL-Fix_typos-GF
Fix typos
2021-10-07 14:27:21 +02:00
Laurent Rineau 94ee9b1613 Merge pull request #6030 from MaelRL/CGAL-Minor_fixes-GF
Fix uninitialized id maps in heat method
2021-10-07 14:27:16 +02:00
Mael Rouxel-Labbé 863ab7541c Various whitespace fixes 2021-10-05 12:14:03 +02:00
Mael Rouxel-Labbé 625848e629 Fix missing ':' in various namespaces 2021-10-04 13:21:47 +02:00
Laurent Rineau ad79d37410 Merge pull request #6014 from MaelRL/CGAL-IO_Clarify_binary_text-GF
CGAL IO: Clarify binary warning
2021-09-29 11:46:30 +02:00
Mael Rouxel-Labbé c8cc0747fa Clarify binary warning 2021-09-27 15:33:42 +02:00
Sébastien Loriot a88a84b0f4 remove some cpp0x and cpp11 config macros 2021-08-13 15:46:50 +02:00
Sébastien Loriot 814c9138ef Merge remote-tracking branch 'cgal/5.3.x-branch' 2021-08-12 10:38:11 +02:00
Sebastien Loriot c25c7c4668
Merge pull request #5882 from sloriot/Data-Ply_edge_prop
Update PLY files to valid format
2021-08-12 10:24:32 +02:00
Sébastien Loriot cff3cdb40e Merge remote-tracking branch 'cgal/5.2.x-branch' into HEAD 2021-08-12 10:23:57 +02:00
Sébastien Loriot 8123a841f2 update to valid format 2021-07-30 10:16:58 +02:00
Sébastien Loriot 65f3803bab compatibility for files written with the old code 2021-07-30 10:13:26 +02:00
Dan Bumbarger 149b5af81f Update PLY.h
Aligned Edge property to PLY standard
2021-07-30 10:11:52 +02:00
Mael Rouxel-Labbé 78ff9185b3 Harmonize ASCII usage across all packages 2021-06-23 23:34:32 +02:00
Mael Rouxel-Labbé a34debc92b Uniformize os/is/s/i stream parameter name in Stream_support/io
+ remove extra backticks in NP doc
2021-06-23 23:32:06 +02:00
Laurent Rineau d6b2c8d9dc Merge pull request #5671 from maxGimeno/CGAL_IO-Add_missing-deprecated_functions-maxGimeno
CGAL_IO: Add missing fallbacks

# Conflicts:
#	BGL/include/CGAL/boost/graph/IO/INP.h
#	Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
2021-05-18 18:13:38 +02:00
Maxime Gimeno cf69d32269 add missing const in read_OFF 2021-05-12 11:40:20 +02:00
Maxime Gimeno 9acf3d4b19 Add missing fallbacks for IO functions and result_of 2021-05-07 12:50:51 +02:00
Maxime Gimeno 23be65772d remove useless overload 2021-05-06 12:32:45 +02:00
Maxime Gimeno cd7b635abd Also Fix Surface_mesh 2021-05-06 10:53:58 +02:00
Sébastien Loriot 56025fb5f9 fix release number of depreciation 2021-05-04 14:38:47 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Laurent Rineau a72fdb7b3c Merge pull request #5352 from lrineau/CGAL-fix_CGAL_IO-GF
Fixes after the PR "CGAL I/O
2021-02-18 15:23:43 +01:00
Laurent Rineau c5ba414c72 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:12:42 +01:00
Laurent Rineau b134ed8246 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:07:32 +01:00
Maxime Gimeno 2dac31f36f Clean-up and fix doc 2021-02-05 14:14:11 +01:00
Maxime Gimeno 7bf9c14f72 Factorization 2021-01-28 10:01:52 +01:00
Maxime Gimeno 41c823c083 replace default value of stream precision 2021-01-27 15:44:02 +01:00
Maxime Gimeno a85cf6ed52 Move the include in the ifdef 2021-01-26 09:45:18 +01:00
Laurent Rineau 27deb7ce2d Fix a typo from a copy-paste in deprecated `write_PLY` 2021-01-14 16:27:56 +01:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 2a212bb2a8 Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples 2021-01-07 13:06:40 +01:00
Maxime Gimeno 7cfb944afb Fixes 2020-11-19 12:11:51 +01:00
Maxime Gimeno c4e488ac14 fix unused vpm 2020-11-18 10:26:57 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Sébastien Loriot 88967b928d really clear the mesh 2020-10-21 10:51:12 +02:00
Sébastien Loriot 5a6333f014 Merge remote-tracking branch 'cgal/master' 2020-10-20 13:42:46 +02:00
Laurent Rineau 216d066285 Merge remote-tracking branch 'cgal/master' into Surface_mesh_reuse_garbage-GF 2020-10-16 14:01:58 +02:00
Sébastien Loriot 254500a4f7 typo 2020-10-15 11:31:49 +02:00
Sébastien Loriot 2cabe688e3 do not remove and readd permanent property maps 2020-10-14 18:03:17 +02:00
Sébastien Loriot e116cb5d46 rename function 2020-10-14 18:03:17 +02:00
Sébastien Loriot 7d48af6689 split clear(bool) in clear() and remove_all_simplices() 2020-10-14 18:03:17 +02:00
Sébastien Loriot b132ba82c9 add an option to not remove properties after clear() 2020-10-14 18:03:17 +02:00
Mael Rouxel-Labbé 0583a4862e Add precision support to Geomview streams 2020-10-14 15:32:27 +02:00
Mael Rouxel-Labbé 6e34fa93ef Fix extra '!' breaking logic in OFF writing 2020-10-13 18:13:33 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Maxime Gimeno 43a49605e0 Fix conflicts 2020-10-05 13:20:40 +02:00
Sébastien Loriot 4e0fc267af Merge pull request #4715 from afabri/BGL-test_face-GF
BGL: Add a function to check if add_face() can be called successfully
2020-10-02 15:24:45 +02:00
Sebastien Loriot 10ba34719e
Merge pull request #4728 from sloriot/PMP-cc_cleanup
Clean in connected components
2020-10-02 15:20:53 +02:00
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Sébastien Loriot e893ac1178 cosmetic changes 2020-08-18 10:06:51 +02:00
Mael Rouxel-Labbé c14198a992 IO doc fixes 2020-08-04 17:55:21 +02:00
Mael Rouxel-Labbé 00ca0211e1 IO documentation fixes 2020-08-04 15:47:56 +02:00
Mael Rouxel-Labbé 1d016ecc7e IO doc fixes 2020-07-28 15:38:19 +02:00
Laurent Rineau fc37d4ce5d Remove unneeded #include
@sloriot was right, in
https://github.com/CGAL/cgal/pull/4876#discussion_r461545678.
2020-07-28 15:03:39 +02:00
Mael Rouxel-Labbé 0d66e19361 IO documentation fixes
See @sloriot's review:

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polgyon_soup_mesh_IO/2nd_round/Answer_to_review

(+ some commits before and after this one)
2020-07-24 17:06:00 +02:00
Laurent Rineau 6ebe6d6845 <CGAL/draw_face_graph.h>
That factorizes the code for the `draw()` function for `Polyhedron_3`
and `Surface_mesh`.
2020-07-24 13:09:53 +02:00
Mael Rouxel-Labbé 6b9ab6ec4d Some more Polygon > Triangle in 3MF I/O 2020-07-24 11:35:18 +02:00
Laurent Rineau 6991fd1a01 Use Polygon_mesh_processing/compute_normal.h and property maps
That simplifies the code and speeds up the function
`compute_elements()`.
2020-07-24 10:49:43 +02:00
Laurent Rineau b5dff8d390 Rework SimpleSurfaceMeshViewerQt
- no longer a template, using `std::function` for the type erasure,
- one can use lambdas for `ColorFunctor`.
2020-07-24 10:27:26 +02:00
Mael Rouxel-Labbé 2f0f61e104 Rephrase warning about std::ios::binary + add missing (LAS - always binary) 2020-07-24 09:40:13 +02:00
Mael Rouxel-Labbé f5aff314cb Misc tiny doc fixes 2020-07-21 11:44:40 +02:00
Mael Rouxel-Labbé 69068ba28c Some more binary/ASCII fixes 2020-07-21 11:44:18 +02:00
Mael Rouxel-Labbé b08e1e0d8c Hide CGAL_DEPRECATED from the doc 2020-07-20 09:57:47 +02:00
Mael Rouxel-Labbé f3659c5d96 Switch 3MF to bool return type and clarify \return doc for IO functions 2020-07-17 13:19:18 +02:00
Mael Rouxel-Labbé f416d431ac Actually include headers with I/O function overloads for CGAL::Surface_mesh... 2020-07-17 11:57:27 +02:00
Andreas Fabri 478468135b Also fix copy coonstructor, assignment, and clear() 2020-07-16 14:41:41 +01:00
Andreas Fabri c98a7c38c4 Initialize variable (thank you Maxime) 2020-07-16 13:53:38 +01:00
Andreas Fabri bf951a1f95 Merge remote-tracking branch 'cgal/master' into Surface_mesh_reuse_garbage-GF 2020-07-15 11:19:38 +01:00
Andreas Fabri a635c9425d Merge remote-tracking branch 'cgal/master' into BGL-test_face-GF 2020-07-15 11:13:09 +01:00
Mael Rouxel-Labbé 4231bc8a83 Misc I/O doc enhancements 2020-07-13 14:17:50 +02:00
Laurent Rineau b3225cd75a Merge pull request #4807 from afabri/Surface_mesh-typo-GF
Surface_mesh doc typo: ede -> edge
2020-07-03 16:21:29 +02:00
Mael Rouxel-Labbé ae4c2aaa9e IO doc fixes 2020-06-26 16:08:02 +02:00
Mael Rouxel-Labbé 594eb97a22 Doc improvements 2020-06-25 21:01:04 +02:00
Mael Rouxel-Labbé 26355e2e32 Uniformize capital / third person usage of \brief 2020-06-25 15:13:47 +02:00
Andreas Fabri fa1c724843 Surface_mesh doc typo: ede -> edge 2020-06-23 12:55:31 +01:00
Mael Rouxel-Labbé 239b01a546 Fix deprecation within Surface_mesh IO 2020-06-23 12:53:03 +02:00
Mael Rouxel-Labbé 34ddacd5e7 Misc minor fixes 2020-06-23 11:56:12 +02:00
Mael Rouxel-Labbé 9397f1c8de All kinds of fixes to Surface_mesh IO + doc 2020-06-22 18:36:11 +02:00
Mael Rouxel-Labbé 0ae0bd74d6 Fix missing / wrong header includes 2020-06-22 13:47:16 +02:00
Mael Rouxel-Labbé e1e2428abe Fix missing _H in guard + missing license include 2020-06-22 13:42:39 +02:00
Mael Rouxel-Labbé 0f3f5887b1 3mf.h -> 3MF.h 2020-06-22 12:05:50 +02:00
Mael Rouxel-Labbé 52d50f7d79 Doc improvements 2020-06-21 13:30:53 +02:00
Mael Rouxel-Labbé 2d49f7d702 Countless IO fixes...
Don't have the patience to split it nicely
2020-06-21 12:03:28 +02:00
Mael Rouxel-Labbé 1d85d190c6 Misc doc fixes 2020-06-18 19:48:12 +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 63c554fb7d fix OFF surface_mesh reading 2020-06-08 16:19:18 +02:00
Maxime Gimeno 6a466dd6b5 fix OFF I/O 2020-06-05 15:40:13 +02:00
Andreas Fabri cc8b06ae7e Add missing const 2020-06-02 08:12:16 +01:00
Mael Rouxel-Labbé fdd823bd4b Fix value_type of normal/texture property maps 2020-05-28 13:03:38 +02:00
Mael Rouxel-Labbé 45e067e4ec Fix doxygen output 2020-05-28 10:59:19 +02:00
Mael Rouxel-Labbé 580a1efd5c Remove trailing whitespace / tabs 2020-05-22 15:31:50 +02:00
Andreas Fabri 58f56f5a68 remove trailing whitespace 2020-05-22 07:54:19 +01:00
Andreas Fabri fa15259dd3
Update Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-05-21 16:47:28 +02:00
Andreas Fabri 5c1553dd1b
Update Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-05-21 16:47:12 +02:00
Maxime Gimeno 380e7c579e Update doc and CHANGES.MD 2020-05-18 12:25:28 +02:00
Maxime Gimeno 9af250625b clear() actually removes the property_maps 2020-05-18 12:21:47 +02:00
Sébastien Loriot fbd9628307 add a static bool map and use it when possible
also remove Static_property_map that is a duplicate of Constant_property_map
2020-05-15 18:27:33 +02:00
Maxime Gimeno 4e4465508c Fix doc 2020-05-14 15:05:48 +02:00
Maxime Gimeno 30dcc81a61 fixes for soup I/O 2020-05-07 14:26:31 +02:00
Maxime Gimeno 6fded55da3 Merge remote-tracking branch 'mine/Surface_mesh-Clear_removes_the_maps-maxGimeno' into CGAL_IO-maxGimeno 2020-05-07 11:28:49 +02:00