songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
105,349 Commits 3 Branches 156 Tags 963 MiB
Commit Graph

652 Commits

Author SHA1 Message Date
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
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