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

7171 Commits

Author SHA1 Message Date
Mael 78acfda766 Fix whitespace 2020-04-24 14:02:19 +02:00
Maxime Gimeno d7a18b913d More errors and warnigns 2020-04-23 09:30:28 +02:00
Maxime Gimeno 8da84d4748 More errors and warnigns 2020-04-23 09:27:54 +02:00
Maxime Gimeno c74bca8d65 More errors and warnigns 2020-04-23 09:27:26 +02:00
Sebastien Loriot e38f9c2195
Merge pull request #4633 from maxGimeno/Three-move_examples-maxGimeno 
Three: Move examples to the Polyhedron_Demo
 2020-04-22 13:20:32 +02:00
Maxime Gimeno 97d2eaebd9 more fixes 2020-04-22 11:03:38 +02:00
Maxime Gimeno 6a51a30828 more fixes 2020-04-22 11:02:47 +02:00
Maxime Gimeno 9bf61b7977 more fixes 2020-04-22 11:02:16 +02:00
Jane Tournois c2722e5f3f Merge remote-tracking branch 'maxGimeno/Surf_reader_enhancement-maxGimeno' into Tetrahedral_remeshing-new-jtournois 2020-04-22 07:15:15 +01:00
Maxime Gimeno ee0204d7da Proper fix. 2020-04-21 16:57:37 +02:00
Maxime Gimeno fa5147c756 Simple minimalist patch for surf_reader 2020-04-21 15:51:15 +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
Laurent Rineau 6f2c1fa6b2 Really fix the compilation with MSVC 2015 2020-04-20 21:54:44 +02:00
Maxime Gimeno 93b9f643bc Fix link problem in Io_image_plugin 2020-04-20 13:23:37 +02:00
Simon Giraudot fb8573e139 Merge remote-tracking branch 'mine/Tutorials-GIS-GF' into Tutorials-GIS-GF 2020-04-20 09:25:52 +02:00
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +02:00
Simon Giraudot 90ad2cb613 Fix warnings and trailing whitespaces 2020-04-20 08:50:44 +02:00
Jane Tournois cf58a08a55 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-20 06:24:36 +02:00
Jane Tournois 9a886d8f27 rename tetrahedral_adaptive_remeshing() to tetrahedral_isotropic_remeshing() 
because it is not adaptive yet
the adaptive version will come later, with a named parameter
 2020-04-17 09:32:36 +02:00
Mael Rouxel-Labbé d6cf97278f Fix trailing whitespace 2020-04-17 09:22:57 +02:00
Sebastien Loriot 98fafe4ef1
Merge pull request #4514 from MaelRL/CGAL-Fix_warnings-GF 
Fix (some) testuite warnings
 2020-04-16 18:15:11 +02:00
Sebastien Loriot a860a7ea5a
Merge pull request #4404 from MaelRL/CGAL-Optimal_bounding_box-GF 
New Package: Optimal Bounding Box
 2020-04-16 18:10:58 +02:00
Simon Giraudot 60cb33fa31 Merge remote-tracking branch 'mine/PSP-Cluster_points-GF' into PSP-Cluster_points-GF 2020-04-16 17:02:19 +02:00
Simon Giraudot a08a1e950d Merge remote-tracking branch 'mine/Tutorials-GIS-GF' into Tutorials-GIS-GF 2020-04-16 16:56:13 +02:00
Sebastien Loriot a9da0c4178
Merge pull request #4646 from lrineau/Polyhedron-demo_fix_sphere_item-GF 
Fix cutting plane of spheres items
 2020-04-16 16:43:17 +02:00
Sebastien Loriot 1ea45a7009
Merge pull request #4629 from maxGimeno/Demo-Fix_point_set_registration_plugin-maxGimeno 
Polyhedron Demo: Fix Register_point_sets_plugin
 2020-04-16 16:40:14 +02:00
Sebastien Loriot 5594c95eb9
Merge pull request #4597 from sgiraudot/PMP-Regularize_selection_borders-GF 
[Small Feature] BGL: Regularize Face Selection Borders
 2020-04-16 16:33:35 +02:00
