Commit Graph

91625 Commits

Author SHA1 Message Date
Laurent Rineau 0e6302d1d5 Remove CGAL_REFERENCE_CACHE_DIR
That no longer works with header-only, anyway. Now we use the option
`-C` of CMake, with a small file loaded from the environment variable
`INIT_FILE`.
2020-07-02 15:02:20 +02:00
Jane Tournois 48ca4bcb42 dimension is just the max(dimension(v1), dimension(v2)) 2020-07-02 14:37:09 +02:00
Jane Tournois 948b08d1fa use Mesh_polyhedron_3 in example 2020-07-02 14:20:15 +02:00
Jane Tournois b519de793b replace BOOST_MSVC by _MSC_VER
The problem was that BOOST_MSVC is defined by <boost/config.hpp>, that is included later.
2020-07-02 13:59:41 +02:00
Laurent Rineau 0f51c426d3 Add a new script that helps dealing with `integration` 2020-07-01 16:37:32 +02:00
Sébastien Loriot 2ce4d6f1af try to please old QT versions 2020-07-01 16:16:26 +02:00
Maxime Gimeno f6bfc69162 add missing reserve() using interanl helpers 2020-07-01 15:47:06 +02:00
Sebastien Loriot 16e38e4dec
Apply suggestions from code review
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2020-07-01 14:48:09 +02:00
Jane Tournois 460b1f29a6 Merge branch 'master' into Tet_remeshing-from_c3t3_input-jtournois
# Conflicts:
#	Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_adaptive_remeshing_impl.h
2020-07-01 08:01:05 +02:00
Jane Tournois 2ae4e28de7 do not collapse when the cells set for collapse does not represent a manifold surface
trying to make the cells set manifold is not easy, and quite costly, so let's just
check whether the cells set surface is manifold and cancel the collapse if not
2020-07-01 07:52:55 +02:00
Laurent Rineau 9cfb0401a4 updated crontab (automated commit) 2020-06-30 17:18:05 +02:00
Laurent Rineau f1d1554e5b Merge branch 'releases/CGAL-5.0-branch' 2020-06-30 16:39:36 +02:00
Laurent Rineau e439aaf30c Merge pull request #4556 from theartful/arrangments_bugfix
Fix Bezier intersection bug around the boundaries (issue #3381)

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_cache.h
2020-06-30 16:39:17 +02:00
Laurent Rineau b8ac296757 Merge pull request #4791 from MaelRL/PMP-Fix_remove_SI_hole_filling_non_simple_border-GF
PMP: remove_self_intersections() fixes
2020-06-30 16:38:08 +02:00
Laurent Rineau 07eacf5231 Merge pull request #4795 from janetournois/Mesh_3-fix_optimisers_parallel-jtournois
Mesh_3 - fix parallel optimisers
2020-06-30 16:38:05 +02:00
Laurent Rineau 4537d217c7 Merge pull request #4812 from janetournois/Tet_remeshing-fix4808-jtournois
Tetrahedral remeshing : fix a bug in collapse
2020-06-30 16:38:03 +02:00
Laurent Rineau 10834e4ef4 Merge pull request #4813 from MaelRL/Polyhedron-fix_const-GF
Remove 'const' markers in Polyhedron-modifying functions
2020-06-30 16:37:59 +02:00
Laurent Rineau 8d59d04a1f Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-06-30 16:37:40 +02:00
Laurent Rineau cba160f7f0 Merge pull request #4556 from theartful/arrangments_bugfix
Fix Bezier intersection bug around the boundaries (issue #3381)
2020-06-30 16:37:01 +02:00
Laurent Rineau ad23db27a3 Merge pull request #4795 from janetournois/Mesh_3-fix_optimisers_parallel-jtournois
Mesh_3 - fix parallel optimisers
2020-06-30 16:36:58 +02:00
Laurent Rineau 414bb92246 Merge pull request #4813 from MaelRL/Polyhedron-fix_const-GF
Remove 'const' markers in Polyhedron-modifying functions
2020-06-30 16:36:55 +02:00
Laurent Rineau 3e6499700e Merge pull request #4556 from theartful/arrangments_bugfix
Fix Bezier intersection bug around the boundaries (issue #3381)
2020-06-30 16:36:20 +02:00
Laurent Rineau 93d9b1d399 Merge pull request #4813 from MaelRL/Polyhedron-fix_const-GF
Remove 'const' markers in Polyhedron-modifying functions
2020-06-30 16:36:16 +02:00
Sébastien Loriot 41d8a2bc3e improve ui of needles/caps removal 2020-06-30 14:02:32 +02:00
Sébastien Loriot 3a53d241c8 add constructor from base 2020-06-30 09:51:05 +02:00
Jane Tournois 40668a297e fix protection of parallel code 2020-06-29 07:07:13 +02:00
Jane Tournois 7929922966 remove useless 2020-06-26 15:58:44 +02:00
Jane Tournois 33b1283030 remove capitals
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2020-06-26 15:58:44 +02:00
Jane Tournois 92f9802123 protect is_valid() tests with DEBUG macro
they are verbose and that's annoying
2020-06-26 15:58:44 +02:00
Jane Tournois 3ac540c8a9 add a comment about using std::move(c3t3) in the example 2020-06-26 15:58:44 +02:00
Jane Tournois c5081c7880 doc 2020-06-26 15:58:44 +02:00
Jane Tournois 8253c30e0f ref manual 2020-06-26 15:58:44 +02:00
Jane Tournois 789b8c4803 add tests for mesh_3 + remeshing 2020-06-26 15:58:44 +02:00
Jane Tournois 6f610a4b6d do not use Tr::Tr_Base (not documented) but Triangulation_3
as input for convert_to_triangulation_3
2020-06-26 15:58:43 +02:00
Jane Tournois 5734200c51 add convert_to_base_triangulation
change the API and avoid tetrahedral_isotropic_remeshing(c3t3)
2020-06-26 15:58:43 +02:00
Jane Tournois f1a524234d do not mention concurrency of Mesh_3 in this example 2020-06-26 15:58:43 +02:00
Jane Tournois e9acd8f191 clean rebase/conflicts errors 2020-06-26 15:58:43 +02:00
Jane Tournois 96e966509f missing comma
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2020-06-26 15:58:43 +02:00
Jane Tournois 44d5a331fe doc improvement
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2020-06-26 15:58:43 +02:00
Jane Tournois f8dc62ac57 missing comma
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2020-06-26 15:58:43 +02:00
Jane Tournois 7e457ea8b9 fix typo
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2020-06-26 15:58:34 +02:00
Jane Tournois a1bd8f73f2 add example to doc 2020-06-26 15:54:18 +02:00
Jane Tournois 7740686d78 remove trailing whitespace 2020-06-26 15:54:17 +02:00
Jane Tournois 121fbbbb1c add example to the user manual 2020-06-26 15:54:17 +02:00
Jane Tournois 3385d3643c add doc for tetrahedral_isotropic_remeshing(c3t3)
and an example to run mesh_3 + remeshing in a row
2020-06-26 15:54:17 +02:00
Jane Tournois fe8e763269 fix errors in conflicts resolution 2020-06-26 15:54:16 +02:00
Jane Tournois 7c97c86039 set Index in vertex_base
to have consistent typeq between what is stored in Index (a boost::variant)
and the dimension of the lowest-dimensional feature to which it belongs
2020-06-26 15:53:02 +02:00
Jane Tournois 2a3dba9156 make build_triangulation() more generic with Surface_patch_index instead of int
this is necessary to be able to remesh a C3t3 with a Surface_patch_index that
is not convertible to `int`
It is the case with meshes generated from images, which often use
std::pair<Subdomain_index, Subdomain_index>
2020-06-26 15:53:02 +02:00
Jane Tournois 615ac14086 protect incident_cells_threadsafe with macro
Periodic_3_mesh_3 does not have an implementation of these functions
because it does not have a parallel implementation
2020-06-26 15:51:15 +02:00
Jane Tournois bce4b4e80a Revert "add an assertion in make_canonical"
This reverts commit f55ffabbe0.
In the exuder, it can happen that this function takes the triple
(Vertex_handle(), Vertex_handle(), Vertex_handle())
so the assertion does not hold
2020-06-26 14:57:02 +02:00