Commit Graph

384 Commits

Author SHA1 Message Date
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Sébastien Loriot 61169b394e Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2019-01-04 17:19:19 +01:00
Sébastien Loriot 45066e7d91 Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2019-01-04 17:17:03 +01:00
Sébastien Loriot 5a1b51bdd0 fix warning 2019-01-02 10:11:28 +01:00
Sébastien Loriot 3bfc09de3f add comments 2018-12-31 09:42:55 +01:00
Andreas Fabri ecc89af2b2 Fix Surface_mesh::join() 2018-12-31 09:34:51 +01:00
Maxime Gimeno 8691ea6805 Replace Fucntor by Visitor 2018-12-21 10:19:29 +01:00
Maxime Gimeno eb50bbb4b4 Fix typo 2018-12-21 10:16:07 +01:00
Maxime Gimeno 95c2045eb6 Fix conflicts 2018-12-21 09:02:26 +01:00
Maxime Gimeno 5ca79f8268 Add a visitor for collect_garbage. Add und for add and remove center_vertex 2018-12-20 12:45:35 +01:00
Laurent Rineau b45284184c Merge pull request #3532 from maxGimeno/Surface_mesh-Fix_IO-GF
Surface_mesh: Fix segfault in read_off()
2018-12-19 16:06:54 +01:00
Laurent Rineau 0ec8873a37 Merge pull request #3538 from maxGimeno/BGL-Fix_add_face-GF
BGL: Fix Euler::add_face()
2018-12-19 16:01:14 +01:00
Laurent Rineau b569aa4143 Merge pull request #3532 from maxGimeno/Surface_mesh-Fix_IO-GF
Surface_mesh: Fix segfault in read_off()
2018-12-19 15:45:50 +01:00
Laurent Rineau eb51562fe9 Merge pull request #3538 from maxGimeno/BGL-Fix_add_face-GF
BGL: Fix Euler::add_face()
2018-12-19 15:45:45 +01:00
Laurent Rineau b5ad256078 Merge pull request #3532 from maxGimeno/Surface_mesh-Fix_IO-GF
Surface_mesh: Fix segfault in read_off()
2018-12-19 15:44:34 +01:00
Maxime Gimeno c51852f8a1 Add check in collect_garbage() 2018-12-13 09:34:05 +01:00
Simon Giraudot 17792e53b8 Fix return type 2018-12-12 10:51:34 +01:00
Simon Giraudot 6e4815064e Add methods to easily transfer properties from one point set to another 2018-12-12 10:51:34 +01:00
Maxime Gimeno b04369cc6b Don't assert OFF type 2018-12-11 14:55:00 +01:00
Maxime Gimeno 548f86b98b Check stream state before allocating memory. 2018-12-11 14:35:25 +01:00
Sébastien Loriot 56de16c9c0 workaround (a compiler bug?) 2018-12-07 10:44:25 +01:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Sébastien Loriot d940632471 Merge pull request #3258 from MaelRL/PMP-Filter_degenerate_polygon_soup_input-GF
PMP: repair polygon soup
2018-11-02 10:37:58 +01:00
Laurent Rineau 3c6538f80f Merge pull request #3377 from Simon-Lopez/simon_cgal_#3375
Proposal to fix issue #3375
2018-10-29 10:42:37 +01:00
Laurent Rineau 821f9c015e Merge pull request #3311 from sloriot/Doc-Pkg_link_name
Update the name of package names reference links
2018-10-29 10:27:53 +01:00
Laurent Rineau fb7dc495b0 Merge pull request #3377 from Simon-Lopez/simon_cgal_#3375
Proposal to fix issue #3375
2018-10-29 10:27:41 +01:00
Sébastien Loriot 915c3e7fec use a vector for dynamic properties of const Surface_mesh
also done for OpenMesh types
2018-10-25 17:05:21 +02:00
Sébastien Loriot 72acbee3f5 fix warnings 2018-10-24 11:12:55 +02:00
Guillaume Damiand ae5b6e00ad Bug fix in basic viewers when using EPEK.
For polyhedron, surface mesh and LCC viewers, we compute face and vertex normals in the basic viewers. These normals should be computed in a Vector_3 of a non exact kernel.
2018-10-15 14:58:52 +02:00
Andreas Fabri 0dc1cf2aeb Dón't use CGAL_TEST_SUITE as travis and even me are not the testsuite 2018-10-12 10:25:42 +02:00
Andreas Fabri 992294f79f Add a testcase for Surface_mesh::join() 2018-10-10 10:43:22 +02:00
Simon Lopez 3622f1cfec Proposal to fix issue #3375 2018-10-10 10:43:22 +02:00
Mael Rouxel-Labbé d18e21cfe7 Merge branch 'PMP-Filter_degenerate_polygon_soup_input-GF-old' into PMP-Filter_degenerate_polygon_soup_input-GF 2018-10-08 16:19:26 +02:00
Sébastien Loriot 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot 376bc42716 update URL and use https 2018-09-04 13:29:51 +02:00
Maxime Gimeno 8d0a67095f Merge branch 'master' into IntrinsicFaceGraph-V2 2018-08-01 15:40:36 +02:00
Mael Rouxel-Labbé 16a9bc4d7c Fixed some links / concepts related to sgi.com and cppreference 2018-07-26 16:27:58 +02:00
Sébastien Loriot 82ef11845f fix constness issues 2018-07-18 14:31:14 +02:00
Sébastien Loriot a31753df4a handle const graph for face dynamic tag 2018-07-18 09:12:05 +02:00
Laurent Rineau 5023020809 Merge pull request #3126 from sgiraudot/Classification-Clusters_and_meshes-GF
Classification 2.0
2018-07-12 11:37:13 +02:00
Sébastien Loriot cf91f7037e Merge branch 'cgal/releases/CGAL-4.12-branch' 2018-07-09 09:26:24 +02:00
Sébastien Loriot 73e3e86980 make the test compiles.
@afabri This shows what I meant in https://github.com/CGAL/cgal/issues/3138
Here the fix is only minimal, but it should be done consistently for all
simplex type of Surface_mesh, and also probably for OpenMesh types
2018-07-06 09:13:02 +02:00
Simon Giraudot e1da290f13 Fix conversion warning 2018-07-05 09:08:28 +02:00
Simon Giraudot d27c5a97db Make Index_iterator of Surface_mesh really compliant to random access concept 2018-07-05 09:08:27 +02:00
Simon Giraudot b894992e8d Make Surface Mesh Index_iterator random access 2018-07-05 09:07:31 +02:00
Sébastien Loriot 6d0cca9a29 convenience function write_off uses documented one 2018-06-29 08:46:21 +02:00
Laurent Rineau 0e4e50f2e7 Merge pull request #3060 from maxGimeno/BGL-read_write_off_use_np-GF
BGL: Use Named Parameters in OFF I/O
2018-06-27 10:21:33 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +02:00
Maxime Gimeno ee94efc76e Fix Surface_mesh example 2018-05-29 12:00:30 +02:00
Andreas Fabri 4b14990209 Fix warnings; Remove typename in non-template code 2018-05-29 11:11:50 +02:00
Guillaume Damiand c62fb2b01e Move include iostream. 2018-05-29 11:11:49 +02:00
Guillaume Damiand b361e78a99 Add missing include 2018-05-29 11:11:49 +02:00
Guillaume Damiand 39de8ac459 Add licence includes 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 23426e70c4 Remove macro modified. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 6e83b034dc Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 73905ce8dd Avoid to run the viewer for the CGAL test suite. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5d375eff74 Update all basic viewers to have the correct behavior when CGAL_USE_BASIC_VIEWER is not defined. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5e5a9611db Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined. 2018-05-29 11:04:57 +02:00
Guillaume Damiand a59c5f6398 Update all basic viewers to allow to have a color functor as parameter. 2018-05-29 11:04:57 +02:00
Guillaume Damiand d881a203e2 Update LCC, Polyhedron and Surface mesh viewers to follow last modification of basic viewer. 2018-05-29 11:02:00 +02:00
Guillaume Damiand f70c6fed86 Update basic viewer to: (1) use a generic class that can maybe be used also in demos; (2) use same name to add mono/colored objects. 2018-05-29 11:02:00 +02:00
Guillaume Damiand a899052b3b Add viewer for surface mesh. 2018-05-29 11:01:59 +02:00
Maxime Gimeno 132cf694a0 remove is_valid() from the graph_traits 2018-05-03 12:03:14 +02:00
Maxime Gimeno 7a5e821183 fixes 2018-04-27 15:28:00 +02:00
Maxime Gimeno c4da8690cb Add NamedParameters to the off IO functions. 2018-04-26 14:00:06 +02:00
Laurent Rineau 2df75cb8ef Merge pull request #2995 from MaelRL/Doc-Fix_minor_issues-GF
Doc: fix minor issues in Surface_mesh and SMP
2018-04-06 18:12:15 +02:00
Mael Rouxel-Labbé 5ff2a0d315 Fixed minor doc issues in Surface_mesh 2018-04-06 11:48:13 +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
Laurent Rineau 3c70f8bad0 Fix dependencies by moving files 2018-03-23 14:17:24 +01:00
Laurent Rineau c504ea3e9f Fixes
- cleanup
- be careful not to add things to the documentation
2018-03-22 17:23:28 +01:00
Andreas Fabri 8c41669fb7 move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh 2018-03-22 16:37:37 +01:00
Laurent Rineau 182239d6b6
Merge branch 'master' into CGAL-remove_SCL_SECURE_NO_DEPRECATE-GF 2018-03-06 16:49:30 +01:00
Andreas Fabri f7ba8ff4df Fix Box_intersection_d, Minkowski_sum_2, Nef_3, Surface_mesh, Straight_skeleton, Triangulation_3 2018-02-23 11:35:58 +00:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Laurent Rineau 9d227d0fba Merge pull request #2758 from maxGimeno/BGL-Document_graph_has_property-GF
BGL: Document graph_has_property
2018-02-19 14:26:33 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Andreas Fabri d37792b4e0 fix doc warning 2018-01-24 10:23:55 +00:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Andreas Fabri 6438ade98a fixes after the first testsuite 2018-01-23 09:38:03 +00:00
Maxime Gimeno c3215b9331 Move graph_has_property from namespace boost to namespace CGAL and provide some doc for it. 2018-01-22 12:43:29 +01:00
Andreas Fabri 5e3889127f Surface_mesh 2018-01-17 17:07:36 +00:00
Andreas Fabri ed621299b5 Merge branch 'BGL-generic_property_map-GF' of github.com:afabri/cgal into BGL-generic_property_map-GF 2017-12-20 15:44:29 +00:00
Andreas Fabri 3fe2e280aa Use sstream instead of lexical_cast 2017-12-20 15:03:21 +00:00
Sébastien Loriot 456222aa81 add comment 2017-12-19 14:51:12 +01:00
Sébastien Loriot a9a85b37e6 fix compilation issues and warnings 2017-12-19 14:43:30 +01:00
Andreas Fabri ee8c0fad5d Changes after @sloriot's review 2017-12-14 10:49:02 +00:00
Laurent Rineau 7df26c594b
Merge branch 'master' into BGL-generic_property_map-GF 2017-12-14 09:46:01 +01:00
Andreas Fabri 91539a1ae1
Merge branch 'master' into BGL-fix_doc-GF 2017-12-01 12:04:15 +01:00
Andreas Fabri 2806377564 Fix Issue #2629 2017-11-30 18:17:26 +00:00
Andreas Fabri 1f8849dfea Make dynamic property API similar to the non dynamic case 2017-11-29 08:28:16 +00:00
Jane Tournois 2feb79a16b Add example for dynamic_property_map 2017-11-27 16:35:30 +00:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot ff26773f7b remove include directive for checking GPL compliance in LGPL headers 2017-11-12 10:21:35 +01:00