Commit Graph

6946 Commits

Author SHA1 Message Date
Maxime Gimeno abc623d5a8 clean-up 2020-04-01 15:03:43 +02:00
Maxime Gimeno 69a2a23cc6 rename IO functions in point_set packages 2020-04-01 14:33:14 +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 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
Sebastien Loriot 6d2ada806c
Merge pull request #4153 from necipfazil/gsoc2019-pointmatcher_icp_wrapper-necipfazil
[Small Feature] OpenGR and PointMatcher wrappers
2020-03-23 13:35:48 +01:00
Sébastien Loriot 614b555705 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-23 13:19:31 +01:00
Laurent Rineau b723559ac7 Fix permissions of files created by scp
Fix PR #4588.
2020-03-22 15:44:08 +01:00
Maxime Gimeno 5a91bda017 update ssh text and add a prefix to the file (invisible for the user) to help manage files on the server 2020-03-20 13:19:53 +01:00
Maxime Gimeno 157348045b replace the 0707 permissions by 0777 2020-03-20 11:50:48 +01:00
Maxime Gimeno e8bb985edc Fix VColors initialization, as it can be used with indexed data or not. 2020-03-20 11:37:29 +01:00
Sébastien Loriot eb5d1d9a95 Update from master 2020-03-20 08:58:52 +01:00
Sébastien Loriot 954d23a64c Merge pull request #4418 from sloriot/PMP-soup_to_mesh_add_vpm
PMP: Add `point_map` and `vertex_point_map` to `polygon_soup_to_polygon_mesh`
2020-03-19 16:22:58 +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
Mael 8ee3ec8f7b
Merge branch 'master' into PMP-Add_split_to_clip-GF 2020-03-17 19:47:28 +01:00
Sébastien Loriot cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF
Third party libs: improve documentation + introduce new CMake functions
2020-03-17 18:19:40 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Sebastien Loriot 0c8e9cb0c1
Merge pull request #4212 from maxGimeno/Demo-Save_the_scene_entirely-maxGimeno
CGAL 3D Demo: Enhancement of the Scene Saving System
2020-03-16 16:35:45 +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 cf99ea072d Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-16 16:19:38 +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
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
Laurent Rineau 1e112f3262 Merge pull request #4482 from maxGimeno/Demo-Fix_meshing_dialog-maxGimeno
3D Demo:  Fix Meshing_dialog.ui
2020-03-05 14:52:28 +01:00
Laurent Rineau 57e699ac67 Merge pull request #4502 from maxGimeno/Convex_hull_3-Overload_for_VertexListGraph-maxGimeno
Convex_hull_3: Overload for VertexListGraph
2020-03-05 14:52:25 +01:00
Laurent Rineau a55cc93214 Merge pull request #4532 from maxGimeno/Demo-Upgrade_3mf-maxGimeno
3mf <2.0
2020-03-05 14:52:15 +01:00
Jane Tournois f4665a83ec if `fpmap` is valid, then there is no need to call connected_components()
calling connected_components() overwrites face patches, though isotropic_remeshing()
keeps it valid

+ in the case where we have a valid face_patch_map, and no constrained edges,
calling connected_components() entirely looses the surface patch information
2020-03-05 12:29:43 +01:00
Maxime Gimeno 3e61bcbe51 Fix enum 2020-03-03 15:26:30 +01:00
Mael Rouxel-Labbé 8f8a818d21 Fix STL IO 2020-02-28 11:55:56 +01:00
Maxime Gimeno 1d69e9048e conditionnally use some functions (fix deprecation warning) 2020-02-27 15:56:56 +01:00
Maxime Gimeno d8fd359399 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2020-02-24 16:41:34 +01:00
Maxime Gimeno 56af5c2d7d Put Use_ssh.cpp under LGPL3+ 2020-02-20 13:32:50 +01:00
Maxime Gimeno 634b0cf7e9 fix known_hosts and ask for permission. Clean-up. 2020-02-20 13:30:15 +01:00
Mael Rouxel-Labbé fdb6ada8c4 Update to new API 2020-02-20 11:15:03 +01:00
Mael Rouxel-Labbé 9ecd913b7c Simplify CGAL demo code, using new PMP function 2020-02-20 11:14:45 +01:00
Maxime Gimeno 6719b0db89 Add checks and doc for version < 2 2020-02-18 10:52:16 +01:00
Laurent Rineau 07bd217f43 Merge commit 'c51c7792b84e1b0039d9fb4afc872a38fcfc14cb' from pull request #4481 from maxGimeno/Demo-Fixes-maxGimeno
3D Demo: Fixes
2020-02-14 14:52:27 +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 79fc9bf34f Merge pull request #4481 from maxGimeno/Demo-Fixes-maxGimeno
3D Demo: Fixes
2020-02-14 14:39:28 +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
Maxime Gimeno 2dbce59bd8 Merge remote-tracking branch 'cgal/master' into Convex_hull_3-Overload_for_VertexListGraph-maxGimeno 2020-02-14 09:21:38 +01:00
Maxime Gimeno 25454b4d77 Use CGAL::square() 2020-02-13 14:37:15 +01:00
Maxime Gimeno 71a99a2700 Fix offset computation trigger. 2020-02-13 14:21:59 +01:00
Maxime Gimeno e9864cf874 Fixes after review 2020-02-11 14:13:56 +01:00
Maxime Gimeno 0378d7825f Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-02-10 15:53:05 +01:00
Maxime Gimeno e38dbfe3a3 Fix test for spheres resizing. 2020-02-10 13:44:33 +01:00
Maxime Gimeno 4c2b8162b8 Merge remote-tracking branch 'cgal/master' into Demo-Fixes-maxGimeno 2020-02-10 13:16:12 +01:00