Sébastien Loriot
f0fb56233a
Merge 'cgal/releases/CGAL-4.13-branch'
2019-08-27 06:36:39 +02:00
Mael Rouxel-Labbé
c2cb44175b
Add a reference to the paper
2019-08-26 13:24:51 +02:00
Mael Rouxel-Labbé
5cf6ec5261
Fix minor bug in 'is_default_parameter' usage
2019-08-26 13:05:50 +02:00
Mael Rouxel-Labbé
ae60ff2d15
Robustification of most visible vertex normal computation
2019-08-26 13:05:27 +02:00
Mael Rouxel-Labbé
6da2cebc8d
Sqrt -> Approximate_sqrt
2019-08-26 13:04:52 +02:00
Mael Rouxel-Labbé
ce9b3a890d
Use sin-based weights in the default vertex normal computation
2019-08-26 13:04:24 +02:00
Mael Rouxel-Labbé
b9f37cea38
Hide debug code behind macros
2019-08-26 13:03:22 +02:00
Mael Rouxel-Labbé
cf35771337
Robustify and incorporate most visible normal computations into standard fns
2019-08-23 16:29:36 +02:00
Mael Rouxel-Labbé
195a3319eb
Also remove isolated vertices in remove_negligible_CCs
2019-08-23 14:37:16 +02:00
Mael Rouxel-Labbé
bba6e57053
Misc code cleaning
2019-08-23 11:35:34 +02:00
Mael Rouxel-Labbé
ad90fa30fd
Fix potentially taking references to temporaries
...
For example, if the vertex point property map returned temporaries
2019-08-23 11:16:01 +02:00
Mael Rouxel-Labbé
f05a11dde5
Fix some internal functions not being in the 'internal' namespace
2019-08-23 11:15:41 +02:00
Mael Rouxel-Labbé
c65c5e0b42
Merge branch 'PMP-New_vertex_normal_computations-GF-old' into PMP-New_vertex_normal_computations-GF
2019-08-23 11:01:31 +02:00
Mael Rouxel-Labbé
923bd66ddf
Document remove_connected_components_of_negligible_size
2019-08-23 10:33:13 +02:00
Mael Rouxel-Labbé
68419d1e65
Remove_negligible_CCs now take two new NP: area and volume thresholds
...
If no treshold is provided, a default value is computed based on the length
of the diagonal of the bbox.
2019-08-23 09:24:17 +02:00
Mael Rouxel-Labbé
cd46683b48
Update NP syntax to new standards (choose_parameter / get_parameter)
2019-08-23 09:23:40 +02:00
Mael Rouxel-Labbé
83184032e6
Add a function 'number_of_CCs' for convenience
...
Just so that we don't have have to create the face map and such
if we only care about the number of CCs
2019-08-23 09:22:54 +02:00
Mael Rouxel-Labbé
fad61974d6
Merge branch 'PMP-Remove_small_CCs-old' into PMP-Remove_small_CCs
2019-08-22 14:22:41 +02:00
Mael Rouxel-Labbé
6d2ebc7a6e
Minor doc changes
2019-08-22 13:14:45 +02:00
Mael
023dfec313
Add const marker
2019-08-22 09:06:02 +02:00
Mael
be20ddb568
Add const marker
2019-08-22 09:05:14 +02:00
Mael
d2349066af
Add const marker
...
Co-Authored-By: Sebastien Loriot <sloriot.ml@gmail.com>
2019-08-22 09:03:01 +02:00
Mael Rouxel-Labbé
4bca5d114f
Rephrase end condition
2019-08-21 17:07:44 +02:00
Mael Rouxel-Labbé
afec55f375
Rephrase end condition
2019-08-21 17:06:55 +02:00
Mael Rouxel-Labbé
799916d7c5
Rephrase end condition
2019-08-21 17:04:39 +02:00
Mael Rouxel-Labbé
a1039b9d33
Fix boundary cycle stitching when nm vertices are present
2019-08-21 16:51:58 +02:00
Mael Rouxel-Labbé
b60f1f5205
stitch_borders() now returns the number of halfedge pairs that were stitched
2019-08-21 16:24:34 +02:00
Mael Rouxel-Labbé
9bd79323f6
Change guard name
2019-08-21 16:15:57 +02:00
Mael Rouxel-Labbé
7c09f56889
Minor changes to enable debug code
2019-08-21 16:10:04 +02:00
Mael Rouxel-Labbé
13f9d60518
Fix boundary cycle stitching when non-manifold vertices are present
2019-08-21 16:05:04 +02:00
Mael Rouxel-Labbé
7f55980ac6
Misc debug and code cleaning (no real changes)
2019-08-21 16:02:53 +02:00
Simon Giraudot
dd5fe73996
Document type of iterator (random access)
2019-08-21 15:43:50 +02:00
Simon Giraudot
790ed44613
Fix distance range type
2019-08-21 14:51:04 +02:00
Jane Tournois
77c8e68e07
fix the use of flip() inside fix_degenerate_faces()
...
the topological condition should be a strong condition, not an assertion
2019-08-20 17:23:32 +02:00
Maxime Gimeno
3b38ede8c4
Add CGAL_USE to manage case where assertions are ignored
2019-08-14 13:22:19 +02:00
Andreas Fabri
7db6c8e670
make const &
2019-08-12 07:51:32 -07:00
Andreas Fabri
52ca4f828f
Comment debug output as travis fails
2019-08-12 07:49:12 -07:00
Sébastien Loriot
760365987c
Merge branch 'cgal/releases/CGAL-4.14-branch'
2019-08-12 09:20:53 +02:00
Sebastien Loriot
e67611862b
Merge pull request #4129 from janetournois/PMP-fix_isotropic_remeshing_collapse-jtournois
...
Fix segfault in `PMP::isotropic_remeshing()`
2019-08-12 09:16:57 +02:00
Sebastien Loriot
eb712a67e9
Merge pull request #4094 from MaelRL/PMP-Snap_pp-GF
...
PMP: speed improvements for snap.h
2019-08-12 09:02:50 +02:00
Mael Rouxel-Labbé
82e1c93eef
Ensure that all vertices have a proper halfedge after non manifold duplication
2019-08-05 16:06:33 +02:00
Mael Rouxel-Labbé
9bf457ffcc
Fix duplicate nm vertices
...
There was an issue with keeping a valid incident halfedge for vertices
post-duplication
2019-08-05 15:38:30 +02:00
Mael Rouxel-Labbé
56354bcf8b
Use approximate sqrt because compute_area_3 does not work for some kernels
2019-08-02 12:14:25 +02:00
Mael Rouxel-Labbé
71304cf145
Fix np internal type
2019-08-02 11:04:26 +02:00
Mael Rouxel-Labbé
9f3009f88b
Add breathing room
2019-08-02 09:05:09 +02:00
Mael Rouxel-Labbé
22acb31a12
Add a function to remove small (in terms of area && volume) CCs
2019-08-01 16:10:52 +02:00
Mael Rouxel-Labbé
16cdbb4b8f
Avoid default constructing the traits
2019-08-01 16:10:36 +02:00
Mael Rouxel-Labbé
edbe852d4d
Simplify initialization
2019-08-01 16:10:14 +02:00
Jane Tournois
5f8a58a046
deal with faces on the boundary
...
a precondition inside `flip_edge()` fails if this boundary condition is not satisfied
2019-08-01 14:58:19 +02:00
Sébastien Loriot
b84297f8f6
update the usage for the new CGAL named function parameters
2019-07-29 09:38:39 +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
aa47744c36
update the usage for the new CGAL named function parameters
2019-07-28 22:30:17 +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
Mael Rouxel-Labbé
00f8f3ae43
Remove example that had been moved to test (snap already has two tests)
2019-07-19 09:07:01 +02:00
Sébastien Loriot
4a58db22b9
fix warnings
2019-07-18 20:01:44 +02:00
Mael
9ba0870ebd
Merge branch 'master' into PMP-Snap_pp-GF
2019-07-18 17:43:04 +02:00
Sébastien Loriot
41ef56f8ad
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD
2019-07-18 16:57:27 +02:00
Sébastien Loriot
c411ae69d0
Merge pull request #2951 from kkatrio/PMP-smoothing-kkatrio
...
PMP: Mesh and shape smoothing
2019-07-18 16:49:05 +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
Sebastien Loriot
8adc64dfe3
Merge pull request #3860 from MaelRL/PMP-Add_non_manifold_vertices_collector-GF
...
PMP: Add function 'non_manifold_vertices'
2019-07-18 16:38:15 +02:00
Sebastien Loriot
0c089d6f91
Merge pull request #3721 from sloriot/PMP-clip_fixes
...
Fixes for clipping
2019-07-18 16:28:44 +02:00
Mael Rouxel-Labbé
13e87ad3bd
Parallelize AABB tree traversal
2019-07-18 14:32:56 +02:00
Mael Rouxel-Labbé
3fe52056cf
Do not normalize bisector in most visible vertex computations
2019-07-18 11:19:03 +02:00
Mael Rouxel-Labbé
9d1cec6be6
Fix indentation (cosmetic)
2019-07-18 11:18:52 +02:00
Mael Rouxel-Labbé
1954203264
Change comment after tests
2019-07-17 15:22:10 +02:00
Mael Rouxel-Labbé
95982eb36f
Allow source vertex to snap to edges, even if they have been previously snapped
...
The key point is that the splitting point of a (target) halfedge
is assigned the position of the source vertex that breaks this target halfedge.
In other words, if multiple source vertices have the same position, we do
not have to track and move these together because they do not move anyway.
2019-07-17 14:54:41 +02:00
Mael Rouxel-Labbé
348b806d5e
Use some point references to avoid copies
2019-07-17 14:53:57 +02:00
Mael Rouxel-Labbé
a63c10c2cb
Use traits class functors for equality tests
2019-07-17 14:33:47 +02:00
Mael Rouxel-Labbé
0d617400bc
Accelerate AABB tree traversal by passing the tolerance as initial min_dist
2019-07-17 14:29:26 +02:00
Mael Rouxel-Labbé
ead092a62b
Clean useless includes
2019-07-17 14:28:14 +02:00
Mael Rouxel-Labbé
b39d728f45
Minor doc cleaning
2019-07-15 11:40:46 +02:00
Sébastien Loriot
560c77f567
rename named function parameter class
2019-07-15 06:25:02 +02:00
Sébastien Loriot
cebf0657d8
Use a full CGAL version of named function parameters
...
no longer rely on boost
2019-07-14 22:45:47 +02:00
Sébastien Loriot
0ff0b41ac8
remove unused code
2019-07-11 12:24:05 +02:00
Mael Rouxel-Labbé
a284ec00d4
Fix typo
2019-07-11 11:31:40 +02:00
Mael Rouxel-Labbé
c3d1977ac1
Explicitely specify parameter blocks
...
Might help windows...?
2019-07-11 11:30:48 +02:00
Sébastien Loriot
f1e2bf702c
improve code + make sure in tests that halfedges are correctly linked
2019-07-11 09:38:23 +02:00
Mael
b8b1989c65
Update macroname
...
Apparently called MINILOG_MAX_LOG_LEVEL on the installations that matter...
2019-07-10 15:38:51 +02:00
Mael Rouxel-Labbé
f019ace14c
Remove obsolete code
2019-07-10 08:57:21 +02:00
Mael Rouxel-Labbé
eb086c7847
Fix border case of normal computation at a vertex with valence 1
2019-07-09 18:07:11 +02:00
Mael Rouxel-Labbé
bfaa4e000d
Fix doc warning
2019-07-09 16:45:10 +02:00
Mael Rouxel-Labbé
675cd33dbc
Fix some edges not being properly cleaned from the active sets
2019-07-09 16:08:09 +02:00
Mael Rouxel-Labbé
7a9d0ccea8
Add some naive code to remove needles and caps
2019-07-09 15:26:01 +02:00
Mael Rouxel-Labbé
401aea2500
Add new method to compute vertex normals
2019-07-08 15:40:08 +02:00
Mael Rouxel-Labbé
0c8739a16e
Re-order convenience overloads to avoid forward declarations in upcoming code
2019-07-08 15:39:33 +02:00
Mael Rouxel-Labbé
1e9e37bd3c
Remove unused template typedef
2019-07-08 09:02:39 +02:00
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
b1eb4c8cdd
Minor documentation rewording
2019-07-02 21:15:52 +02:00
Mael Rouxel-Labbé
ba8a7175cc
Move helper functions for duplicate_nm_vertices to internal namespace
2019-07-01 11:46:05 +02:00
Mael Rouxel-Labbé
2ad648d276
Factorize duplicate_non_manifold_vertices() and non_manifold_vertices()
2019-07-01 11:42:26 +02:00
Mael Rouxel-Labbé
be89b9f575
Add a warning about the heavy complexity of 'is_vertex_non_manifold()'
2019-07-01 11:41:59 +02:00
Mael Rouxel-Labbé
f68141a6d3
Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF
2019-07-01 11:28:25 +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é
c862d2347d
Merge branch 'PMP-Add_non_manifold_vertices_collector-GF-old' into PMP-Add_non_manifold_vertices_collector-GF
2019-07-01 11:00:33 +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é
6f42e4be15
Fix warning
2019-06-24 08:16:01 +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
Mael Rouxel-Labbé
7a5486962d
Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF
2019-06-20 14:49:25 +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é
1b53056cbd
Precise some preconditions
2019-06-20 10:38:37 +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é
7f6cb0411c
Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF
2019-06-18 08:20:16 +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é
55cede0960
Remove duplicated typedefs
...
That compiled on my machine, but not on the Fedora testsuites...?
2019-06-10 10:39:34 +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
Mael Rouxel-Labbé
fa7b662ed3
Clean superfluous std::cout / comments
2019-06-07 10:27:21 +02:00
Mael Rouxel-Labbé
6865dae33d
Make some of the weights in PMP/Weights.h actually use the vpmap
2019-06-07 10:27:15 +02:00
Mael Rouxel-Labbé
aa6ef78eb3
Various fixes/improvements:
...
- Fix using Delaunay flips after angle smoothing (must be after area smoothing)
- Fix parameter passing to explicit curvature flow formulation
- Use early exits
- Clarify function names
2019-06-05 15:58:24 +02:00