Commit Graph

300 Commits

Author SHA1 Message Date
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
Simon Giraudot 95e6d089fa Include Eigen in CMakeLists.txt where needed 2018-06-19 10:57:55 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 340e5d3b5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-12 23:29:43 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Laurent Rineau c1a9f93a24 Fix a warning (and doc)
Document that the interpolation, in 3D gray images, is always done using
`double` as numerical type.
2018-06-05 10:48:12 +02:00
Laurent Rineau a959f4115d Do not include the headers of deprecated classes 2018-05-30 18:38:08 +02:00
Laurent Rineau e6b02e3785 Attempt to fix the compilation issue with MSCV 2012 and Boost 1.53
```
[ 50%] Building CXX object CMakeFiles/mesh_implicit_sphere_variable_size.dir/mesh_implicit_sphere_variable_size.cpp.obj
	C:\PROGRA~2\MICROS~1.0\VC\bin\amd64\cl.exe  @C:\Users\afabri\AppData\Local\Temp\nmCD61.tmp
mesh_implicit_sphere_variable_size.cpp
C:\3rdPartyLibs\boost_1_53_0\boost/type_traits/remove_cv.hpp(37) : error C2039: 'unqualified_type' : is not a member of 'boost::detail::cv_traits_imp<T>'
        with
        [
            T=double (__cdecl *const *)(const Point &)
        ]
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.13-Ic-23/Mesh_3_Examples/TestReport_afabri_x64_Cygwin-Windows8_MSVC2012-Release-64bits.gz

Maybe passing a function pointer instead of a function lvalue will fix the
compilation error.
2018-05-29 11:00:09 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Laurent Rineau 588cc67897 Merge pull request #3096 from MaelRL/CGAL-Fix_deprecated_code_usage-GF
Fix some deprecation-related issues
2018-05-28 13:58:41 +02:00
Mael Rouxel-Labbé b41f1d6272 Various deprecation-related improvements 2018-05-18 16:47:54 +02:00
Laurent Rineau 05d7baceb1
Merge branch 'master' into Mesh_3-improve_polylines_to_protect-GF 2018-05-16 11:36:24 +02:00
Laurent Rineau 2bb3d11cd0 Remove unused typedef 2018-05-15 15:13:04 +02:00
Laurent Rineau b4a14010a1 Document create_implicit_mesh_domain() 2018-05-15 15:13:04 +02:00
Laurent Rineau e46cd8ad1a Remove the last -Wconversion warnings from all Mesh_3
I have only compiled tests and examples. Maybe the Mesh_3 plugin of the 3D
demo has other warnings.
2018-05-15 15:13:04 +02:00
Laurent Rineau 30ff350986 Deprecate Implicit_mesh_domain_3 as well 2018-05-15 15:13:04 +02:00
Laurent Rineau e4954e5b0d Document the new API of Labeled_mesh_domain 2018-05-15 14:56:23 +02:00
Laurent Rineau ce0f6d88a7 Add an example to mesh multiples isolevels of a 3D gray image 2018-05-15 14:56:23 +02:00
Laurent Rineau 82f900bcb6 Add Labeled_mesh_domain_3<K>::create_labeled_image_mesh_domain
... and deprecate `CGAL::Labeled_image_mesh_domain_3`.
2018-05-15 14:56:22 +02:00
Laurent Rineau 69f6f24c21 Use the new API 2018-05-15 14:56:22 +02:00
Laurent Rineau baa8c761c9 Remove the -Wdeprecated-declarations warning 2018-05-15 14:56:22 +02:00
Laurent Rineau 7e9165d78a WIP: Change the template parameters of Labeled_image_mesh_domain_3 (TODO)
TODO: document the changes, once that is over.
2018-05-15 14:56:21 +02:00
Sébastien Loriot aef93a1d86 add missing include directive 2018-05-14 16:19:34 +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
Mael Rouxel-Labbé 17d46e9211 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-04-26 11:55:17 +02:00
Andreas Fabri 8c41669fb7 move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh 2018-03-22 16:37:37 +01:00
Mael Rouxel-Labbé 8646350d47 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-03-15 14:42:21 +01:00
Laurent Rineau f12b3bf302 Prefix CMake options with `CGAL_`
- in `examples/Mesh_3/`,
- in `examples/Point_set_processing_3/`,
- in `demo/Polyhedron/`, and
- in `demo/Triangulation_3/`.
2018-03-08 12:07:49 +01:00
Mael Rouxel-Labbé c28e05be0c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 12:50:06 +01:00
Laurent Rineau b7577e11f3 Add test data 2018-01-24 16:39:00 +01:00
Mael Rouxel-Labbé 34d53aa2d9 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-12-05 20:32:30 +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
Mael Rouxel-Labbé cecc686919 Removed depreciated code from example 2017-11-28 14:29:11 +01:00
Mael Rouxel-Labbé c607612a6f Fixed trailing whitespace 2017-11-22 09:56:55 +01:00
Mael Rouxel-Labbé 816fd4f646 Doc improvements
and trailing whitespace cleaning
2017-11-21 14:26:02 +01:00
Mael Rouxel-Labbé f3931d5877 Misc minor changes 2017-11-17 18:42:34 +01:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01:00
Laurent Rineau 3dcc4cf5d7 Merge pull request #2491 from janetournois/Mesh_3-document_manifold_criterion-jtournois
Mesh 3 : document manifold criterion
2017-10-23 17:24:51 +02:00
Laurent Rineau f3924fe8d6 curve segment -> curve 2017-10-13 15:59:48 +02:00
Laurent Rineau 107cdccd6d Merge pull request #2438 from lrineau/Mesh_3-test_polyhedral_complex_with_surface_mesh-GF
Mesh_3: make it work with Surface_mesh
2017-10-11 19:14:49 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Jane Tournois a47c50fa40 use manifold() in an example 2017-10-03 17:04:18 +02:00
Laurent Rineau ef9dfe5a94 Revert changes to this file 2017-09-18 15:22:37 +02:00
Laurent Rineau aead611299 Revert "add cin to cut process into major operations for memory measuring"
This reverts commit 3a854cef72.
2017-09-18 15:20:37 +02:00
Laurent Rineau 799666ca7a Duplicate the examples
Now we have a `Polyhedron_3` and a `Surface_mesh` version of the
following examples:

  - `examples/Mesh_3/mesh_polyhedral_complex.cpp`
  - `examples/Mesh_3/mesh_polyhedral_domain.cpp`
2017-09-18 14:56:57 +02:00
Laurent Rineau 151be29572 No longer use Graph_with_descriptor_with_graph<SM>
The `Polyhedral_mesh_domain` template class, now uses a specific
`AABBPrimitive` type, when used with a `FaceGraph`.
2017-09-18 14:56:57 +02:00
Laurent Rineau 9fa470c79f (!) Version that compiles, but does not work with multiple surfaces 2017-09-18 14:56:48 +02:00
Jane Tournois 3a854cef72 add cin to cut process into major operations for memory measuring 2017-09-18 14:48:51 +02:00
Jane Tournois ee7eb0ed5f attempt to use Surface_mesh in polyhedral complex example 2017-09-18 14:48:51 +02:00
Jane Tournois 3a78b2171e detect features in polyhedral complex example 2017-07-07 10:15:10 +02:00
Laurent Rineau c2a55b2476 Fix a compilation error without C++11
In C++03, `std::pair` is not an aggregate.
2017-07-07 10:15:10 +02:00
Laurent Rineau afa62cbb40 First draft of a documentation for Polyhedral_complex_mesh_domain_3 2017-07-07 10:15:10 +02:00
Laurent Rineau c4fea992cb Add an example and a class: Polyhedral_complex_mesh_domain_3 2017-07-07 10:15:10 +02:00
Laurent Rineau 07ed1e08a3 Merge pull request #2143 from afabri/Mesh_3-mesh_polyhedral_domain_with_surface_inside-GF
Mesh_3: Add an example (polyhedron inside a bouding polyhedron) in the User Manual
2017-06-16 12:07:13 +02:00
Laurent Rineau f87f78f5ed cleanup 2017-06-09 16:05:30 +02:00
Laurent Rineau b537432884 fix permissions 2017-06-02 17:02:38 +02:00
Maxime Gimeno 54d5825855 Replace unexisting headers 2017-06-01 09:41:28 +02:00
Andreas Fabri ac30f40f79 Move Mesh_3 specific properties to Mesh_3 2017-05-31 16:14:31 +02:00
Andreas Fabri 0c8ddd3e28 Delete cheese-box-bug.off 2017-05-31 10:34:32 +02:00
Andreas Fabri 1c2a21f743 Add an example for a polyhedral domain with a surface inside 2017-05-31 10:25:44 +02:00
Laurent Rineau f8a1017db8 Remove the parallelism 2017-05-31 10:22:16 +02:00
Laurent Rineau 73e35f2ff8 Do not use optimizers 2017-05-31 09:49:26 +02:00
Laurent Rineau 05699de667 Output to both .mesh and binary files 2017-05-31 09:49:26 +02:00
Andreas Fabri a0a4611e0f add data set 2017-05-31 09:49:26 +02:00
Andreas Fabri acc98c8cc5 two data/cheese.off data/cheese-box-bug.off has an assrtion of non-overlapping spheres 2017-05-31 09:49:26 +02:00
Maxime Gimeno b0de6bcbaa Fix permissions for data-sets 2017-05-29 13:24:09 +02:00
Maxime Gimeno e686ec592d Fixes 2017-05-29 13:24:08 +02:00
Maxime Gimeno 9a3dde95ba Fix missing headers and definitions, SFINAE problems and ambiguous specialisation. 2017-05-29 13:24:06 +02:00
Andreas Fabri 5e7a5d656c Clean up the examples again; Add an example for two polyhedra 2017-05-29 13:24:06 +02:00
Andreas Fabri 0f28155729 I had to change Detect_features_in_polyhedra as the property map must be retrieved for the polyhedron passed to a function 2017-05-29 13:24:05 +02:00
Andreas Fabri e18f7037cf Add timer 2017-05-29 13:24:03 +02:00
Maxime Gimeno 5db694c154 polyhedral domain with features works for Surface_mesh and cheese.off (Polyhedron does no longer :(
Conflicts:
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
	Surface_mesh/include/CGAL/boost/graph/PMP_properties_Surface_mesh.h
2017-05-29 13:22:37 +02:00
Andreas Fabri 7bd5016c6d bglize and add property maps. polyhedral domain with features works almost for Surface_mesh 2017-05-29 13:22:37 +02:00
Maxime Gimeno 451af8f3ef bglize and add property maps. polyhedral domain with features works almost for Surface_mesh
Conflicts:
	Mesh_3/include/CGAL/Mesh_polyhedron_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
	Surface_mesh/include/CGAL/boost/graph/PMP_properties_Surface_mesh.h
2017-05-29 13:22:37 +02:00
Andreas Fabri 5a302c805d Make make_mesh_3() work for Surface_mesh 2017-05-29 13:22:37 +02:00
Andreas Fabri d735ed14bb Add is_triangle_mesh test in Mesh_3 package 2017-04-25 14:21:46 +02:00
Jane Tournois 0d438291c9 change min_size to speedup the example 2017-03-02 15:33:22 +01:00
Jane Tournois c699d45e66 simplify lipschitz sizing for a polyhedral domain
it can be enriched later, once we have the multi-polyhedral domain

the complete code is in Lipschitz_sizing_experimental.h
2017-02-28 12:19:21 +01:00
Jane Tournois 67dca100f4 write example for Lipschitz sizing
and adapt the code while multi-polyhedral surfaces is experimental
2017-02-28 10:38:44 +01:00
Jane Tournois 2d8a91aaa4 add minimal new example 2017-02-28 10:38:44 +01:00
Jane Tournois 7812bbe7fb fix warning 2017-02-10 11:17:32 +01:00
Laurent Rineau 788f5b17c4 Help the compiler parse `get<2>(..)`. 2017-01-11 11:41:23 +01:00
Laurent Rineau b2c5985661 Fix permissions 2017-01-09 16:01:13 +01:00
Jane Tournois f6bb4822fb extract polylines from example and add corresponding data file 2017-01-09 12:10:13 +01:00
Jane Tournois 89b0f864d4 add comments and improve layout 2017-01-09 11:10:37 +01:00
Laurent Rineau 8a315443f1 Add 1D features 2017-01-06 16:10:45 +01:00
Laurent Rineau 5df5e9eec4 Create an example with hybrid mesh domain 2017-01-06 16:10:45 +01:00
Andreas Fabri 548ad1cf29 Test deprecated code; Exlain what to do instead; Add to changes.html 2016-11-03 14:58:14 +01:00
Andreas Fabri a88fd7a1ba bad() -> fail() 2016-11-02 12:50:50 +01:00
Andreas Fabri be1b2f9231 Do not construct from a string 2016-11-01 11:19:43 +01:00
Sébastien Loriot 5ea6ae430e move to archive 2016-10-06 09:53:40 +02:00
Laurent Rineau 9a0bb54922 Merge pull request #1438 from sloriot/CGAL-clean_up_projects_name_cmake
Clean up projects name in cmake scripts
2016-10-05 13:02:25 +02:00
Andreas Fabri b64cf66518 switch to boost::bind 2016-09-13 05:47:15 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Laurent Rineau 1cde972cdb Remove whitespace at end of lines 2016-06-29 11:04:29 +02:00
Guillaume Damiand e21ef313c0 Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-22 20:54:37 +02:00
Guillaume Damiand e3dc906dfa Remove duplicated cmake entry. 2016-06-20 12:35:47 +02:00
Laurent Rineau bbc05a11d9 Fix -Wconversion warnings
All conversions are safe.
2016-06-16 16:36:43 +02:00
Laurent Rineau 07b2acdd3c Add the documentation 2016-06-15 18:10:15 +02:00
Laurent Rineau 00d3b9924b Better random image: a big sphere plus small ones 2016-06-15 18:10:14 +02:00