Commit Graph

102554 Commits

Author SHA1 Message Date
Laurent Rineau ae3ae6e8d6 Merge pull request #7083 from afabri/Demo-readBMP-GF
3d Demo: Try to read bmp files
2022-12-14 10:39:53 +01:00
Laurent Rineau 2f2d73d195 Merge pull request #7100 from afabri/CORE-EOF-GF
CORE: Use istream.eof()
2022-12-14 10:39:50 +01:00
Laurent Rineau c419f52799 Merge pull request #7103 from sloriot/PMP-repair_si_conditional_smoothing
Do not apply smoothing if the CC has some degenerate faces
2022-12-14 10:39:48 +01:00
Laurent Rineau f3e0f45054 Merge pull request #7108 from afabri/PMP-Envelope_warning-GF
PMP: Fix for a -Wmaybe-uninitialized
2022-12-14 10:39:45 +01:00
Laurent Rineau 8497dcda55 Merge pull request #7109 from afabri/Three-fix_for_no_deprecated-GF
Three, and Polyhedron Demo: Add an #include and remove deprecated code
2022-12-14 10:39:42 +01:00
Laurent Rineau 3108fbc3c4 Merge pull request #7110 from sloriot/TR-remove_verbose_flag
Mesh_3, dump_c3t3: remove verbose flag

# Conflicts:
#	Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h
2022-12-14 10:39:12 +01:00
Laurent Rineau cf04d506f3 Merge PR "Mesh_3, dump_c3t3: remove verbose flag" #7110 2022-12-14 10:28:21 +01:00
Sébastien Loriot 71e452a6b8 be verbose if the macro is defined 2022-12-12 17:55:41 +01:00
Sébastien Loriot 96a63dc971 Merge remote-tracking branch 'cgal/5.5.x-branch' 2022-12-08 15:58:59 +01:00
Sébastien Loriot 513a702ad8 Merge remote-tracking branch 'cgal/5.4.x-branch' into HEAD 2022-12-08 15:57:39 +01:00
Sébastien Loriot 0d89f3c12b remove non-needed instruction 2022-12-08 15:56:55 +01:00
Sébastien Loriot c402d39db6 Merge remote-tracking branch 'cgal/5.5.x-branch' 2022-12-08 15:23:04 +01:00
Sébastien Loriot 3f2ee960ea Merge remote-tracking branch 'cgal/5.4.x-branch' into HEAD 2022-12-08 15:22:37 +01:00
Sebastien Loriot f5c41bd712
Merge pull request #7022 from MaelRL/Weights-v2.0-GF-master
Weights fixes (master)
2022-12-08 15:22:19 +01:00
Sebastien Loriot b9a87af07e
Merge pull request #7023 from MaelRL/Weights-v2.0-GF-5.5.x
Weights fixes (5.5.x)
2022-12-08 15:21:58 +01:00
Sebastien Loriot fa72ad2ad0
Merge pull request #6977 from MaelRL/Weights-v2.0-GF
Weights fixes (5.4.x)
2022-12-08 15:21:43 +01:00
Sébastien Loriot 7466cfc383 add verbose option to dump c3t3 2022-12-07 17:11:09 +01:00
Andreas Fabri c5d3f8246b Surprising 2022-12-07 15:29:45 +00:00
Andreas Fabri da3a3b300d Upgrade deprecated code 2022-12-07 15:10:01 +00:00
Sébastien Loriot f38ff92498 remove verbose flag 2022-12-07 14:29:05 +01:00
Mael Rouxel-Labbé b219436ba1 use Stream_support's get_file_extension() 2022-12-07 14:19:48 +01:00
Andreas Fabri 272ffa8e2f Don't use deprecated code in the demo 2022-12-07 13:03:35 +00:00
Mael Rouxel-Labbé 2cdaa26125 Minor UI update 2022-12-07 12:37:22 +01:00
Mael Rouxel-Labbé 282166307c Misc minor changes 2022-12-07 12:20:39 +01:00
Mael Rouxel-Labbé f3ec4653e9 List the main item above its volume plane in item list 2022-12-07 12:20:22 +01:00
Mael Rouxel-Labbé f7925fdd1a Reposition DCM / BMP underneath "Load..." (instead of the bottom of "Files") 2022-12-07 12:19:50 +01:00
Mael Rouxel-Labbé 1c04eea703 Refactor DCM / BMP to avoid code duplication + add smoothing selection to GUI 2022-12-07 12:19:24 +01:00
Mael Rouxel-Labbé c36c54c139 Fix "Planes for unnamed" 2022-12-07 11:42:30 +01:00
Andreas Fabri c7fb2f56ae Three: Add an #include# 2022-12-07 09:47:41 +00:00
Andreas Fabri 9159816fb4 PMP: Fix for a -Wmaybe-uninitialized 2022-12-07 08:02:35 +00:00
Mael Rouxel-Labbé d90d47fb79 Fix indentation (no real changes) 2022-12-06 22:57:42 +01:00
Mael Rouxel-Labbé 9a607498be Avoid some code duplication 2022-12-06 22:43:05 +01:00
Sébastien Loriot d3b13fb11c Merge branch 'cgal/5.5.x-branch' 2022-12-05 19:00:39 +01:00
Sebastien Loriot 887e175361
Merge pull request #6984 from janetournois/PSP-fix_has_normal_map-GF
Point_set_3 - `NP_helper::has_normal_map()` should not always return true
2022-12-05 18:59:42 +01:00
Laurent Rineau 72d590ef44
Merge pull request #6866 from lrineau/Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
fix undefined
2022-12-05 16:00:00 +01:00
Laurent Rineau 079993d0c6 updated crontab (automated commit) 2022-12-05 15:18:03 +01:00
Laurent Rineau e8ec440859 Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
# Conflicts:
#	STL_Extension/doc/STL_Extension/CGAL/Concurrent_compact_container.h
2022-12-05 14:51:31 +01:00
Laurent Rineau aea26d0843 Merge branch '5.5.x-branch' 2022-12-05 13:50:30 +01:00
Laurent Rineau 90f6546d77 Merge pull request #7069 from sloriot/PMP-split_repair_5.5
Split repair
2022-12-05 13:50:25 +01:00
Laurent Rineau 93e278fe1d Merge branch '5.5.x-branch' 2022-12-05 13:47:03 +01:00
Laurent Rineau 77f7b3ec8a Merge branch '5.4.x-branch' into 5.5.x-branch 2022-12-05 13:46:52 +01:00
Laurent Rineau 57de525060 Merge pull request #7093 from afabri/Spatial_searching-Weighted_Minkowski_doc_fix-GF
Spatial_searching: Fix doc
2022-12-05 13:46:20 +01:00
Laurent Rineau 21b086d166 Merge branch '5.5.x-branch' 2022-12-05 13:42:10 +01:00
Laurent Rineau 05b446eb3e Merge pull request #6992 from janetournois/Tet_remeshing-selection_pmap-jtournois
Tet remeshing - `cell_is_selected_map` should be a property map

