Commit Graph

475 Commits

Author SHA1 Message Date
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
Andreas Fabri 4c8f452a78 Add {Find/Use}Openmesh.cmake and fix the CMakeLists.txt 2014-06-11 12:13:50 +02:00
Andreas Fabri d92d0cef84 Use CGAL points even for OpenMesh 2014-06-10 15:26:06 +02:00
Sébastien Loriot db346b1ad3 add extra overload if c++11 is not enabled 2014-06-06 15:36:27 +02:00
Sébastien Loriot aec7e99e6a introduce the point property map 2014-06-05 21:24:34 +02:00
Sébastien Loriot 8b88547955 fix compilation issues 2014-06-05 17:01:59 +02:00
Andreas Fabri ffc619f871 edges was at the same time a local variable 2014-06-05 16:21:16 +02:00
Andreas Fabri 84208ee628 constness problems with CGAL::Polyhedron_3. The problem with edges(G) persists :< 2014-06-05 16:12:03 +02:00
Andreas Fabri 9f99e88cbc Add example that uses OpenMesh. We still have to add the property map to the top level API 2014-06-05 15:30:37 +02:00
Andreas Fabri 3d7d596e6b Use vertex_point property map so that it now also compiled with OpenMesh 2014-06-05 15:29:49 +02:00
Andreas Fabri 2c4c38809d switch internally to BGL API in mesh segmentation. We still have to deal with the point property maps 2014-06-05 12:05:54 +02:00