Sébastien Loriot a8f9858099 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-16 16:29:55 +02:00
Maxime Gimeno 674f29c2d9 Remove the search for the polyhedorn demo directory. 2020-04-16 09:05:38 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Sébastien Loriot e545270544 else -> endif 2020-04-14 16:56:28 +02:00
Maxime Gimeno 59b3a7af9e Make all the example plugin fully internal. Don't treat them if we are not in the testsuite. 2020-04-14 16:37:47 +02:00
Maxime Gimeno 931310b785 Fix error and warning in Example_plugin 2020-04-14 16:05:55 +02:00
Jane Tournois 29350cb260 fix the update of c3t3 facets in the flip step 2020-04-14 15:09:59 +02:00
Maxime Gimeno 64230e1351 Fix line width in menus. 2020-04-14 11:29:52 +02:00
Laurent Rineau 090565f1a4 Fix cutting plane of spheres items 
Fix the code of the cutting plane of sphere items, so that it is the
same orientation of the cutting plane of the c3t3 item.
 2020-04-13 22:34:25 +02:00
Mael Rouxel-Labbé c16c1a7ea3 Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-04-10 16:10:11 +02:00
Sébastien Loriot acd6d9d8de removing tabs and trailing whitespaces 2020-04-10 11:26:31 +02:00
Maxime Gimeno e44921bf72 Remove NOTICE message. 2020-04-10 10:22:25 +02:00
Maxime Gimeno a06aae45aa Use another macro 2020-04-10 09:37:11 +02:00
Maxime Gimeno 7e399437aa rename Example_plugin into Three_examples 2020-04-09 11:31:44 +02:00
Maxime Gimeno d74ab884cf Update the doc about creating a scene_item 2020-04-09 11:11:59 +02:00
Maxime Gimeno d4bf0548df Move Example_plugings inside the demo and add a cmake swith to get it tested in the testsuites 2020-04-09 10:45:06 +02:00
Maxime Gimeno 3e316555eb WIP 2020-04-08 16:30:06 +02:00
Sebastien Loriot 2167d4ffef
Merge pull request #4454 from maxGimeno/TDS-file_input-maxGimeno 
Triangulation_3: Add a function to file_input() with a similar API to the advanced copy_tds()
 2020-04-08 16:09:36 +02:00
Laurent Rineau b1f9951ed3 Fix a compilation error with MSVC 2015 2020-04-08 16:00:32 +02:00
Sébastien Loriot 50c62be925 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-08 15:56:23 +02:00
Maxime Gimeno fe2b9e7236 Fix Register_point_sets_plugin 2020-04-08 11:54:54 +02:00
Maxime Gimeno a60b15c90e Fix picking with wireframe and points 2020-04-08 11:53:49 +02:00
Maxime Gimeno 04fc3550d2 Fix warnings in polyhedron examples 2020-04-08 11:30:17 +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 952d5721fd fix c3t3_io plugin 2020-04-03 12:31:59 +02:00
Mael 84bcb8ac05
Merge branch 'master' into PMP-Regularize_selection_borders-GF 2020-04-03 09:11:52 +02:00
Sébastien Loriot 7f0a32da44 remove unused variable 2020-04-02 17:28:20 +02:00
Maxime Gimeno b6a5f23e4e remove trailing whitespaces 2020-04-02 15:02:27 +02:00
Maxime Gimeno e02a3fc37e Merge remote-tracking branch 'cgal/master' into TDS-file_input-maxGimeno 2020-04-02 15:00:23 +02:00
Maxime Gimeno 383eb3d147 Merge tag 'master_before_no_tws_nor_tabs' into TDS-file_input-maxGimeno 2020-04-02 14:56:03 +02:00
Sébastien Loriot dba7c3eb73 extra run of the script to remove tabs and trailing whitespaces 2020-04-02 13:45:03 +02:00
Simon Giraudot 9725bdcaa6 Update plugin 2020-04-02 13:45:01 +02:00
Simon Giraudot c2a7dd51f3 Use named parameters 2020-04-02 13:45:01 +02:00
Simon Giraudot 80a4b95f01 Use identity face map 2020-04-02 13:45:01 +02:00
Simon Giraudot dc54b326f4 Separate regularization functions 2020-04-02 13:45:01 +02:00
Simon Giraudot 461bb19e2d Use BGL API in regularize_selection 2020-04-02 13:45:00 +02:00
Simon Giraudot 6b79764dbb Add alternative algorithm for regularization using local minimization 2020-04-02 13:45:00 +02:00
Simon Giraudot f64702e640 Make API weight between 0 and 1 2020-04-02 13:45:00 +02:00
Simon Giraudot 8bcbc8ea5e Remove useless parameter 2020-04-02 13:45:00 +02:00
Simon Giraudot f93f79248a Compute evolution of border length in plugin 2020-04-02 13:45:00 +02:00
Simon Giraudot d505837264 First version of selection regularization via graphcut 2020-04-02 13:45:00 +02:00
Jane Tournois dca97faad6 Merge remote-tracking branch 'cgal/master' into Tetrahedral_remeshing-new-jtournois 2020-04-01 12:25:59 +01:00
Jane Tournois e0171c2f24 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-01 07:07:46 +01:00
Jane Tournois 53843de366 protect smoothing of sharp edges with a macro 2020-04-01 07:59:27 +02:00
Jane Tournois 6d71f78b60 comment debug macros 2020-04-01 07:39:04 +02:00
Mael Rouxel-Labbé 489869c543 Uniformize file names (repair_*) 2020-03-31 17:49:29 +02:00
Mael c766178456
Merge branch 'master' into PMP-Make_remove_self_intersections_local-GF 2020-03-30 09:44:36 +02:00
Sébastien Loriot 26962ace1c Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-27 16:06:59 +01:00
Sébastien Loriot a14e247bdf extra run of the script to remove tabs and trailing whitespaces 2020-03-27 08:23:32 +01:00
Sébastien Loriot d1c1ca2399 Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:19:39 +01:00
Sébastien Loriot 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +01:00
Sébastien Loriot 754699b33d extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:59:49 +01:00
Sébastien Loriot 4c094fd3c2 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:59:19 +01:00
Sébastien Loriot 58b10a3605 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:58:50 +01:00
Sébastien Loriot c1a42c7d37 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:21 +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
Mael Rouxel-Labbé 54d41c816b Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-24 12:03:07 +01:00
Mael Rouxel-Labbé e6229d3cb8 Fix including removed header 
This header was a fork from boost, but now all versions of boost
that we support provide this header.
 2020-03-24 10:25:09 +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
