Laurent Rineau
bc36af5eed
Fix CMake warnings about mixed usage of target_link_libraries
...
See https://cmake.org/cmake/help/v3.0/policy/CMP0023.html
2017-11-22 11:06:26 +01:00
Laurent Rineau
0681ac6dbc
Fix the TBB_USE_FILE warnings
2017-11-15 17:00:02 +01:00
Laurent Rineau
86fb40832a
Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
...
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Laurent Rineau
c6068691fa
Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
...
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
Laurent Rineau
62c70d41ca
Renew the handle of policies, for CMake-3.10
...
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.
`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Laurent Rineau
7caa6ea021
Merge pull request #2514 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois
...
Polyhedron demo - fix isotropic remeshing plugin
2017-10-23 16:53:18 +02:00
Jane Tournois
5a45fdf99d
Merge branch 'PMP-fix_isotropic_remeshing_next_to_corners-jtournois' into Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois
2017-10-17 15:45:30 +02:00
Jane Tournois
fb0d7840d5
remove useless check for reverse version
2017-10-17 15:30:37 +02:00
Jane Tournois
aa758493b1
Merge branch 'PMP-fix_isotropic_remeshing_next_to_corners-jtournois' into Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois
...
# Conflicts:
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h
2017-10-16 14:49:02 +02:00
Jane Tournois
03e7265cef
a Polyhedron_3 does not have an internal pmap for face_patch_id_t
...
so the condition was always returning false for a Polyhedron
we are inside the demo, so this condition can be safely removed
2017-10-16 13:04:42 +02:00
Laurent Rineau
46cc91e787
Merge pull request #2478 from mtola/master
...
fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during …
2017-10-13 17:06:22 +02:00
Laurent Rineau
0533547da9
Merge pull request #2447 from sloriot/Demo-add_more_repair_functions
...
add more repair functions in the Polyhedron demo
2017-10-13 17:00:47 +02:00
Laurent Rineau
6bda8ad7d5
Merge pull request #2516 from janetournois/PMP-fix_isotropic_remeshing_with_isolated_vertices-jtournois
...
PMP - fix isotropic remeshing with isolated vertices
2017-10-13 16:54:35 +02:00
Sébastien Loriot
01bda3f852
add function to close boundary cycle of size 2
...
use it after the general stitching function
2017-10-12 14:38:41 +02:00
Sébastien Loriot
a2cc276ccb
simplify the code by avoid to have an extra map for the edge to be stitched
...
the code changes a little bit the output as some border cycles of size 2
can be created (these edges were not set for stitching for example if
there were a third edge that could be stitched and was rejected by the
manifold test)
2017-10-12 14:19:58 +02:00
Laurent Rineau
107cdccd6d
Merge pull request #2438 from lrineau/Mesh_3-test_polyhedral_complex_with_surface_mesh-GF
...
Mesh_3: make it work with Surface_mesh
2017-10-11 19:14:49 +02:00
Jane Tournois
8d486694dc
use check_normals() inside collapse_does_not_invert_face()
2017-10-10 12:51:04 +02:00
Jane Tournois
c657f43f19
deal with more than 2 surface patches in check_normals(v)
...
until now it did not deal with the corner cases
2017-10-10 12:16:03 +02:00
Jane Tournois
6e8bb6b03e
deal with more than 2 patches in the collapsibility checks
2017-10-10 11:48:37 +02:00
Jane Tournois
ddaad24e63
add corner case conditions for collapsibility
2017-10-10 11:46:31 +02:00
Jane Tournois
5cc6209528
filter out isolated vertices
...
for tangential_relaxation and projection
2017-10-09 16:38:57 +02:00
Jane Tournois
6a5c46dd50
remove duplicate member variable
2017-10-09 11:27:06 +02:00
Jane Tournois
3e4e4968f7
add missing vertex_point_map
2017-10-09 11:26:34 +02:00
Jane Tournois
f6418c6145
add a little verbosity
2017-10-09 11:22:54 +02:00
Laurent Rineau
7e9f756935
Replace all std::unary_function by CGAL::unary_function
2017-10-04 15:57:09 +02:00
Sébastien Loriot
e9cb74d927
remove doc of parameter removed
2017-10-03 14:00:50 +02:00
Sébastien Loriot
26c1543d14
remove the requirements on the absence of degenerate edges
...
it is no longer needed thanks to the union-find used to merge vertices
2017-10-03 13:58:12 +02:00
Sébastien Loriot
7fdf9cad8c
integrate the are_vertices_stitchable test into the check for non-manifold edges
...
also reinit the union-find on vertices as the master vertex kept
might be one marked as non-stitchable
2017-10-03 13:41:58 +02:00
Sébastien Loriot
d23b301cea
filter edges to be stitched to avoid creating non-manifold vertices
...
edges filtered have two endpoints to be merged
2017-10-02 16:20:05 +02:00
Sébastien Loriot
07bb1d6839
use union-find to merge vertices and decide which vertex to keep
...
This is needed if two patches have edges stitched with identical
vertex point coordinates.
2017-09-29 17:51:58 +02:00
Sébastien Loriot
67791520a1
ignore degenerate edges during the collection of edges to stitch
2017-09-29 16:39:34 +02:00
Sébastien Loriot
671b7abcb6
do nothing is the model is fixed
2017-09-20 14:33:37 +02:00
Sébastien Loriot
78f3d1a38d
extract the function removing faces and filling hole ...
...
... and use it to handle deg faces
2017-09-20 14:33:37 +02:00
Sébastien Loriot
ea34f1b2dd
remove assertions that are using Surface_mesh features
2017-09-20 14:33:37 +02:00
Sébastien Loriot
03cff151ba
factorize the code
2017-09-20 14:33:36 +02:00
Sébastien Loriot
488858cacc
add a check (not yet factorized) to prevent invalid removal of degenerate faces
2017-09-20 14:33:36 +02:00
Sébastien Loriot
0bc5e715e9
add more debug
2017-09-20 14:33:36 +02:00
Sébastien Loriot
90a4e2eefd
add a condition to prevent a flip that is not possible
2017-09-20 14:33:36 +02:00
Sébastien Loriot
6e9cbde3b1
add a method to remove degree 3 vertices in caps degenerate triangles
2017-09-20 14:33:36 +02:00
Sébastien Loriot
b347c88bc5
add some debug code
2017-09-20 14:33:36 +02:00
Sébastien Loriot
7dbbfc5647
add an option to control the merge of vertex points
...
this is conveniant if we do not want to modify the mesh
when the function is called
2017-09-20 14:33:35 +02:00
Sébastien Loriot
f77baded9b
add function to collect pairs of halfedges closed (up to epsilon)
2017-09-20 12:57:17 +02:00
Sébastien Loriot
18725e8841
rename internal function
2017-09-20 12:57:17 +02:00
Sébastien Loriot
4c496ffa83
remove the stitching modifier and use a function instead
2017-09-20 12:57:17 +02:00
Sébastien Loriot
e392b79883
Merge remote-tracking branch 'cgal/releases/CGAL-4.11-branch'
2017-09-20 12:54:11 +02:00
Sébastien Loriot
a7caa5c433
Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch'
2017-09-20 12:53:27 +02:00
Sébastien Loriot
47e20a4a15
add missing include directive
2017-09-20 12:52:35 +02:00
Laurent Rineau
9d013d2e59
Fix the default AABB tree in Side_of_triangle_mesh
2017-09-20 12:03:32 +02:00
Laurent Rineau
8f9ea82a14
Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch
2017-09-20 11:17:43 +02:00
Laurent Rineau
5b1828cda2
Merge pull request #2445 from sloriot/PMP-fix_is_stitchable
...
Fix stitchable conditions
2017-09-20 11:13:30 +02:00