Commit Graph

266 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé cf900da30d Don't assume you can build a FT from a double
Only change /include because we know what kernels we are manipulating in tests
2019-10-03 11:22:21 +02:00
Maxime Gimeno de81a0cc73 fix warning 2019-10-03 11:22:21 +02:00
Maxime Gimeno f4aa864410 Fix warnings 2019-10-03 11:22:21 +02:00
Sébastien Loriot 051f94c4e2 fix and add test that was not in the cmake script 2019-10-03 11:22:21 +02:00
Sébastien Loriot 2681115133 add new test with boundary vertices 2019-10-03 11:22:21 +02:00
Sébastien Loriot 8e27665ba9 init the halfedge of a border vertex to point in a face 2019-10-03 11:22:14 +02:00
Mael Rouxel-Labbé e7f6c3eb2f Fix build_aabb_tree not being documented 2019-09-16 09:51:30 +02:00
Mael Rouxel-Labbé 7e29cbcf46 Misc minor changes (wrap / doc fixes) 2019-09-16 09:51:04 +02:00
Mael Rouxel-Labbé 59dae32b53 Add an example of shortest path using 3D point/ray 2019-09-16 09:50:31 +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
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +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 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Mael c53e7e2c68
Merge branch 'master' into PMP-Locate-GF 2019-05-15 07:59:52 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau 9cbfcee84f Merge branch 'master' into CGAL-Exact_algebraic-GF 2019-05-13 18:11:00 +02:00
Mael Rouxel-Labbé 0b506f5cce Fix package dependencies 2019-05-10 12:41:25 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
Laurent Rineau aebb058b58 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:45:00 +02:00
Laurent Rineau b7631f19b5 Fix Ridges_3 and SM_shortest_path with Boost 1.70 2019-05-06 10:11:18 +02:00
Sébastien Loriot 1398af1b0b Merge remote-tracking branch 'cgal/master' into HEAD 2019-04-12 17:44:31 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Laurent Rineau d4e09c1d78 Modernize the CMakeLists.txt that use LEDA
The file `${CGAL_USE_FILE}` must be included before
`find_package(LEDA)` can be called. But that would require to verify
`CGAL_FOUND` first...

Actually, now that we require at least CMake 3.1, let's say that CGAL
is `REQUIRED`, but not the components. That is the basic truth, and
that avoids testing for `CGAL_FOUND`.

At the same time, I have modified the `cmake_minimum_required`:
  - placed as the first line,
  - set to `3.1...3.13`:
      https://cmake.org/cmake/help/latest/command/cmake_policy.html#setting-policies-by-cmake-version