Mael 0d98265009
Fix conversion warning 2020-03-23 12:11:21 +01:00
Mael Rouxel-Labbé 2556196dad Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-23 08:59:49 +01:00
Laurent Rineau b723559ac7 Fix permissions of files created by scp 
Fix PR #4588.
 2020-03-22 15:44:08 +01:00
Mael Rouxel-Labbé af1c69354b Merge remote-tracking branch 'cgal/master' into PMP-Make_remove_self_intersections_local-GF 2020-03-20 15:44:51 +01:00
Mael Rouxel-Labbé a91a225bd8 Fix conversion warning 
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-103/Polyhedron_Demo/TestReport_Blake_Windows_MSVC-2019-Community-Release-64bits.gz
 2020-03-20 15:32:56 +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
Simon Giraudot 0e67264624 Update from review 2020-03-17 12:04:44 +01:00
Simon Giraudot c4e62d70e8 Remove K parameter and update doc from reviews 2020-03-17 12:04:44 +01:00
Simon Giraudot 5cf4b4acfd Improve plugin 2020-03-17 12:04:44 +01:00
Simon Giraudot 61ee057c40 Add clustering plugin 2020-03-17 12:04:44 +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
Laurent Rineau 789d3314b6
Merge branch 'master' into Polyhedron-demo__add_qtscript_support_to_Mesh_3_plugin-GF 2020-03-13 17:14:13 +01:00
Mael Rouxel-Labbé 3e365756ca Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2020-03-09 16:54:25 +01:00
Jane Tournois 440fc9da29 remove useless include 2020-03-06 17:12:16 +01:00
Mael Rouxel-Labbé 3d7b084c66 Merge branch 'PMP-Fix_merge_duplicated_vertices-GF-old' into PMP-Fix_merge_duplicated_vertices-GF 2020-03-06 12:59:36 +01:00
Mael Rouxel-Labbé 8d4313f7a8 Merge branch 'PMP-Make_remove_self_intersections_local-GF-old' into PMP-Make_remove_self_intersections_local-GF 2020-03-06 12:13:30 +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
Jane Tournois a7b745a446 fix init_c3t3() and the collapse() step 
* the code of collapse() is made simpler because the C3t3 already embeds a lot
of topology information that we do not need to re-test

* init_c3t3() now fixes the dimension() of vertices because it was not always
properly set in the input c3t3

* add counters in the plugin to understand why some collapse of very short edges
fail
 2020-02-28 13:40:00 +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
Mael Rouxel-Labbé 45e8903640 Add merge_duplicate_vertices_on_boundary_cycles to the CGAL demo 2020-02-25 17:34:59 +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
Maxime Gimeno aa4b129c3b Fix eigen plugins 2020-02-10 11:57:57 +01:00
Maxime Gimeno 1855050b81 Fix smoothing_plugin dependency to Eigen 2020-02-10 11:57:56 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Mael c51c7792b8 Fix grid generation ignoring z coordinates 2020-02-10 10:47:55 +01:00