Commit Graph

564 Commits

Author SHA1 Message Date
Sébastien Loriot e80f869147 Merge remote-tracking branch 'cgal/master' 2019-12-20 09:35:45 +01:00
Sebastien Loriot 58f8a3eec2
Merge pull request #4279 from afabri/Surface_mesh-fix_swap-GF
Surface_mesh: Fix Property_container::swap()
2019-12-20 09:19:53 +01:00
Laurent Rineau b1c36bade5 Merge pull request #4245 from afabri/SM-disable_incompatible_comparisons-GF
Surface_mesh: Disable comparison of mixed index types
2019-12-05 11:05:32 +01:00
Laurent Rineau e10ace6bcf Merge pull request #4334 from sloriot/CGAL-SPDX_cleanup_fixes
Fix some remaining license notice + add a missing LicenseRef-Commercial
2019-11-06 17:45:23 +01:00
Sébastien Loriot 9a0bff4008 remove BOOST_FOREACH added by recent PRs 2019-11-04 10:59:15 +01:00
Sébastien Loriot bff5db68e1 fix some remaining license notice + add a missing LicenseRef-Commercial 2019-10-31 14:17:20 +01:00
Mael Rouxel-Labbé ff09c5d0c8 Merge branch 'SMS-Add_GH_simplification-GF-old' into SMS-Add_GH_simplification-GF 2019-10-25 16:35:53 +02:00
Sébastien Loriot 9f4fe1a9e8 Fix wrong positive 2019-10-20 00:32:41 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Mael Rouxel-Labbé 0f7de56d76 Move a number of Named Parameter type extractor from CGAL::PMP:: to PMP::
These are used in a number of pacakges other than PMP and the code
is also already in /BGL. None are documented.
2019-10-17 12:41:30 +02:00
Laurent Rineau 8d7932cdc2 Merge pull request #4203 from maxGimeno/Demo-Fix_detect_boundaries-GF
Polyhedron Demo: Fix  stitching plugin
2019-10-15 16:34:14 +02:00
Guillaume Damiand 0707d80d63 Update basic viewer to avoid conflict with another external function. 2019-10-15 11:16:02 +02:00
Andreas Fabri 937423bb9f Surface_mesh: Fix Property_container::swap() 2019-10-09 11:59:12 +02:00
Andreas Fabri f138c66142 Surface_mesh: Disable comparison of mixed index types 2019-09-24 15:06:56 +02:00
Maxime Gimeno 1e34d143b9 Rename file in CMakeLists 2019-09-03 13:56:12 +02:00
Maxime Gimeno d8cba3158a Rename example file 2019-09-03 13:12:55 +02:00
Maxime Gimeno e03c51efc3 Add the example to the user manual 2019-09-03 11:29:39 +02:00
Maxime Gimeno 7259e3d1e2 Add an example to explicit the behaviour of add_face in case of a wrong orientation. 2019-09-02 16:06:43 +02:00
Maxime Gimeno e35d5d0f1f Fix the detect_boundaries operation to not use is_border(vertex).
Add to the doc of Surface_mesh that is_border(vertex_index) is not guaranteed to work if the SM is not a 2-manifold.
2019-09-02 14:58:57 +02:00
Sebastien Loriot 039ee63e0e
Merge pull request #4122 from maxGimeno/CGAL_IO-OBJ_writes_normals-maxGimeno
Surface_mesh: normals in OBJ Writer
2019-08-08 10:18:05 +02:00
Maxime Gimeno 35bbb4c21b Fix type 2019-08-01 10:36:55 +02:00
Maxime Gimeno 54b6031ae6 Fix pmap 2019-07-29 16:17:14 +02:00
Maxime Gimeno 2698704f87 Add vertex nomals in write_OBJ for Surface_mesh 2019-07-29 15:55:38 +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 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
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 fbf6fb375d
Merge pull request #4050 from sgiraudot/Surface_mesh-Fix_PLY_warning-GF
[Surface Mesh / PLY] Fix uninitialized warning and error on unhandled properties
2019-07-18 16:31:17 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
match @{ and @}
2019-07-18 16:26:43 +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
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Simon Giraudot d916428144 Fix case where edge/hafledge properties are found but with unhandled complex types 2019-07-09 15:12:59 +02:00
Mael Rouxel-Labbé 97626d2c34 Revert "Re-enable using operator<< and operator>> with 2D meshes"
This reverts commit bc32291d36.

This will be cleaned in a better way in the future.
2019-07-08 15:58:36 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Laurent Rineau 39a245220a Merge pull request #3660 from mglisse/NewKernel_d-lazy_Epeck_d-glisse
Epeck_d
2019-07-01 11:16:33 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Guillaume Damiand 64a8bd2a13 Remove error in raw_surface_mesh_small_faces.h 2019-06-24 10:54:41 +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 33e7de45e9 Merge pull request #3919 from maxGimeno/Add_3mf_wrapper-GF
Stream_support: Add a 3mf wrapper
2019-06-20 14:21:11 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Mael Rouxel-Labbé bc32291d36 Re-enable using operator<< and operator>> with 2D meshes 2019-06-20 09:46:32 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Guillaume Damiand 8a3cb666fd Correct links to CGAL::draw functions. 2019-06-19 13:10:08 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +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