Commit Graph

515 Commits

Author SHA1 Message Date
Laurent Rineau 851dfabd29 Merge pull request #2757 from maxGimeno/BGL-Add_facegraph_validity_check_function-GF
BGL:  Add a  FaceGraph validity check function
2018-05-28 13:58:07 +02:00
Maxime Gimeno 719033ad68 Create id-map on the fly if needed 2018-05-24 12:41:37 +02:00
Sebastien Loriot 9938100097
Merge pull request #2955 from afabri/BGL-include_cleanup-GF
Do not include some BGL related header files
2018-05-15 22:21:42 +02:00
Laurent Rineau 5a5195a4f4
Merge branch 'master' into PMP-stitch_after_orient-GF 2018-05-15 16:11:14 +02:00
Andreas Fabri 077354f76e Fix VC++ warning 2018-05-15 14:00:11 +01:00
Maxime Gimeno ac5b0e73af Fix warning 2018-05-07 12:51:36 +02:00
Maxime Gimeno 2f7d66e530 Clean-up 2018-05-07 12:50:41 +02:00
Maxime Gimeno 72c31ebfac Add a function in PMP to apply a CGAL::Aff_transformation_3 to a mesh. 2018-05-07 12:50:41 +02:00
Sebastien Loriot 1d6918ff4f
Merge pull request #2895 from kkatrio/triangulate_faces_fix
Triangulate faces : CDT2 / hole filling
2018-05-07 11:41:58 +02:00
Maxime Gimeno 47635f11fe Take fimap into account and add a test. 2018-05-03 14:55:49 +02:00
Andreas Fabri 991f3847e8 Do not include graph_traits_Polyhedron.h, properties_polyhedron.h and Polyhedron_iostream.h 2018-05-03 13:23:50 +02:00
Maxime Gimeno 9a77ece72f Add a test 2018-05-03 12:50:30 +02:00
Maxime Gimeno 88899310ab Fix massive typo in PMP test. 2018-05-03 12:03:14 +02:00
Maxime Gimeno 132cf694a0 remove is_valid() from the graph_traits 2018-05-03 12:03:14 +02:00
Maxime Gimeno 6dfa8d0ba3 replace CGAL_is_valid(Mesh) by CGAL::is_valid_polygon_mesh(Mesh) 2018-05-03 12:03:14 +02:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Andreas Fabri 3955f031bd Fix examples/tests/demos 2018-04-04 14:18:22 +01:00
Laurent Rineau d057f6d9f1 Merge pull request #2958 from sloriot/PMP-coref_more_coplanar_fixes
Update incorrectly handled coplanar intersection computation
2018-03-28 17:46:24 +02:00
Laurent Rineau 237735ab73 Merge pull request #2946 from afabri/CGAL-dependencies-GF
Move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh
2018-03-27 10:35:23 +02:00
Sébastien Loriot 8553713885 update incorrectly handled coplanar intersection computation
follow up of 6bb6f470c4
2018-03-26 11:20:16 +02:00
Laurent Rineau cd6fe20bd4 Merge branch 'releases/CGAL-4.11-branch' 2018-03-26 11:03:37 +02:00
Andreas Fabri 8c41669fb7 move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh 2018-03-22 16:37:37 +01:00
Sébastien Loriot 6bb6f470c4 update incorrectly handled coplanar intersection computation 2018-03-21 16:51:24 +01:00
Sébastien Loriot 9240f29ff8 update test to check both combinaisons 2018-03-21 16:51:24 +01:00
Konstantinos Katrioplas bec3227a00 add data test file 2018-03-16 15:13:42 +01:00
Konstantinos Katrioplas 0f14c1fad0 rm empty lines 2018-03-16 15:10:40 +01:00
Konstantinos Katrioplas 61735be71c deny triangulation for input of 3 points or less when using all search space 2018-03-16 14:08:43 +01:00
Konstantinos Katrioplas 8242c05f7c add the word main to be found by grep 2018-03-07 15:49:03 +01:00
Konstantinos Katrioplas 6edaa7a720 test different options using macro definitions 2018-03-07 11:41:31 +01:00
Konstantinos Katrioplas 9224e83c0a clean up 2018-03-05 13:05:37 +01:00
Sébastien Loriot 8cc234fe26 handle degenerate faces 2018-03-02 15:45:34 +01:00
Sébastien Loriot e478e12471 do not use Euler::add_face 2018-03-01 15:38:26 +01:00
konstantinos katrioplas 833c54faef using triangulate_hole_polyline 2018-03-01 12:59:52 +01:00
Sébastien Loriot 9160483098 fix Dual_vpm 2018-03-01 09:51:03 +01:00
konstantinos katrioplas 77bd6f7366 solve issue with vpmap 2018-03-01 09:16:53 +01:00
konstantinos katrioplas b400f39f1a vpmap 2018-02-28 21:47:37 +01:00
Konstantinos Katrioplas 18ec0740c4 wip on dual vpm 2018-02-28 15:27:14 +01:00
Konstantinos Katrioplas a765b152e3 wip - testing dual 2018-02-28 13:47:10 +01:00
Konstantinos Katrioplas 39ab6e00f4 test triangle face 2018-02-28 11:54:11 +01:00
Maxime Gimeno 9874046612 remove test. 2018-02-19 18:04:55 +01:00
Maxime Gimeno 3fdc7b67b2 remove non_filled_holes 2018-02-19 18:04:54 +01:00
Maxime Gimeno 1a1fcf9553 Add a test. 2018-02-19 18:04:03 +01:00
Maxime Gimeno 2758143116 fixing the topology test. 2018-02-19 18:04:03 +01:00
Simon Giraudot e00c4f67d6 Fix missing propagations of PSP named parameters API change 2018-01-10 16:39:34 +01:00
Laurent Rineau 42b11ddf29 Revert the merge of PR #2478
This reverts the merge commit 46cc91e787 onto
488c3e2879.
2018-01-04 17:54:08 +01:00
Sébastien Loriot 9fe73a801e Merge pull request #2552 from maxGimeno/PMP_does_intersect-GF
PMP: do_intersect
2018-01-04 15:34:18 +01:00
Sébastien Loriot ddd4112324 use named parameter 2017-12-20 09:26:48 +01:00
Sébastien Loriot d1597f2fb5 Merge branch 'maxGimeno/PMP_orient_connected_components-GF' into cgal/master 2017-12-19 17:34:51 +01:00
Sébastien Loriot 430ad5bc72 Merge branch 'maxGimeno/PMP_does_intersect-GF' into cgal/master 2017-12-19 17:31:29 +01:00
Laurent Rineau 61e662c4e4 Merge pull request #2649 from sgiraudot/BGL-Regroup_named_parameters-GF
Regroup PMP named parameters with BGL named parameters

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/parameters_interface.h
2017-12-19 16:33:44 +01:00
Laurent Rineau 1c2e9df8cf Merge branch 'releases/CGAL-4.11-branch' 2017-12-19 16:29:10 +01:00
Laurent Rineau 5181cd7474 Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
2017-12-19 16:19:22 +01:00
Sébastien Loriot 4b1430ca07 use a named parameter for choosing inward or outward orientation 2017-12-14 11:23:43 +01:00
Laurent Rineau fe81d31ec2
Merge branch 'master' into PMP_does_intersect-GF 2017-12-13 16:25:32 +01:00
Sébastien Loriot a1c39fdf11 rename test 2017-12-13 16:18:45 +01:00
Sébastien Loriot fe6b6b13e8 move internal functions in the PMP namespace 2017-12-13 15:45:42 +01:00
Sébastien Loriot 5a04bc7053 clean up 2017-12-13 13:31:09 +01:00
Mael Rouxel-Labbé 638bfee3fd Regroup and complete BGL named parameters tests
Along the way, apply the same fix as in f191e6114a
(*_sampling should be named use_*_sampling)
2017-12-13 10:49:50 +01:00
Sébastien Loriot 82f931f556 be more verbose in case of error 2017-12-13 10:18:08 +01:00
Maxime Gimeno 687e5b6c60 Add requirement close for orient function 2017-12-13 10:17:42 +01:00
Maxime Gimeno 6c42ce6958 Doc review 2017-12-13 10:17:08 +01:00
Maxime Gimeno 67d06cadb6 Add a function that orient a closed triangle mesh to make it bound a volume. 2017-12-13 10:17:04 +01:00
Maxime Gimeno 0f4f30b37b Add a boolean to specify output orientation 2017-12-13 10:16:58 +01:00
Maxime Gimeno b0cbe41a50 Fixes in test. 2017-12-13 10:16:52 +01:00
Maxime Gimeno dbb63e155d Fices in the doc and the test 2017-12-13 10:16:40 +01:00
Maxime Gimeno 9f986ea9ef Add a function and associated test that orient all the connected components of a triangulated face graph positively. 2017-12-13 10:16:23 +01:00
Laurent Rineau 68cf051563 Fix <CGAL/Polygon_mesh_processing/measure.h>
It requires `CGAL::exact(FT)` from `<CGAL/Lazy.h>`.

