Commit Graph

719 Commits

Author SHA1 Message Date
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
Maxime Gimeno ecb936bd02 clear() actually removes the property_maps 2020-05-06 17:02:32 +02:00
Maxime Gimeno bc360bcfd3 WIP. Remove read_pm for streams. 2020-05-06 16:52:24 +02:00
Maxime Gimeno 7c8dcbfd47 verbose in readers. 2020-05-06 12:57:08 +02:00
Maxime Gimeno 3a9b501612 WIP fixing doc 2020-05-04 16:56:03 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Andreas Fabri 59684695a1 (add-hook 'before-save-hook 'delete-trailing-whitespace) 2020-04-30 07:55:18 +01:00
Andreas Fabri 5f147881a4 Surface_mesh: Add the functionality to switch garbage recycling off 2020-04-29 17:38:58 +01:00
Sebastien Loriot fea3a179bf
Merge pull request #4505 from sgiraudot/Tutorials-GIS-GF
[Small Feature] GIS Tutorial
2020-04-29 15:15:55 +02:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno 50766d9d03 Fixes for min/max 2020-04-21 11:52:56 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Simon Giraudot 9e2ce819f0 Merge remote-tracking branch 'mine/Tutorials-GIS-GF' into Tutorials-GIS-GF 2020-04-07 10:15:50 +02: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 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 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Laurent Rineau 2f4e49bfff Fix forward-declarations of CGAL::Surface_mesh
In the forward-declaration, the template parameters do not matter, but
they do if the code is read by an IDE (with IntelliSense for example).
2020-03-23 09:47:01 +01:00
Mael Rouxel-Labbé f9f2be99a2 Fix parameter order in read/write_OFF call 2020-03-17 09:15:33 +01:00
Mael Rouxel-Labbé 389def8e13 Re-apply changes from #4523 (Fix PLY writing by reindexing vertices)
https://github.com/CGAL/cgal/pull/4523
2020-03-17 09:03:53 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +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
Laurent Rineau 61453c6322 Merge pull request #4501 from maxGimeno/OFF_reading-Fixes-maxGimeno
Fix OFF reader
2020-02-14 14:46:35 +01:00
Laurent Rineau f58b40b77b Merge pull request #4501 from maxGimeno/OFF_reading-Fixes-maxGimeno
Fix OFF reader
2020-02-14 14:39:22 +01:00
Laurent Rineau 31eab7333a Merge pull request #4523 from sgiraudot/Surface_mesh-Fix_PLY_writer-GF
[Surface Mesh] Fix PLY writing by reindexing vertices
2020-02-14 14:39:08 +01:00
Simon Giraudot 0bd22934e2 Fix PLY writing by reindexing vertices 2020-02-13 10:45:54 +01:00
Simon Giraudot 3d4ace8a85 Fix PLY writing by reindexing vertices 2020-02-13 10:42:29 +01:00
Maxime Gimeno 26c86d28be Fix OFF reader 2020-01-31 11:58:58 +01:00
Laurent Rineau 76fe17461f Merge pull request #4493 from sgiraudot/Properties-Fix_capacity-GF
[Surface Mesh / Point Set] Fix capacity handling in properties
2020-01-29 16:29:47 +01:00
Laurent Rineau c950da11b0 Merge pull request #4493 from sgiraudot/Properties-Fix_capacity-GF
[Surface Mesh / Point Set] Fix capacity handling in properties
2020-01-29 16:27:44 +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
Mael Rouxel-Labbé 65c1a4f81b Clean code and headers (no real changes) 2020-01-28 12:10:59 +01:00
Mael Rouxel-Labbé 473cd25614 Proper indentation of SM/IO.h 2020-01-28 12:10:59 +01:00
Simon Giraudot 283a264f5e Fix reserve (update capacity only if bigger) 2020-01-28 11:14:53 +01:00
Simon Giraudot bf12b38c2b Fix constness w.r.t capacity 2020-01-28 11:14:10 +01:00
Simon Giraudot a5e1c6e3c6 Fix capacity handling in properties 2020-01-28 10:58:36 +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é 9e2289c63d Clean code 2020-01-25 18:18:31 +01:00
Mael Rouxel-Labbé 8f82c1b7a4 Start fixing PLY namespaces 2020-01-24 18:32:46 +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
Sébastien Loriot e80f869147 Merge remote-tracking branch 'cgal/master' 2019-12-20 09:35:45 +01:00
Sebastien Loriot 58f8a3eec2
Merge pull request #4279 from afabri/Surface_mesh-fix_swap-GF
Surface_mesh: Fix Property_container::swap()
2019-12-20 09:19:53 +01:00
Laurent Rineau b1c36bade5 Merge pull request #4245 from afabri/SM-disable_incompatible_comparisons-GF
Surface_mesh: Disable comparison of mixed index types
2019-12-05 11:05:32 +01:00
Sébastien Loriot bff5db68e1 fix some remaining license notice + add a missing LicenseRef-Commercial 2019-10-31 14:17:20 +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 9f4fe1a9e8 Fix wrong positive 2019-10-20 00:32:41 +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 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
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
Laurent Rineau 8d7932cdc2 Merge pull request #4203 from maxGimeno/Demo-Fix_detect_boundaries-GF
Polyhedron Demo: Fix  stitching plugin
2019-10-15 16:34:14 +02:00
Guillaume Damiand 0707d80d63 Update basic viewer to avoid conflict with another external function. 2019-10-15 11:16:02 +02:00
Andreas Fabri 937423bb9f Surface_mesh: Fix Property_container::swap() 2019-10-09 11:59:12 +02:00
Andreas Fabri f138c66142 Surface_mesh: Disable comparison of mixed index types 2019-09-24 15:06:56 +02:00
Maxime Gimeno c8c46d6f00 Finished the `Supported file formats` page 2019-09-19 13:27:06 +02:00
Maxime Gimeno e35d5d0f1f Fix the detect_boundaries operation to not use is_border(vertex).
Add to the doc of Surface_mesh that is_border(vertex_index) is not guaranteed to work if the SM is not a 2-manifold.
2019-09-02 14:58:57 +02:00
Sebastien Loriot 039ee63e0e
Merge pull request #4122 from maxGimeno/CGAL_IO-OBJ_writes_normals-maxGimeno
Surface_mesh: normals in OBJ Writer
2019-08-08 10:18:05 +02:00
Maxime Gimeno 35bbb4c21b Fix type 2019-08-01 10:36:55 +02:00
Maxime Gimeno 54b6031ae6 Fix pmap 2019-07-29 16:17:14 +02:00
Maxime Gimeno 2698704f87 Add vertex nomals in write_OBJ for Surface_mesh 2019-07-29 15:55:38 +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 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
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
Sebastien Loriot fbf6fb375d
Merge pull request #4050 from sgiraudot/Surface_mesh-Fix_PLY_warning-GF
[Surface Mesh / PLY] Fix uninitialized warning and error on unhandled properties
2019-07-18 16:31:17 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
match @{ and @}
2019-07-18 16:26:43 +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
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Simon Giraudot d916428144 Fix case where edge/hafledge properties are found but with unhandled complex types 2019-07-09 15:12:59 +02:00
Mael Rouxel-Labbé 97626d2c34 Revert "Re-enable using operator<< and operator>> with 2D meshes"
This reverts commit bc32291d36.

