Commit Graph

585 Commits

Author SHA1 Message Date
Maxime Gimeno aee51d4b42 Add Dependency to Distance_3 2018-11-02 11:36:43 +01:00
Sébastien Loriot 0685423ae8 update from cgal/master 2018-11-02 11:32:31 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +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 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Sébastien Loriot 3dd0aa112d rename macro not following the convention 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 a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Andreas Fabri 827e9fee8e fix Segmentation 2018-05-04 09:00:09 +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
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
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +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 f723c527e1 Surface_mesh_shortest_path 2018-01-17 21:56:19 +00:00
Simon Giraudot 1b25f47f95 Small bugfix (stop criteria if flow goes to 0) 2018-01-12 14:15:00 +01:00
Sébastien Loriot 8fc5756cc3 de-duplicate identical labels 2018-01-10 12:13:48 +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
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +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 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 5ea5bc95fd make maxflow header compatible with the license checking mecanism 2017-11-12 10:21:35 +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 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 74d49355fa Merge pull request #2449 from sloriot/SMSeg-maxflow_macros
Fix compilation issue with boost 1.65
2017-10-11 19:18:08 +02:00
Laurent Rineau 479c9d7105 Merge pull request #2449 from sloriot/SMSeg-maxflow_macros
Fix compilation issue with boost 1.65
2017-10-11 19:11:21 +02:00
Sébastien Loriot 0b97c247bf update macro names and undef them when leaving the file 2017-09-20 16:47:53 +02:00
Simon Giraudot 8043d342e7 Merge branch 'Classification-GF-old' into Classification-GF 2017-07-21 12:06:19 +02:00
Simon Giraudot 4b245f961e Merge branch 'Classification-GF-old' into Classification-GF 2017-07-10 09:06:26 +02:00
Guillaume Damiand 821a5bad4b Add missing return 2017-06-28 09:42:48 -04:00
Guillaume Damiand 013f447395 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-22 23:21:39 +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
Sébastien Loriot 6d2526499e replace iterators of face patch indices by a range 2017-05-30 15:09:42 +02:00
Sébastien Loriot b4194e3614 import API and documentation 2017-05-30 15:09:42 +02:00
Maxime Gimeno 3ab2f10997 replace remaining 'componant' by 'patch' 2017-05-30 15:09:42 +02:00
Maxime Gimeno 1f96262d3d Rename the graph into Face_filtered_graph and add a function to check its validity. 2017-05-30 15:09:42 +02:00
Maxime Gimeno 1caba59404 add a function to change the current connected component ids to the cc_graph and update Segmentation example. 2017-05-30 15:09:42 +02:00
Maxime Gimeno 64eb2d09c6 Change doc for default index maps and add an example to Surface_mesh_segmentation using area() and Connected_components_graphs. 2017-05-30 15:09:41 +02:00
Laurent Rineau 7498ca9405 Merge pull request #2090 from afabri/Surface_mesh_segmentation-Surface_mesh_examples-GF
Surface_mesh_segmentation: Add a Surface_mesh example at the end of the user manual
2017-05-29 11:17:35 +02:00
Laurent Rineau b037471750 Merge pull request #2075 from afabri/CGAL-dont_include_graph_traits_header-GF
Do not include graph_traits_{Polyhedron | Surface_mesh}.h
2017-05-19 10:28:38 +02:00
Guillaume Damiand 885ef4775a Update examples and tests following renaming of BGL LCC helpers. 2017-05-10 16:20:11 -04:00
Andreas Fabri 94eedd3d72 Add the Surface_mesh example at the end of the user manual - Somehow unlucky, but better than nothing 2017-04-28 18:03:26 +02:00
Andreas Fabri 1dbedb7391 fix choices of std::cerr or std::cout 2017-04-27 09:04:12 +02:00
Andreas Fabri 1433a9f780 write to std::cout and not std:cerr 2017-04-25 14:46:23 +02:00
Andreas Fabri 7c3e5af35a Add is_triangle_mesh test in Surface_mesh_segmentation package 2017-04-25 11:33:13 +02:00
Andreas Fabri c81b707bfb Do not include graph_traits_{Polyhedron | Surface_mesh}.h 2017-04-24 19:17:43 +02:00
Guillaume Damiand 755272148a Cleanup BGL for LCC; add shortcut for item with id to simplify definition. 2017-03-31 17:11:36 -04:00
Guillaume Damiand d7e40dc40d Ok for Surface_mesh_segmentation for BGL LCC. 2017-03-31 09:34:01 -04:00
Guillaume Damiand 7277cdb9c0 Add one more example for BGL for LCC 2017-03-30 13:11:00 -04: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
Simon Giraudot 3ce8e9fc64 Merge branch 'Classification-GF-old' into Classification-GF 2017-03-13 07:51:54 +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
Laurent Rineau cfc0ac01c3 Merge pull request #1699 from sloriot/SMSeg-match_concepts
Update code to match documented concepts
2016-12-02 11:35:48 +01:00
Simon Giraudot 310d81864e Merge branch 'Classification-GF-old' into Classification-GF 2016-11-23 08:55:57 +01:00
Sébastien Loriot a619107eeb property maps are readable property maps not lvalue 2016-11-18 07:54:57 +01:00
Sébastien Loriot e17cabba90 use BGL helper free function is_triangle_mesh instead of a member one 2016-11-18 07:52:40 +01:00
Simon Giraudot 2017691e98 Bugfix: undef conflicting define 2016-10-19 11:04:55 +02:00
Andreas Fabri 423242be31 dihedral_angle() -> approximate_dihedral_angle() 2016-10-11 15:35:20 +02: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 42c0fc3c46 Missing includes 2016-09-30 15:23:15 +02:00
Andreas Fabri c58582b5ec Add global function dihedral_angle() 2016-09-30 15:23:15 +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
Maxime Gimeno d2e6c0e9fa Fix
- Use get() instead of [] operator to access the VertexPointMap.
2016-06-10 09:16:11 +02:00
Maxime Gimeno 90f04ba221 Fix runtime errors induced by insert(Primitive()) 2016-05-27 12:14:38 +02:00
Maxime Gimeno 70069cd32b Edit doc 2016-05-26 11:38:56 +02:00
Maxime Gimeno 110464b045 Update the concept SegmentationGeomTraits to require Collinear_3 functor. Update the code accordingly. 2016-05-24 16:15:43 +02:00
Maxime Gimeno 8b34294c82 AABB_Tree ignores degenerated faces in SDF_Calulation 2016-05-24 10:17:41 +02:00
Maxime Gimeno b923641321 Clean-up 2016-05-12 17:11:28 +02:00
Maxime Gimeno 31b9e81e6d Fix for the polyhedron readOFF with colors 2016-05-12 17:11:28 +02:00
Sebastien Loriot f429eef8a7 Merge pull request #1039 from afabri/AABB_tree-ray_intersection-pmoeller
Aabb tree ray intersection pmoeller
2016-05-09 09:40:12 +02:00
Sébastien Loriot 9f18b7a85b update maintainer 2016-05-06 12:30:29 +02:00
Sébastien Loriot 266812b165 use segment intersection by default as it is faster in general than ray casting 2016-04-26 17:12:18 +02:00
Sébastien Loriot 5df0fd7e4f handle when the ray intersect a triangle as a segment
same handling as above: ignored
2016-04-26 17:12:18 +02:00
Sébastien Loriot b90f3301e8 rename functions for ray casting and add comments 2016-04-26 17:12:18 +02:00
Sébastien Loriot 39336ebb34 remove debugging function 2016-04-26 17:12:18 +02:00
Sébastien Loriot 4f8c3adb71 use variant API instead of the Object one for intersection 2016-04-26 17:12:17 +02:00
Sébastien Loriot 2f20d4a036 assert -> CGAL_assertion 2016-04-26 17:12:17 +02:00
Sébastien Loriot 6b8421a048 update function name 2016-04-26 17:12:17 +02:00
Sébastien Loriot a0b97b23fb use the variant API instead of the Object one 2016-04-26 17:12:16 +02:00
Philipp Möller 649fabe67b Do not use debug variant 2016-04-26 17:11:08 +02:00
Philipp Möller a408a08ae7 fixup debug code 2016-04-26 17:11:05 +02:00
Philipp Möller 70f8f3f8e1 Use skip functor 2016-04-26 17:11:00 +02:00
Philipp Möller e7bf221b61 Order code in cast_and_return for less constructions 2016-04-26 17:10:56 +02:00
Philipp Möller de28e712f4 Work around skip functor
We cannot support a skip functor in ray_intersection and we have to work
around the issue of the ray starting inside a facet. To do that we shift
the source of the ray by the epsilon of a floating point number. We have
to consider if we really want to keep it that way.