I have also removed the comments that says the `CMakeLists.txt` was
generated. That may have been true... but before a lot of modifications.
2019-03-27 09:56:16 +01:00
Laurent Rineau 5ca3653faa Core or LEDA 2019-03-26 16:30:04 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Laurent Rineau daa1493e98
Merge pull request #3452 from afabri/Heat_method_3-GF
New package: Heat Method
2019-01-18 16:50:01 +01:00
Laurent Rineau 6ffd76a87e Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF
Intersections_3:  Add missing do_intersect() overloads
2019-01-18 16:37:54 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Andreas Fabri 586b185b64 Changes after Guillaume's review 2018-12-21 11:50:27 +01:00
Sébastien Loriot 3a1516e940 add missing Reference and uniformize ref man group declaration 2018-11-20 13:47:16 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Maxime Gimeno aee51d4b42 Add Dependency to Distance_3 2018-11-02 11:36:43 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0c2dcf7208 Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component. 2018-10-18 14:38:42 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +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
Sébastien Loriot 742a615527 fix doc warnings triggered essentially by the improvement of doxygen 2018-04-25 23:36:21 +02:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01: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
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Andreas Fabri 94c162d249 fix types 2018-01-24 08:19:28 +00:00
Andreas Fabri f723c527e1 Surface_mesh_shortest_path 2018-01-17 21:56:19 +00:00
Laurent Rineau 1c2e9df8cf Merge branch 'releases/CGAL-4.11-branch' 2017-12-19 16:29:10 +01:00
Sébastien Loriot 5291ebc58b workaround conversion warning 2017-12-11 13:26:32 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +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
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 0baf7a7007 Merge pull request #2432 from MaelRL/SMSP-Fix_locate_with_VPM-GF
SM shortest paths: Fix locate with a custom VertexPoint Pmap
2017-09-15 16:31:10 +02:00
Laurent Rineau 2d82c363e3 Merge pull request #2432 from MaelRL/SMSP-Fix_locate_with_VPM-GF
SM shortest paths: Fix locate with a custom VertexPoint Pmap
2017-09-15 16:23:07 +02:00
Mael Rouxel-Labbé 5fccb8f591 Added an overload for convenience 2017-09-14 16:11:52 +02:00
Mael Rouxel-Labbé dbae01e10b Fixed not using the VertexPointPMap passed in parameter when building AABB trees 2017-09-14 16:10:37 +02:00
Laurent Rineau 6d148de316 Merge pull request #2277 from ocarre/master
FIX: crash in Surface_mesh_shortest_path::nearest_to_location
2017-07-28 18:31:02 +02:00
ocarre 95e35dc69d FIX: was using a deprecated version of the is_border function 2017-07-22 14:47:25 +02:00
ocarre 1cb9de1579 FIX: crash in Surface_mesh_shortest_path::nearest_to_location
This crash occurs if the point passed to the
Surface_mesh_shortest_path::nearest_to_location function
is located on a border edge.
It now returns directly the main face if the point is
located on a border edge and do not look anymore for a
non-existent opposite face.
2017-07-20 12:21:26 +02:00
Andreas Fabri d9549f2d5f Make the reference to the TriangleMesh const. In the implementation cast the constness away due to a problem with the vertex point pmap 2017-07-17 10:56:00 +02:00
Andreas Fabri d6f87b7ea2 Use Triangle_mesh for the typedef and tmesh for the variable in order to unify Polyhedron/Surface_mesh/OpenMesh examples 2017-05-30 15:26:51 +02:00
Andreas Fabri 865f740908 Add example 2017-05-30 15:26:51 +02:00
Andreas Fabri 164e6c54e6 Recommend Surface_mesh 2017-05-30 15:26:51 +02:00
Andreas Fabri c81b707bfb Do not include graph_traits_{Polyhedron | Surface_mesh}.h 2017-04-24 19:17:43 +02:00
Laurent Rineau eb5f52869f Use the new API of target_link_libraries
... otherwise CMake warns about mixing old and new usages of that CMake
command.
2017-03-27 18:04:54 +02:00
Sébastien Loriot 2e6f01e189 add missing include directive 2017-02-20 14:56:54 +01:00
Andreas Fabri 34e8ed18f0 Fix the VC++ warnings reported in Issue #1904 2017-02-15 15:38:09 +01:00
Sébastien Loriot 5212bb55a6 fix Core dependancies 2017-02-13 17:16:30 +01:00
Sébastien Loriot 1fc9b0976a fix Core dependancies 2017-02-13 16:21:02 +01:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Maxime Gimeno a01593e0bb Unify the links to the Polyhedron demo in the package descriptions. 2017-01-10 14:56:52 +01:00
Sebastien Loriot 8c9af91b01 Merge pull request #1749 from sloriot/SMSP-fix_incorrect_name
Barycentric coordinate -> Barycentric coordinates
2016-12-27 09:02:06 +01:00
Andreas Fabri 2ac94ff4fb Surface_mesh_shortest_path: Fix type
Fix type in std::priority_queue. Spotted by VC2016
2016-12-15 11:05:43 +01:00
Sébastien Loriot 6b8564a09c improve phrasing 2016-12-07 17:39:51 +01:00
Sébastien Loriot 1bdf09b26f facet -> face 2016-12-06 11:05:53 +01:00
Sébastien Loriot 958dae95b4 rename barycentric coordinate to barycentric coordinates 2016-12-06 11:04:18 +01:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 2ab35db9dd Merge pull request #1529 from sloriot/SMSP-remove_Polyhedron_3_dependancy
Remove dependency to Polyhedron_3
2016-10-05 13:03:56 +02:00
Laurent Rineau ccaf3441c4 Merge pull request #1529 from sloriot/SMSP-remove_Polyhedron_3_dependancy
Remove dependency to Polyhedron_3
2016-09-30 15:24:13 +02:00
Andreas Fabri 82e8ca42f3 Fix package Surface_mesh_shortest_path include headers 2016-09-30 15:23:14 +02:00
Laurent Rineau 37b4fdba78 fix compilation errors 2016-09-30 15:21:37 +02:00
Sébastien Loriot 0bd3044635 remove non-needed include directives 2016-09-30 14:09:33 +02:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Sébastien Loriot ec69b336e8 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch' 2016-06-22 13:20:25 +02:00
Sébastien Loriot a6bccbca40 handle the case when source and target are in the interior of the same edge 2016-06-20 17:00:57 +02:00
Sébastien Loriot b2d2e85d5a swap barycentric coordinates on the edge when seen from the other side 2016-06-20 14:53:25 +02:00
Maxime Gimeno f549b62a6a Fix the are_buffers_filled
- Using d->are_buffers_filled made useless the initialization made in the Scene_item constructor.
 Instead of re-initializing it in the private structs, I decided to use the one from the item again, as the
 cleaning of the Scene_item seems to be put aside.
2016-06-16 09:18:33 +02:00
Laurent Rineau 145b3dbe77 Merge fixes to Surface_mesh and BGL from 4.8
Merge branch 'releases/CGAL-4.8-branch'. Merges:
> 0b5fa6a Merge pull request #945 from sloriot/BGL-OpenMesh_free_functions
> 681e08d Merge pull request #947 from sloriot/SM_shortest_path-fix_package_info
2016-03-29 12:01:15 +02:00
Laurent Rineau 50b55bd27c Merge pull request #890 from sloriot/CGAL-generate_CMakeLists-sloriot
Generate CMakelists
2016-03-29 11:02:17 +02:00
Sébastien Loriot b83b4465c3 update package info 2016-03-24 17:15:36 +01:00