Fixes #2654.
2017-12-07 10:07:16 +01:00
Laurent Rineau bc3a0c7271 Merge pull request #2638 from sloriot/PMP-experimental_autorefinement
Add experimental autorefinement code
2017-12-05 18:26:23 +01:00
Sébastien Loriot c3571a1c44 fix int to bool conversion warning 2017-11-30 15:43:56 +01:00
Sébastien Loriot 56762a60a4 move all functions related to autorefinement in experimental namespace
+ remove all public documentation associated to it
2017-11-28 11:30:44 +01:00
Sébastien Loriot 55020142c7 make sure the mesh is cleared before filling it again 2017-11-28 10:21:45 +01:00
Sébastien Loriot b974c34ea4 add an example failing because there are locally 3 surfaces intersecting along an edge 2017-11-28 10:21:45 +01:00
Sébastien Loriot 6cce6b0995 add testsuite and testcases 2017-11-28 10:21:45 +01:00
Maxime Gimeno c940bbd20d Update doc 2017-11-27 15:58:56 +01:00
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
Maxime Gimeno ffd2f62aef add misisng test file 2017-11-17 12:55:28 +01:00
Maxime Gimeno 830f1e3f80 add volumic tests and tests data files 2017-11-17 12:55:28 +01:00
Maxime Gimeno 4d19c0e1b1 Add named parameters and fix mesh id in range calculation. 2017-11-17 12:55:28 +01:00
Maxime Gimeno 691649590c Add a function to compute the number of pairs of intersecting meshes in a range of meshes. 2017-11-17 12:55:28 +01:00
Maxime Gimeno 27f29bc6f2 Add overloads for polylines ranges and tests that go with them 2017-11-17 12:55:27 +01:00
Maxime Gimeno edc49e77b7 Move intersection computation functions in internal. 2017-11-17 12:55:05 +01:00
Maxime Gimeno ece79dd277 Add default values for NPs and no more need for Kernel in do_intersect. Also rename and un-document intersection functions. 2017-11-17 12:55:05 +01:00
Maxime Gimeno 47defffbdb Documents the new functions 2017-11-17 12:55:05 +01:00
Maxime Gimeno 5a5accaaa8 Move intersection code into a header 2017-11-17 12:55:04 +01:00
Maxime Gimeno b9803ec94b do_intersect() working for 2 Polylines 2017-11-17 12:55:04 +01:00
Maxime Gimeno 7d6bad9ab4 Do_intersect for faces and face-polylines working 2017-11-17 12:55:04 +01:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01:00
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +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 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 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 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +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
Laurent Rineau 5b1828cda2 Merge pull request #2445 from sloriot/PMP-fix_is_stitchable
Fix stitchable conditions
2017-09-20 11:13:30 +02:00
Sébastien Loriot c84014992a fix the collection of edges to stitch
we ignore those incident to a degenerate edge on the border
2017-09-19 15:08:19 +02:00
Maxime Gimeno d5ea0b6cbc Fix warnings and copy PMaps in detect_features.h 2017-09-05 12:03:35 +02:00
Jane Tournois e2e5b1ed05 edge_is_feature_map is not an optional parameter
see reviews in the small feature
2017-08-18 10:51:25 +02:00
Jane Tournois 2c0b185803 little cleaning 2017-08-17 17:32:35 +02:00
Maxime Gimeno 43ff0d092c Implementation review Jane and sebastien 2017-08-11 15:30:03 +02:00
Maxime Gimeno 723492def1 Use existing named_parameters and vertex_incident_patches becomes lvaluepmap, 2017-08-10 15:16:27 +02:00
Maxime Gimeno 32999ddd78 New pass over doc, tests and examples 2017-08-07 14:50:23 +02:00
Maxime Gimeno 1fe1e21bb6 Replace maximum_surface_patch by first_index. 2017-08-07 13:32:02 +02:00
Maxime Gimeno 1bad0e7202 Use edges instead of halfedges for edge_is_feature_t and map 2017-08-07 11:39:07 +02:00
Maxime Gimeno 222f7f3965 Add an example and a test for detect_features 2017-08-04 15:32:16 +02:00
Laurent Rineau f8760d591b Merge pull request #2136 from afabri/Polygon_mesh_processing-accelerate_isotropic_remeshing-GF
Polygon_mesh_processing: Accelerate Isotropic_remeshing
2017-07-21 10:45:32 +02:00
Laurent Rineau d30a20d323 Fix a compilation error
remesh.h must be included after the headers that include the properties
for the face graphs.
2017-07-12 15:26:08 +02:00
Laurent Rineau 78c37a578d Fix indentation 2017-07-12 15:26:08 +02:00
Andreas Fabri 70b13af39c Do not pollute the boost namespace 2017-07-12 12:11:34 +02:00
Andreas Fabri 3ff34b4b23 cleanup 2017-07-11 20:32:23 +02:00
Andreas Fabri 886bd840cf Make the dynamic property map an implementation detail 2017-07-11 20:32:23 +02:00
Andreas Fabri 24012f3fd7 Fix testsuite for isotropic remeshing of an OpenMesh - it now works 2017-07-11 20:32:23 +02:00
Andreas Fabri d291f572cb Add a testcase for isotropic remeshing of Polyhedron and OpenMesh 2017-07-11 20:32:23 +02:00
Andreas Fabri 5ba2161d21 Make isotropic remeshing compile with OpenMesh 2017-07-11 20:32:22 +02:00
Andreas Fabri 4fc8f93154 Make mean_curvature_plugin work with Surface_mesh. TODO: colored faces 2017-07-10 16:03:07 +02:00
Guillaume Damiand 4c9bbc06af Merge branch 'master' into BGL-LCC-gdamiand 2017-06-30 17:18:53 +02:00
Guillaume Damiand 685fe45c8e Bug fix in surface_intersection_sm_poly about filenames used by default. 2017-06-29 10:35:37 -04:00
Mael Rouxel-Labbé fd6825acbf Fixed return type in measure_tests 2017-06-22 16:17:13 +02:00
Andreas Fabri 7997925bf8 Add a function longest_border(PolygonMesh&) to PMP 2017-06-22 16:11:38 +02:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand f5a94891bb Update examples and demo that use BGL for LCC. 2017-06-14 11:42:15 -04:00
Laurent Rineau 9aea1f228d Merge pull request #2105 from sloriot/PMP-stitch_avoid_creating_non_manifold_edges
prevent the merge of two vertices that would create a non-manifold edge
2017-05-19 10:29:57 +02:00
Laurent Rineau de757b671e Merge pull request #2105 from sloriot/PMP-stitch_avoid_creating_non_manifold_edges
prevent the merge of two vertices that would create a non-manifold edge
2017-05-19 10:27:40 +02:00
Laurent Rineau 3b1ebdb574 Merge pull request #2057 from janetournois/PMP-fix_is_outward_oriented-GF
PMP : fix `PMP::is_outward_oriented()`

