Commit Graph

876 Commits

Author SHA1 Message Date
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +01:00
Sébastien Loriot 262a04cef2 remove useless POLICY setting 2021-11-09 10:19:14 +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 f581ff74d3 Merge pull request #5427 from sloriot/CGAL_data-moving_files
Regroup data: moving files

# Conflicts:
#	Nef_3/archive/triangulation/include/CGAL/partition_is_valid_2.h
2021-10-07 14:44:01 +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
Sébastien Loriot 1857a25d28 Merge remote-tracking branch 'cgal/master' into CGAL_data-moving_files 2021-10-06 13:50:31 +02:00
Sébastien Loriot efbd86df7f extra manual fixes 2021-10-05 17:42:21 +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
Sébastien Loriot b5e7d03634 fix runtime issues 2021-10-04 10:22:13 +02:00
Sébastien Loriot 80c2615b38 handle .off in headers 2021-10-04 10:08:24 +02:00
Sébastien Loriot 8350dea94a char* -> std::string 2021-10-04 09:49:24 +02:00
Sébastien Loriot 47028cd184 automatically move data files in data dir + update paths
Done for OFF/OBJ/STL/XYZ/PWN/PLY
2021-10-04 09:42:49 +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 aea6cf8a9c fixes after incorrectly handled merge 2021-09-23 18:56:10 +02:00
Sébastien Loriot bd345c7f83 remove .cmd files for examples 2021-09-23 18:54:46 +02:00
Sebastien Loriot 4610cf3c66
Merge pull request #5904 from sloriot/CGAL-remove_config_flags
Replace macros with inline functions and remove a config flag
2021-09-10 17:38:50 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +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 49e720068f update to valid format 2021-07-30 10:14:38 +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
Andreas Fabri 526aec740c Fix #5755 2021-06-04 14:05:00 +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 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +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
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Maxime Gimeno 17602e589e Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF 2021-04-07 09:17:51 +02:00
Timo Koch af81a6e1e5
[cleanup][surface_mesh] Fix include order from local to global 2021-03-31 12:16:46 +02:00
Timo Koch 94f969149d
[cleanup][surface_mesh] Remove unused and duplicate includes
The includes became unnecessary after a735e84.
2021-03-31 10:50:05 +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
Maxime Gimeno d5811d0a41 clang-tidy on tests 2021-02-18 15:15:12 +01:00
Laurent Rineau a735e849c0 Merge pull request #5152 from sloriot/CGAL-remove_bind
Replace usages of boost::bind
2021-02-05 16:14:04 +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 99225a9a33 Merge pull request #5414 from maxGimeno/Doc-Fix_qt5_example-maxGimeno
Documentation: Re-add missing CMakeLists
2021-02-05 16:09:56 +01:00
Laurent Rineau 7e2ee4946d Merge pull request #5152 from sloriot/CGAL-remove_bind
Replace usages of boost::bind
2021-02-05 16:07:34 +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 4271f6e19c Restore the CMakelist.txt in the Minimal Example Using Qt5 2021-02-01 09:21:29 +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
Maxime Gimeno 78a13fbd03 add missing test file 2021-01-20 09:53:35 +01:00
Maxime Gimeno f7b19a5597 Merge branch 'IO_test_deprecated-maxGimeno' into CGAL-fix_CGAL_IO-GF 2021-01-20 09:53:21 +01:00
Maxime Gimeno 54db0c04d1 FInish 2021-01-20 09:51:56 +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 5948bc846e Try to remove Filtered_kernel from the dependencies of BGL 2021-01-11 14:11:30 +01:00
Maxime Gimeno 5d2ad68148 Add new Dependences. ATTENTION BGL is propagated through the NPs in Stream_support 2021-01-08 15:58:46 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +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
Sébastien Loriot 4a27ff5bf6 remove bind in Surface_mesh 2021-01-06 12:59:12 +01:00
Maxime Gimeno 1f9b3bca94 remove unused variables 2020-12-15 15:44:28 +01:00
Maxime Gimeno af8481a84e Remove assertions about addresses that must be different, because if memory is reused they may fail. 2020-12-14 10:04:33 +01:00
Maxime Gimeno 00edae2400 More fixes 2020-12-10 12:55:04 +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
Maxime Gimeno 1c00bf6847 Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-29 15:09:16 +01:00
Maxime Gimeno 2ad4c16b6e Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-26 15:00:53 +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
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +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 80e6d60e0b fix links 2020-10-15 11:59:01 +02:00
Sébastien Loriot a159fb38c5 update user manual 2020-10-15 11:43:55 +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é bc3b6eaeb7 Leftover from c9af7a17c9
Remove obsolete CGAL_UNUSED after BOOST_CONCEPT_ASSERTIONS
2020-10-14 11:05:12 +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
Sebastien Loriot 7652091b9c
Merge pull request #4931 from sloriot/CGAL-cosmetic_cleanup
Cosmetic cleaning
2020-10-02 15:15:31 +02:00
Mael Rouxel-Labbé 4694a48913 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-09-22 11:35:25 +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 b03fa54299 add a convenience header file to inherit from face graphs 2020-08-19 14:29:09 +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
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +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é 3280b9b087 Use new IO functions 2020-06-26 17:06:42 +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
Mael Rouxel-Labbé d5d8cca92b Various IO compilation fixes 2020-06-25 12:02:01 +02:00
Mael Rouxel-Labbé 6d6dc0c956 Fix a number of compilation issues 2020-06-24 17:41:20 +02:00
Mael Rouxel-Labbé 9cca59ba36 Actually use the new IO functions + some example improvements 2020-06-23 18:24:39 +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é 28b50b0c5d General IO doc improvements 2020-06-22 13:45:29 +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