Mael Rouxel-Labbé
efceadd441
Temporarily override the value of MAX_LOG_LEVEL to silence Ceres on Windows
...
When using minilog, Ceres' Cmake code sets up MAX_LOG_LEVEL, to an annoyingly
high verbosity. We mute it temporarily and restore the value afterwards
in case it's being used by some external code.
2019-07-05 15:19:24 +02:00
Mael Rouxel-Labbé
e61d980173
Silence Ceres when logging is based on minilog and not glog
2019-07-04 10:30:18 +02:00
Mael Rouxel-Labbé
627f05c9b2
Add missing header
2019-07-03 12:08:30 +02:00
Mael Rouxel-Labbé
4d7192bbd0
Fix MSVC warning
2019-07-03 11:58:27 +02:00
Mael
f40f8e4190
Merge branch 'master' into PMP-smoothing-kkatrio
2019-07-01 11:24:11 +02:00
Laurent Rineau
b18a17eba7
Merge branch 'releases/CGAL-4.14-branch'
...
# Conflicts:
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h
2019-07-01 11:13:42 +02:00
Laurent Rineau
64bc06e2d9
Merge pull request #4032 from sloriot/PMP-coref_invalid_map
...
Fix copy/paste error
2019-07-01 11:07:29 +02:00
Laurent Rineau
3782c024df
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-07-01 11:06:57 +02:00
Mael Rouxel-Labbé
b66024f3e8
Try to silence CERES on windows
2019-07-01 09:19:23 +02:00
Mael Rouxel-Labbé
b1b55a8995
Fix unused variable warnings
2019-07-01 08:45:35 +02:00
Sébastien Loriot
df9a63b2b4
update marks on removed edges
2019-06-27 08:44:46 +02:00
Mael Rouxel-Labbé
4d9aa39a90
Remove "warning" in std::cerr to avoid false positive in the testsuite
2019-06-27 08:11:13 +02:00
Mael Rouxel-Labbé
ed77935d4f
Fix unused warning
2019-06-27 08:09:18 +02:00
Sébastien Loriot
4e1e7d8c16
fix wrong index
2019-06-26 10:52:48 +02:00
Mael Rouxel-Labbé
b365835970
Remove requirement on EdgeListGraph
2019-06-24 09:04:28 +02:00
Mael Rouxel-Labbé
262ef93c8d
Remove obsolete header
2019-06-21 13:09:09 +02:00
Mael Rouxel-Labbé
0d1759e996
Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio
2019-06-20 15:02:32 +02:00
Laurent Rineau
17add8332e
Merge pull request #3903 from MaelRL/PMP-Generalize_keep_largest_CC-GF
...
PMP: Generalize `keep_large(st)_CCs`
2019-06-20 14:21:14 +02:00
Laurent Rineau
8535a3c03c
Merge branch 'releases/CGAL-4.14-branch'
...
# Conflicts:
# Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
# Convex_hull_3/include/CGAL/convex_hull_3.h
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
# Stream_support/include/CGAL/IO/Color.h
2019-06-20 14:20:37 +02:00
Laurent Rineau
b0f1f90a4d
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-06-20 14:08:25 +02:00
Laurent Rineau
208f788494
Merge pull request #3893 from sloriot/PMP-coref_fix_next_prev
...
Fix the prev/next pointers after polyline removal
2019-06-20 14:01:25 +02:00
Mael Rouxel-Labbé
7b72fcbf6c
Enable passing nb_iter/time step in command line arg
...
Also nb_iterations is an unsigned int, not a std::size_t
2019-06-20 13:38:21 +02:00
Mael Rouxel-Labbé
dcef0011e4
Confirm usage of numeric differenciation in Ceres problem formulation
2019-06-20 13:31:33 +02:00
Mael Rouxel-Labbé
cad9a0aaa8
Make things work when Ceres is not available
2019-06-20 13:04:15 +02:00
Mael Rouxel-Labbé
e3e50d90de
Constrain edges now properly constrain the position of their extremities
2019-06-19 14:39:40 +02:00
Mael Rouxel-Labbé
77711e4e71
Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio
2019-06-19 11:34:48 +02:00
Mael Rouxel-Labbé
aa6a1907ba
Add some verbose if the solver fails
2019-06-19 11:29:01 +02:00
Mael Rouxel-Labbé
3a8a7c1f26
Improve the documentation
2019-06-19 11:07:32 +02:00
Mael Rouxel-Labbé
3b53ce20e3
Rename smooth/smooth_along_curvature_flow to smooth_mesh/shape
...
Also fix edge protection in the demo
2019-06-19 10:17:26 +02:00
Mael Rouxel-Labbé
22bd8a943b
Merge smooth_areas and smooth_angles, rework AABB tree, document everything
2019-06-18 16:02:42 +02:00
Mael Rouxel-Labbé
19de8eda04
Merge branch 'PMP-Generalize_keep_largest_CC-GF-old' into PMP-Generalize_keep_largest_CC-GF
2019-06-17 15:18:33 +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
Laurent Rineau
e4353afb13
Merge pull request #3861 from MaelRL/PMP-Add_stitch_boundary_cycle_singular-GF
...
PMP: Introduce `stitch_boundary_cycle`
2019-06-17 13:54:39 +02:00
Laurent Rineau
21f150dac8
Merge pull request #3932 from janetournois/PMP-add_fallback_for_hole_filling-jtournois
...
PMP : add fallback to non-Delaunay triangulations for hole filling functions
2019-06-17 13:54:34 +02:00
Laurent Rineau
96912aaa20
Merge branch 'releases/CGAL-4.14-branch'
2019-06-17 13:53:42 +02:00
Laurent Rineau
bcef288a63
Merge pull request #3925 from MaelRL/PMP-Fix_repair_PS_swapping-GF
...
PMP: Fix repair polygon soup bad swaps
2019-06-17 13:51:52 +02:00
Laurent Rineau
19e1dd8c3f
Merge pull request #3937 from sloriot/Slicer-fix_default_vpm
...
Fix default vertex point map
2019-06-17 13:51:38 +02:00
Laurent Rineau
1af9a8030e
Merge pull request #3964 from sloriot/PMP-coref_invalid_index
...
Fix invalid index
2019-06-17 13:51:36 +02:00
Laurent Rineau
fd33d13958
Merge pull request #3937 from sloriot/Slicer-fix_default_vpm
...
Fix default vertex point map
2019-06-17 13:48:12 +02:00
Mael Rouxel-Labbé
c11de87552
Manually swap boolean values instead of std::swap() or vector.swap()
...
MSVC is not happy with std::swap(), Apple is not happy with vector.swap()
2019-06-14 15:43:35 +02:00
Laurent Rineau
67e73c2324
Fix compilation errors
2019-06-13 15:52:43 +02:00
Mael Rouxel-Labbé
a6ea4bcf9f
Try to make MSVC preview happy about swapping within boolean vectors
2019-06-12 08:39:32 +02:00
Mael Rouxel-Labbé
8a272dd0b9
Fix warning
2019-06-12 08:17:51 +02:00
Mael Rouxel-Labbé
6e937b62e4
Fix isolated point removal edge case
2019-06-10 09:59:44 +02:00
Mael Rouxel-Labbé
9942669dd1
Make Delaunay flips optional
2019-06-07 16:13:49 +02:00
Mael Rouxel-Labbé
d41e400875
If we the mesh is open, we can't scale based on the volume
...
at least for now, could probably imagine some trick to still do it
2019-06-07 16:12:47 +02:00
Mael Rouxel-Labbé
1aaba3a275
Misc minor changes
2019-06-07 13:54:24 +02:00
Mael Rouxel-Labbé
2ad0e94b55
Confirmed use of _Meyer weights and Gram Schmidt move reprojection
...
through empirical testing
2019-06-07 12:37:14 +02:00
Mael
7fb3542b2d
Add missing param documentation
2019-06-07 10:35:25 +02:00
Mael Rouxel-Labbé
6c4d873338
Get rid of the explicit curvature flow smoothing scheme
...
It's just worse all the time anyway
2019-06-07 10:27:21 +02:00