# Conflicts:
#	Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/compute_c3t3_statistics.h
#	Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/split_long_edges.h
2022-12-05 12:38:31 +01:00
Laurent Rineau 42c8c4f9e1 Merge pull request #7070 from sloriot/PMP-split_repair
Split repair (master version)
2022-12-05 12:23:19 +01:00
Laurent Rineau dbe12c20ee Merge pull request #7072 from afabri/CGAL-cmake-3_25-GF
CGAL: Fixes for cmake 3.25

# Conflicts:
#	Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
#	Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
#	Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt
#	Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
#	Shape_regularization/examples/Shape_regularization/CMakeLists.txt
#	Shape_regularization/test/Shape_regularization/CMakeLists.txt
#	Weights/examples/Weights/CMakeLists.txt
#	Weights/test/Weights/CMakeLists.txt
2022-12-05 12:22:44 +01:00
Laurent Rineau 041df61a70 Merge pull request #7074 from sloriot/PMP-compatible_orientation_missing_option
CGAL::PMP::compatible_orientations: add missing option
2022-12-05 12:22:09 +01:00
Laurent Rineau 67b5c791e9 Merge pull request #7075 from MaelRL/CGAL-Fix_some_links-GF
Update some links + https
2022-12-05 12:22:06 +01:00
Laurent Rineau d66a296fd8 Merge pull request #7077 from MaelRL/CGAL-Translate_French_error_msgs-GF
Translate some French error messages / comments
2022-12-05 12:22:03 +01:00
Laurent Rineau 861ce1deed Merge pull request #7078 from MaelRL/Kernel_23-Fix_missing_CP3_overload-GF
Fix the Kernel concept being weaker than TriangulationTraits_23 requirements
2022-12-05 12:22:01 +01:00