Add assertions to make sure the new and old code give the same results.
2016-04-26 17:10:50 +02:00
Philipp Möller 5f2ea0c9f4 Don't use diagonal 2016-04-26 17:10:49 +02:00
Philipp Möller 815a82c692 Shim in code for ray_intersection
Use ray_intersection in the !use_diagonal case. Calculate both methods
for now for debugging.
2016-04-26 17:10:48 +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 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +01:00
Laurent Rineau 89fe7c62b2 Merge pull request #762 from sloriot/BGL-unif_names
Unify names of parameters model of CGAL BGL concepts
2016-03-24 11:20:38 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sébastien Loriot 2d191d6651 commit CMakeLists.txt for all examples and tests 2016-03-07 17:39:36 +01:00
Sébastien Loriot 45406a5296 Merge pull request #788 from bo0ts/Installation-split_config-pmoeller
Split CGALConfig.cmake and CGALExports.cmake
2016-03-06 15:36:55 +01:00
Andreas Fabri 51920f6b86 Unify chapter names 2016-02-17 16:35:48 +01:00
Philipp Möller 4211a4f01e Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS
This is a Cmake 2.4.3 variable that isn't even documented anymore.
2016-02-16 17:02:55 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Sébastien Loriot 312d4cb553 Uniformize names of template parameters and graph in segmentation package 2016-02-10 18:39:48 +01:00
Sebastien Loriot 49e7ea6f58 Merge pull request #680 from sloriot/SMS-boost_1.60
Surface mesh segmentation: boost 1.60 compatibility
2016-01-27 13:39:12 +01:00
Sébastien Loriot 5614ed7500 replace ice_and by &&
ice_and was deprecated in boost 1.60
2016-01-26 09:31:47 +01:00
Sébastien Loriot e64ae35a6e Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
Simon Giraudot a95c68e804 Merge branch 'CGAL-Fix_several_warnings-GF-old' into CGAL-Fix_several_warnings-GF 2015-12-28 14:13:00 +01:00
Simon Giraudot fe1ac9e86c Warning fix: uninitialized attributes 2015-12-18 14:44:17 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Simon Giraudot f21cb46900 Remove deprecated "register" keyword 2015-12-17 08:20:56 +01:00
Philipp Möller 79b7fc5081 Handle the INPUT cases where the whole include dir is used 2015-12-10 17:03:46 +01:00
Andreas Fabri 6706cc58c4 include header which pragma pushes a warning 2015-11-13 09:47:25 +01:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Sébastien Loriot d164633493 remove REQUIRED keyword 2015-07-07 11:23:46 +02:00
Sébastien Loriot d123ce5a47 Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk
Conflicts:
	Documentation/biblio/geom.bib
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Documentation/doc/Documentation/packages.txt
	Documentation/scripts/generate_how_to_cite.py
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-01 17:47:31 +02:00
Sébastien Loriot f4d1a28103 add missing include directive 2015-03-23 13:36:30 +01:00
Andreas Fabri 1d2f26ea3c Functions must be written with '()'
Approved by the release manager
2015-02-10 15:51:01 +01:00
Laurent Rineau 7394f596ae Fix after renaming of the example 2015-01-12 17:44:55 +01:00
Andreas Fabri 6e36a853a9 Merge branch 'Surface_mesh-new_package-GF'
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/resources/how_to_cite_cgal.bib.in
	Installation/changes.html