This will be cleaned in a better way in the future.
2019-07-08 15:58:36 +02:00
Mael Rouxel-Labbé 7a5486962d Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-20 14:49:25 +02:00
Laurent Rineau 33e7de45e9 Merge pull request #3919 from maxGimeno/Add_3mf_wrapper-GF
Stream_support: Add a 3mf wrapper
2019-06-20 14:21:11 +02:00
Mael Rouxel-Labbé bc32291d36 Re-enable using operator<< and operator>> with 2D meshes 2019-06-20 09:46:32 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +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
Maxime Gimeno c5174f693c Rename soup function 2019-06-17 14:07:27 +02:00
Maxime Gimeno 7de29bdd93 update doc 2019-06-17 14:06:12 +02:00
Maxime Gimeno 1970d94c53 Add a function to Surface_mesh that reads a range of surface_meshes from a 3mf file. 2019-06-17 14:03:55 +02:00
Laurent Rineau 595f38ef54 Merge pull request #3978 from afabri/CGAL-BOOST_FOREACH-GF
Replace BOOST_FOREACH with C++11 for
2019-06-17 13:54:28 +02:00
Laurent Rineau c18d8b97a6 Merge pull request #3981 from afabri/Surface_mesh-property-GF
Surface_mesh: No need to call add_property_map()
2019-06-17 13:54:26 +02:00
Mael Rouxel-Labbé 2d81245744 Fix conversion warning 2019-06-17 08:33:05 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Andreas Fabri 0a7945baac Surface_mesh: No need to call add_property_map() 2019-06-05 11:42:16 +02:00
Laurent Rineau adaed61c20 Merge branch 'releases/CGAL-4.14-branch' 2019-06-05 10:58:12 +02:00
Laurent Rineau 926067967a Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-05 10:43:44 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Andreas Fabri 4e1f2cf017 Replace BOOST_FOREACH with C++11 for 2019-06-04 17:13:53 +02:00
Andreas Fabri e2498591da We write x y z even if it is a homgenous point 2019-05-09 15:06:29 +02:00
Andreas Fabri d207889c95 is >> p is wrong if p is a homogeneous point.
Instead read three doubles.
Note that we do not support 4OFF yet which means a fourth homogenization variable
2019-05-09 09:34:32 +02:00
Mael 0efaed2095
Merge branch 'master' into PMP-Locate-GF 2019-05-06 15:57:09 +02:00
Simon Giraudot 9e85313b44 Fix yet another round of warnings 2019-04-26 15:52:21 +02:00
Simon Giraudot 3dce5ec8b0 Remove useless relates 2019-04-26 13:28:45 +02:00
Simon Giraudot ec3984eba2 Fix wrong assertion 2019-04-25 09:58:29 +02:00
Simon Giraudot 4d1efe18b8 Fix error/warnings 2019-04-24 10:30:03 +02:00
Simon Giraudot 207a432dfd Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-23 12:08:44 +02:00
Mael Rouxel-Labbé 68595b210e Add a += operator for SM's edge iterator 2019-04-19 08:38:32 +02:00
Simon Giraudot 717137e48f Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-09 15:11:58 +02:00
Maxime Gimeno de47fb3348 Fix conflicts 2019-04-09 10:31:10 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Maxime Gimeno 1ffd2842ca Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-04-02 13:51:52 +02:00
Laurent Rineau 84b9328619 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-29 15:49:12 +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 27d47e5eee Merge pull request #3814 from MaelRL/Surface_mesh-Actually_reset_all_properties-GF
Surface Mesh: Fixed not reseting edge property when a new element re-uses memory
2019-03-28 18:50:38 +01:00
Sébastien Loriot 676983ad94 also reset the property of the opposite halfedge 2019-03-28 18:16:08 +01:00
Mael Rouxel-Labbé 2a4d1abefa Fixed not reseting edge property when a new element reuses memory 2019-03-28 17:30:48 +01:00
Maxime Gimeno b619fbeb28 Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-03-26 10:57:54 +01:00
Andreas Fabri e08d85f3e3 Set precision of the ostream when writing a point set or face graph. Add a \note in the manual 2019-03-04 15:50:18 +01:00
Simon Giraudot 1f54c5e0af Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-02-26 14:03:27 +01:00
Maxime Gimeno 4f97ab767b Update to master. 2019-02-15 14:34:34 +01:00
Laurent Rineau 962afbfade Merge pull request #3343 from sgiraudot/Point_set_3-v2-GF
[Small Feature] Point Set 3 v2
2019-02-13 15:38:53 +01:00
Maxime Gimeno d76c163807 Fix the Final Fixes 2019-02-11 09:39:26 +01:00
Sébastien Loriot d5abc63e80 give a default value 2019-02-08 10:34:22 +01:00
Simon Giraudot ea250949f9 Fix return type 2019-02-07 11:36:04 +01:00
Simon Giraudot f778e5e151 Add methods to easily transfer properties from one point set to another 2019-02-07 11:36:04 +01:00
Simon Giraudot 6b4bb9bba2 Update doc 2019-01-28 10:09:06 +01:00
Simon Giraudot ca748364c6 Add reserve() where needed, fix a bug in read_off() and handle mesh-appending 2019-01-25 15:09:29 +01:00
Simon Giraudot a352fe8a0d Document how to recover/write PLY comments 2019-01-25 14:31:15 +01:00
Simon Giraudot b206e04c58 Handle edge/halfedge properties in PLY IO 2019-01-25 11:03:24 +01:00
Simon Giraudot ce125cf020 Better documentation and handling alpha in colors 2019-01-24 16:09:45 +01:00
Simon Giraudot 37a8f12f05 Handle more types 2019-01-24 10:58:57 +01:00
Simon Giraudot 2e13c54913 Documentation + better comment parameter 2019-01-23 14:43:21 +01:00
Simon Giraudot cf1fb8c3b0 Handle float Kernel 2019-01-23 12:25:41 +01:00
Simon Giraudot 798c2b4438 Merge remote-tracking branch 'GF/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-01-23 12:07:04 +01:00
Simon Giraudot a15b4cdf4a Add PLY IO functions for Surface_mesh + test 2019-01-23 11:26:07 +01:00
Maxime Gimeno b783e78223 Fix conflicts and display_property_plugin 2019-01-21 14:58:28 +01:00
Maxime Gimeno c71d1066a2 Fix conflicts 2019-01-11 13:59:08 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Sébastien Loriot 61169b394e Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2019-01-04 17:19:19 +01:00
Sébastien Loriot 45066e7d91 Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2019-01-04 17:17:03 +01:00
Sébastien Loriot 5a1b51bdd0 fix warning 2019-01-02 10:11:28 +01:00
Sébastien Loriot 3bfc09de3f add comments 2018-12-31 09:42:55 +01:00
Andreas Fabri ecc89af2b2 Fix Surface_mesh::join() 2018-12-31 09:34:51 +01:00
Maxime Gimeno 8691ea6805 Replace Fucntor by Visitor 2018-12-21 10:19:29 +01:00
Maxime Gimeno eb50bbb4b4 Fix typo 2018-12-21 10:16:07 +01:00
Maxime Gimeno 95c2045eb6 Fix conflicts 2018-12-21 09:02:26 +01:00
Maxime Gimeno 5ca79f8268 Add a visitor for collect_garbage. Add und for add and remove center_vertex 2018-12-20 12:45:35 +01:00
Laurent Rineau b45284184c Merge pull request #3532 from maxGimeno/Surface_mesh-Fix_IO-GF
Surface_mesh: Fix segfault in read_off()
2018-12-19 16:06:54 +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 b569aa4143 Merge pull request #3532 from maxGimeno/Surface_mesh-Fix_IO-GF
Surface_mesh: Fix segfault in read_off()
2018-12-19 15:45:50 +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
Laurent Rineau b5ad256078 Merge pull request #3532 from maxGimeno/Surface_mesh-Fix_IO-GF
Surface_mesh: Fix segfault in read_off()
2018-12-19 15:44:34 +01:00
Maxime Gimeno c51852f8a1 Add check in collect_garbage() 2018-12-13 09:34:05 +01:00
Simon Giraudot 17792e53b8 Fix return type 2018-12-12 10:51:34 +01:00
Simon Giraudot 6e4815064e Add methods to easily transfer properties from one point set to another 2018-12-12 10:51:34 +01:00
Maxime Gimeno b04369cc6b Don't assert OFF type 2018-12-11 14:55:00 +01:00
Maxime Gimeno 548f86b98b Check stream state before allocating memory. 2018-12-11 14:35:25 +01:00
Sébastien Loriot 56de16c9c0 workaround (a compiler bug?) 2018-12-07 10:44:25 +01:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +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
Laurent Rineau 3c6538f80f Merge pull request #3377 from Simon-Lopez/simon_cgal_#3375
Proposal to fix issue #3375
2018-10-29 10:42:37 +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 fb7dc495b0 Merge pull request #3377 from Simon-Lopez/simon_cgal_#3375
Proposal to fix issue #3375
2018-10-29 10:27:41 +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 72acbee3f5 fix warnings 2018-10-24 11:12:55 +02:00
Guillaume Damiand ae5b6e00ad Bug fix in basic viewers when using EPEK.
For polyhedron, surface mesh and LCC viewers, we compute face and vertex normals in the basic viewers. These normals should be computed in a Vector_3 of a non exact kernel.
2018-10-15 14:58:52 +02:00
Andreas Fabri 0dc1cf2aeb Dón't use CGAL_TEST_SUITE as travis and even me are not the testsuite 2018-10-12 10:25:42 +02:00
Andreas Fabri 992294f79f Add a testcase for Surface_mesh::join() 2018-10-10 10:43:22 +02:00
Simon Lopez 3622f1cfec Proposal to fix issue #3375 2018-10-10 10:43:22 +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 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Guillaume Damiand 2273762e7e Remove debug message 2018-09-10 14:11:36 +02:00
Guillaume Damiand ddd7f8fa3b Add an option to disable viewer when running ctest. 2018-09-07 13:29:38 +02:00
Guillaume Damiand 2c8af2ebcc Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program. 2018-09-06 18:43:32 +02:00
Sébastien Loriot 376bc42716 update URL and use https 2018-09-04 13:29:51 +02:00
Maxime Gimeno 8d0a67095f Merge branch 'master' into IntrinsicFaceGraph-V2 2018-08-01 15:40:36 +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 82ef11845f fix constness issues 2018-07-18 14:31:14 +02:00
Sébastien Loriot a31753df4a handle const graph for face dynamic tag 2018-07-18 09:12:05 +02:00
Laurent Rineau 5023020809 Merge pull request #3126 from sgiraudot/Classification-Clusters_and_meshes-GF
Classification 2.0
2018-07-12 11:37:13 +02:00
Sébastien Loriot cf91f7037e Merge branch 'cgal/releases/CGAL-4.12-branch' 2018-07-09 09:26:24 +02:00
Sébastien Loriot 73e3e86980 make the test compiles.
@afabri This shows what I meant in https://github.com/CGAL/cgal/issues/3138
Here the fix is only minimal, but it should be done consistently for all
simplex type of Surface_mesh, and also probably for OpenMesh types
2018-07-06 09:13:02 +02:00
Simon Giraudot e1da290f13 Fix conversion warning 2018-07-05 09:08:28 +02:00
Simon Giraudot d27c5a97db Make Index_iterator of Surface_mesh really compliant to random access concept 2018-07-05 09:08:27 +02:00
Simon Giraudot b894992e8d Make Surface Mesh Index_iterator random access 2018-07-05 09:07:31 +02:00
Sébastien Loriot 6d0cca9a29 convenience function write_off uses documented one 2018-06-29 08:46:21 +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 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +02:00
Maxime Gimeno ee94efc76e Fix Surface_mesh example 2018-05-29 12:00:30 +02:00
Andreas Fabri 4b14990209 Fix warnings; Remove typename in non-template code 2018-05-29 11:11:50 +02:00
Guillaume Damiand c62fb2b01e Move include iostream. 2018-05-29 11:11:49 +02:00
Guillaume Damiand b361e78a99 Add missing include 2018-05-29 11:11:49 +02:00
Guillaume Damiand 39de8ac459 Add licence includes 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 23426e70c4 Remove macro modified. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 6e83b034dc Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 73905ce8dd Avoid to run the viewer for the CGAL test suite. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5d375eff74 Update all basic viewers to have the correct behavior when CGAL_USE_BASIC_VIEWER is not defined. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5e5a9611db Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined. 2018-05-29 11:04:57 +02:00