(From a merge of 'cgal/releases/CGAL-4.10-branch', plus a merge of the
commit 'a6e2783'. That commit fixes the incompatibility with recent
changes in `master`.)
2017-05-17 13:02:38 +02:00
Sébastien Loriot d4fa3c860c fix test incorrectly simplified test 2017-05-12 09:49:44 +02:00
Sébastien Loriot 51dce78e78 fix the last step of the algorithm to pick the top face along the z-axis 2017-05-12 09:49:43 +02:00
Sébastien Loriot 976ba8b75a fix the outward orientation test 2017-05-12 09:49:43 +02:00
Laurent Rineau 7aad2a560c Merge pull request #1891 from maxGimeno/PMP_named_params_macro-GF
Use macros to add parameters in PMP
2017-05-11 17:09:38 +02:00
Sébastien Loriot 9487c56cab fix copy-paste error 2017-05-11 10:42:33 +02:00
Guillaume Damiand a22a5fbd21 Update BGL LCC examples and tests following the modification of the API (helper class) 2017-05-10 13:27:37 -04:00
Sébastien Loriot 7a841cad48 prevent the merge of two vertices that would create a non-manifold edge 2017-05-10 18:55:03 +02:00
Guillaume Damiand 3f382fe6b4 Add more examples for LCC BGL 2017-03-28 12:52:31 -04:00
Andreas Fabri 58bcecc497 License check for Corefinement and Distance 2017-03-22 14:07:52 +01:00
Andreas Fabri cd7deb8577 License check for Corefinement and Distance 2017-03-22 12:32:43 +01:00
Andreas Fabri 774bdc4351 License check for Geometric Meshing and Hole Filling 2017-03-22 12:10:37 +01:00
Andreas Fabri fde105b437 License check for Predicates 2017-03-22 10:29:59 +01:00
Andreas Fabri 51bbe5d1f6 License check for Geometric Measures and Miscellaneous 2017-03-22 10:05:39 +01:00
Andreas Fabri 9bcf8b040e move corefinement specific code from PMP to Operations_on_polyhedra 2017-03-22 09:12:30 +01:00
Sebastien Loriot 5b6cf1cfae Merge pull request #1976 from sloriot/PMP-coref_bugfix_tangent_cases
Correctly handle edge tangency cases
2017-03-20 16:11:17 +01:00
Sébastien Loriot 0b29878f6d better handling of tangency
correctly handle dangling intersection polylines
that appear when models are tangent along an edge
2017-03-16 18:44:13 +01:00
Sébastien Loriot 58f59d0af0 add new data set to test tangent cases 2017-03-16 15:38:54 +01:00
Sébastien Loriot a79f461548 be more permissive for open meshes 2017-03-15 17:13:40 +01:00
Sébastien Loriot 259155edb3 improve the coref-bool-op test to also check possible results are as expected 2017-03-15 16:49:32 +01:00
Jane Tournois b6d88274fb deactivate output to files in the testsuite
it takes long and is not really useful for the tests
2017-03-14 16:20:28 +01:00
Jane Tournois f9fe9a5e6a add assertions to the PMP testsuite 2017-03-14 15:46:48 +01:00
Sébastien Loriot 7c51ddc606 remove commented lines 2017-02-13 10:28:27 +01:00
Sébastien Loriot e9395aba6f move enum for named parameters inside internal_np namespace 2017-02-13 10:25:28 +01:00
Sébastien Loriot 2068ba14ce remove non used named parameter 2017-02-10 16:45:18 +01:00
Maxime Gimeno 0f9c102516 Move the enums in a namespace parameters to clean-up the namespace CGAL. 2017-02-09 15:29:18 +01:00