2015-01-12 11:27:35 +01:00
Andreas Fabri 3d99924000 add to examples.txt 2015-01-10 13:01:06 +01:00
Andreas Fabri 4be90e89dc shorten name of example to avoid CMake warning in the testsuite 2015-01-10 12:58:32 +01:00
Andreas Fabri 7fdb146a11 use the overloads that call get(vertex_point_t) 2014-12-23 15:06:51 +01:00
Andreas Fabri 49d6495d62 Merge branch 'Surface_mesh-new_package-GF' of ssh://scm.cgal.org/var/git/cgal into Surface_mesh-new_package-GF 2014-12-23 15:00:56 +01:00
Sébastien Loriot 21a705cdd9 do not use default template parameters 2014-12-23 14:59:00 +01:00
Andreas Fabri 28dc50fdfc point property map must be passed as argument 2014-12-23 14:24:51 +01:00
Andreas Fabri 5e9442395f Add segmentation example for Surface_mesh 2014-12-10 20:06:24 +01:00
Sébastien Loriot f156cae9f3 mainpage should be User Manual 2014-12-08 08:11:16 +01:00
Andreas Fabri 9ecdad5a76 Add a segmentation example for the Surface_mesh 2014-11-12 17:58:44 +01:00
Sébastien Loriot 452166d3dd update package description 2014-10-20 08:27:32 +02:00
Stephen Kiazyk a6ea82cbf7 Add an example using OpenMesh
Involves several changes to the Polyhedron_shortest_path class which were
not conformant to the Face Graph concept.
2014-08-04 22:59:51 -04:00
Laurent Rineau 36d8b5bd18 Convert source files encoding to utf-8
All non-ASCII files should be encoded in UTF-8. So far, the ZSH script
`Scripts/developer_scripts/detect_wrong_encoding` detects wrong encoding
in source/header files of include/, src/, and doc/.
2014-08-01 11:20:13 +02:00
Sébastien Loriot 2aadba50d7 Merge branch 'BGL-redesign_final-GF'
Introduces a redesign of the CGAL extension of the BGL API

Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager

Conflicts:
	Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
2014-07-08 19:45:16 +02:00
Sébastien Loriot 39c073948e when using HalfedgeGraph or FaceGraph API, graph_traits must be included 2014-07-04 17:24:07 +02:00
Sébastien Loriot cd88dc010b remove extra include directives 2014-07-04 17:24:06 +02:00
Sébastien Loriot ec13e3ed94 segmentation requires a model of FaceListGraph 2014-07-04 13:55:52 +02:00
Sébastien Loriot 79a746f7d9 remove an unused internal function
intel compilier with strict-ansi does not like it
  because even if it is not called, it is invalid as
  a const ref is not initialized
2014-07-03 15:14:40 +02:00
Sébastien Loriot fd91616f51 The default constructed vertex point property map for OpenMesh is invalid 2014-07-02 10:57:43 +02:00
Sébastien Loriot ddbeb9d017 pass the vertex point property map to the AABB-tree and the primitive 2014-07-02 10:57:05 +02:00
Sébastien Loriot 1555c034e7 use the member traits class and not the default constructed one 2014-07-02 10:51:23 +02:00
Sébastien Loriot 7f95ce6906 Merge remote-tracking branch 'origin/Intersections-fix_do_intersect_Bbox_3_Triangle_3-GF' into BGL-redesign_final-GF 2014-07-01 16:48:50 +02:00
Sébastien Loriot 271cab1134 change the order of template parameter for segmentation
the order is imposed by the default
  note this breaks the compatibility when the traits class was explicitly given
2014-07-01 16:43:27 +02:00
Sébastien Loriot 83b16b3351 remove warning and clean up 2014-07-01 16:43:26 +02:00
Sébastien Loriot 5d2199548d add missing include 2014-06-30 07:43:45 +02:00
Sébastien Loriot 87453adf26 move file accidently at the root of the repo 2014-06-27 16:15:17 +02:00
Sébastien Loriot 8f53bcdc95 remove renamed file 2014-06-27 15:24:20 +02:00
Sébastien Loriot a6e7d9cfd4 add missing back quotes 2014-06-11 14:20:51 +02:00
Sébastien Loriot b84d131b92 segmentation requires a model of FaceGraph 2014-06-11 14:20:05 +02:00
Andreas Fabri bbf70667bd bug fix 2014-06-11 12:37:04 +02:00