Commit Graph

596 Commits

Author SHA1 Message Date
Simon Giraudot 9e85313b44 Fix yet another round of warnings 2019-04-26 15:52:21 +02:00
Simon Giraudot 3dce5ec8b0 Remove useless relates 2019-04-26 13:28:45 +02:00
Simon Giraudot ec3984eba2 Fix wrong assertion 2019-04-25 09:58:29 +02:00
Simon Giraudot 4d1efe18b8 Fix error/warnings 2019-04-24 10:30:03 +02:00
Simon Giraudot 207a432dfd Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-23 12:08:44 +02:00
Sebastien Loriot b87db08b08
Merge pull request #3355 from maxGimeno/Demo-Multiple_viewers-GF
Polyhedron demo: Multiple Viewers
2019-04-23 10:34:26 +02:00
Mael Rouxel-Labbé 68595b210e Add a += operator for SM's edge iterator 2019-04-19 08:38:32 +02:00
Andreas Fabri 864ba4249d Merge branch 'Surface_mesh-PLY_IO-GF-old' into Surface_mesh-PLY_IO-GF 2019-04-12 16:19:53 +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
Simon Giraudot 717137e48f Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-09 15:11:58 +02:00
Maxime Gimeno de47fb3348 Fix conflicts 2019-04-09 10:31:10 +02:00
Maxime Gimeno 78db3f646d Solve conflicts 2019-04-09 10:04:44 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Maxime Gimeno 1ffd2842ca Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-04-02 13:51:52 +02:00
Laurent Rineau 84b9328619 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-29 15:49:12 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Sébastien Loriot e6cdf9f62b remove condition for cpp11 to be present in face graph related packages 2019-03-29 10:41:50 +01:00
Laurent Rineau 27d47e5eee Merge pull request #3814 from MaelRL/Surface_mesh-Actually_reset_all_properties-GF
Surface Mesh: Fixed not reseting edge property when a new element re-uses memory
2019-03-28 18:50:38 +01:00
Sébastien Loriot 676983ad94 also reset the property of the opposite halfedge 2019-03-28 18:16:08 +01:00
Mael Rouxel-Labbé 2a4d1abefa Fixed not reseting edge property when a new element reuses memory 2019-03-28 17:30:48 +01:00
Maxime Gimeno b619fbeb28 Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-03-26 10:57:54 +01:00
Maxime Gimeno 94541df835 Update to master 2019-03-07 14:33:10 +01:00
Andreas Fabri e08d85f3e3 Set precision of the ostream when writing a point set or face graph. Add a \note in the manual 2019-03-04 15:50:18 +01:00
Simon Giraudot 1f54c5e0af Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-02-26 14:03:27 +01:00
Maxime Gimeno 4f97ab767b Update to master. 2019-02-15 14:34:34 +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
Sébastien Loriot 42b9a0be04 fix level 2019-02-14 10:26:05 +01:00
Laurent Rineau 962afbfade Merge pull request #3343 from sgiraudot/Point_set_3-v2-GF
[Small Feature] Point Set 3 v2
2019-02-13 15:38:53 +01:00
Marc Glisse 328f2bdbc6 Replace -std=c++11 with c++1y. 2019-02-12 11:23:25 +01:00
Maxime Gimeno d76c163807 Fix the Final Fixes 2019-02-11 09:39:26 +01:00
Sébastien Loriot d5abc63e80 give a default value 2019-02-08 10:34:22 +01:00
Simon Giraudot ea250949f9 Fix return type 2019-02-07 11:36:04 +01:00
Simon Giraudot f778e5e151 Add methods to easily transfer properties from one point set to another 2019-02-07 11:36:04 +01:00
Simon Giraudot 6b4bb9bba2 Update doc 2019-01-28 10:09:06 +01:00
Simon Giraudot ca748364c6 Add reserve() where needed, fix a bug in read_off() and handle mesh-appending 2019-01-25 15:09:29 +01:00
Simon Giraudot a352fe8a0d Document how to recover/write PLY comments 2019-01-25 14:31:15 +01:00
Simon Giraudot b206e04c58 Handle edge/halfedge properties in PLY IO 2019-01-25 11:03:24 +01:00
Simon Giraudot ce125cf020 Better documentation and handling alpha in colors 2019-01-24 16:09:45 +01:00
Simon Giraudot 37a8f12f05 Handle more types 2019-01-24 10:58:57 +01:00
Simon Giraudot 2e13c54913 Documentation + better comment parameter 2019-01-23 14:43:21 +01:00
Simon Giraudot cf1fb8c3b0 Handle float Kernel 2019-01-23 12:25:41 +01:00
Simon Giraudot 798c2b4438 Merge remote-tracking branch 'GF/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-01-23 12:07:04 +01:00
Simon Giraudot a15b4cdf4a Add PLY IO functions for Surface_mesh + test 2019-01-23 11:26:07 +01:00
Maxime Gimeno b783e78223 Fix conflicts and display_property_plugin 2019-01-21 14:58:28 +01:00
Maxime Gimeno c71d1066a2 Fix conflicts 2019-01-11 13:59:08 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Sébastien Loriot 61169b394e Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2019-01-04 17:19:19 +01:00
Sébastien Loriot 45066e7d91 Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2019-01-04 17:17:03 +01:00
Sébastien Loriot 5a1b51bdd0 fix warning 2019-01-02 10:11:28 +01:00
Sébastien Loriot 3bfc09de3f add comments 2018-12-31 09:42:55 +01:00
Andreas Fabri ecc89af2b2 Fix Surface_mesh::join() 2018-12-31 09:34:51 +01:00
Maxime Gimeno 8691ea6805 Replace Fucntor by Visitor 2018-12-21 10:19:29 +01:00
Maxime Gimeno eb50bbb4b4 Fix typo 2018-12-21 10:16:07 +01:00
Maxime Gimeno 95c2045eb6 Fix conflicts 2018-12-21 09:02:26 +01:00
Maxime Gimeno 5ca79f8268 Add a visitor for collect_garbage. Add und for add and remove center_vertex 2018-12-20 12:45:35 +01:00
Laurent Rineau b45284184c Merge pull request #3532 from maxGimeno/Surface_mesh-Fix_IO-GF
Surface_mesh: Fix segfault in read_off()
2018-12-19 16:06:54 +01:00
Laurent Rineau 0ec8873a37 Merge pull request #3538 from maxGimeno/BGL-Fix_add_face-GF
BGL: Fix Euler::add_face()
2018-12-19 16:01:14 +01:00
Laurent Rineau b569aa4143 Merge pull request #3532 from maxGimeno/Surface_mesh-Fix_IO-GF
Surface_mesh: Fix segfault in read_off()
2018-12-19 15:45:50 +01:00
Laurent Rineau eb51562fe9 Merge pull request #3538 from maxGimeno/BGL-Fix_add_face-GF
BGL: Fix Euler::add_face()
2018-12-19 15:45:45 +01:00
Laurent Rineau b5ad256078 Merge pull request #3532 from maxGimeno/Surface_mesh-Fix_IO-GF
Surface_mesh: Fix segfault in read_off()
2018-12-19 15:44:34 +01:00
Maxime Gimeno c51852f8a1 Add check in collect_garbage() 2018-12-13 09:34:05 +01:00
Simon Giraudot 17792e53b8 Fix return type 2018-12-12 10:51:34 +01:00
Simon Giraudot 6e4815064e Add methods to easily transfer properties from one point set to another 2018-12-12 10:51:34 +01:00
Maxime Gimeno b04369cc6b Don't assert OFF type 2018-12-11 14:55:00 +01:00
Maxime Gimeno 548f86b98b Check stream state before allocating memory. 2018-12-11 14:35:25 +01:00
Sébastien Loriot 56de16c9c0 workaround (a compiler bug?) 2018-12-07 10:44:25 +01:00
Sébastien Loriot 3a1516e940 add missing Reference and uniformize ref man group declaration 2018-11-20 13:47:16 +01:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Sébastien Loriot d940632471 Merge pull request #3258 from MaelRL/PMP-Filter_degenerate_polygon_soup_input-GF
PMP: repair polygon soup
2018-11-02 10:37:58 +01:00
Laurent Rineau be3e47638a Merge pull request #3391 from maxGimeno/Qt-Handle_cmake_warnings-GF
Surface_mesh_Examples:Fix cmake warning
2018-10-29 10:42:46 +01:00
Laurent Rineau 3c6538f80f Merge pull request #3377 from Simon-Lopez/simon_cgal_#3375
Proposal to fix issue #3375
2018-10-29 10:42:37 +01:00
Laurent Rineau 016a178c19 Merge pull request #3391 from maxGimeno/Qt-Handle_cmake_warnings-GF
Surface_mesh_Examples:Fix cmake warning
2018-10-29 10:27:59 +01:00
Laurent Rineau 821f9c015e Merge pull request #3311 from sloriot/Doc-Pkg_link_name
Update the name of package names reference links
2018-10-29 10:27:53 +01:00
Laurent Rineau fb7dc495b0 Merge pull request #3377 from Simon-Lopez/simon_cgal_#3375
Proposal to fix issue #3375
2018-10-29 10:27:41 +01:00
Sébastien Loriot 915c3e7fec use a vector for dynamic properties of const Surface_mesh
also done for OpenMesh types
2018-10-25 17:05:21 +02:00
Sébastien Loriot 72acbee3f5 fix warnings 2018-10-24 11:12:55 +02: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
Guillaume Damiand ae5b6e00ad Bug fix in basic viewers when using EPEK.
For polyhedron, surface mesh and LCC viewers, we compute face and vertex normals in the basic viewers. These normals should be computed in a Vector_3 of a non exact kernel.
2018-10-15 14:58:52 +02:00
Andreas Fabri 0dc1cf2aeb Dón't use CGAL_TEST_SUITE as travis and even me are not the testsuite 2018-10-12 10:25:42 +02:00
Andreas Fabri 59624f3979 Rename test file 2018-10-10 15:21:57 +02:00
Maxime Gimeno 0abfc0e57e fix after review of lrineau 2018-10-10 14:49:17 +02:00
Maxime Gimeno 33dc3af32e Fix cmake warning 2018-10-10 14:24:37 +02:00
Andreas Fabri 992294f79f Add a testcase for Surface_mesh::join() 2018-10-10 10:43:22 +02:00
Simon Lopez 3622f1cfec Proposal to fix issue #3375 2018-10-10 10:43:22 +02:00
Mael Rouxel-Labbé d18e21cfe7 Merge branch 'PMP-Filter_degenerate_polygon_soup_input-GF-old' into PMP-Filter_degenerate_polygon_soup_input-GF 2018-10-08 16:19:26 +02:00
Sébastien Loriot 2f9408f867 rename link name to match package name 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
Guillaume Damiand 2273762e7e Remove debug message 2018-09-10 14:11:36 +02:00
Guillaume Damiand 4afa5e9cb5 Add an example for surface mesh that allows to visualize small faces; this example will be used in a tutorial explaining how to define and modify one viewer. 2018-09-07 13:30:44 +02:00
Guillaume Damiand ddd7f8fa3b Add an option to disable viewer when running ctest. 2018-09-07 13:29:38 +02:00
Guillaume Damiand 2c8af2ebcc Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program. 2018-09-06 18:43:32 +02:00
Sébastien Loriot 376bc42716 update URL and use https 2018-09-04 13:29:51 +02:00
Maxime Gimeno 8d0a67095f Merge branch 'master' into IntrinsicFaceGraph-V2 2018-08-01 15:40:36 +02:00
Mael Rouxel-Labbé 16a9bc4d7c Fixed some links / concepts related to sgi.com and cppreference 2018-07-26 16:27:58 +02:00
Sébastien Loriot 82ef11845f fix constness issues 2018-07-18 14:31:14 +02:00
Sébastien Loriot a31753df4a handle const graph for face dynamic tag 2018-07-18 09:12:05 +02:00
Laurent Rineau 5023020809 Merge pull request #3126 from sgiraudot/Classification-Clusters_and_meshes-GF
Classification 2.0
2018-07-12 11:37:13 +02:00
Sébastien Loriot cf91f7037e Merge branch 'cgal/releases/CGAL-4.12-branch' 2018-07-09 09:26:24 +02:00
Sébastien Loriot 73e3e86980 make the test compiles.
@afabri This shows what I meant in https://github.com/CGAL/cgal/issues/3138
Here the fix is only minimal, but it should be done consistently for all
simplex type of Surface_mesh, and also probably for OpenMesh types
2018-07-06 09:13:02 +02:00
Simon Giraudot e1da290f13 Fix conversion warning 2018-07-05 09:08:28 +02:00
Simon Giraudot d27c5a97db Make Index_iterator of Surface_mesh really compliant to random access concept 2018-07-05 09:08:27 +02:00
Simon Giraudot b894992e8d Make Surface Mesh Index_iterator random access 2018-07-05 09:07:31 +02:00
Sébastien Loriot 6d0cca9a29 convenience function write_off uses documented one 2018-06-29 08:46:21 +02:00
Laurent Rineau 0e4e50f2e7 Merge pull request #3060 from maxGimeno/BGL-read_write_off_use_np-GF
BGL: Use Named Parameters in OFF I/O
2018-06-27 10:21:33 +02:00
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
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Guillaume Damiand 873ee7216b Remove an unused off, which is not in data directory. 2018-06-12 08:05:14 +02:00
Laurent Rineau e33030b3a9 Add dependencies to GraphicsView 2018-06-11 15:54:56 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +02:00
Maxime Gimeno ee94efc76e Fix Surface_mesh example 2018-05-29 12:00:30 +02:00
Andreas Fabri 4b14990209 Fix warnings; Remove typename in non-template code 2018-05-29 11:11:50 +02:00
Guillaume Damiand c62fb2b01e Move include iostream. 2018-05-29 11:11:49 +02:00
Guillaume Damiand b361e78a99 Add missing include 2018-05-29 11:11:49 +02:00
Guillaume Damiand 39de8ac459 Add licence includes 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 8a0dc2f279 Add one draw example in each user manual. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 23426e70c4 Remove macro modified. 2018-05-29 11:11:49 +02:00
Guillaume Damiand ff586425af All 4 new examples to illustrate the usage of CGAL::draw. 2018-05-29 11:11:49 +02:00
Guillaume Damiand ddfb8204dc Add figures for all the basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 53769e98a7 * Add draw examples in the 5 concerned packages (Polyhedron, Surface_mesh, T2, T3, LCC)
* Update FindQGLViewel to add a target.
2018-05-29 11:11:49 +02:00
Guillaume Damiand 6e83b034dc Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 73905ce8dd Avoid to run the viewer for the CGAL test suite. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5d375eff74 Update all basic viewers to have the correct behavior when CGAL_USE_BASIC_VIEWER is not defined. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5e5a9611db Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined. 2018-05-29 11:04:57 +02:00
Guillaume Damiand a59c5f6398 Update all basic viewers to allow to have a color functor as parameter. 2018-05-29 11:04:57 +02:00
Guillaume Damiand d881a203e2 Update LCC, Polyhedron and Surface mesh viewers to follow last modification of basic viewer. 2018-05-29 11:02:00 +02:00
Guillaume Damiand f70c6fed86 Update basic viewer to: (1) use a generic class that can maybe be used also in demos; (2) use same name to add mono/colored objects. 2018-05-29 11:02:00 +02:00
Guillaume Damiand a899052b3b Add viewer for surface mesh. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 8870e304a3 Update basic viewer; now it works for LCC, Polyhedron and Surface_mesh. 2018-05-29 11:01:59 +02:00
Maxime Gimeno 132cf694a0 remove is_valid() from the graph_traits 2018-05-03 12:03:14 +02:00
Maxime Gimeno 7a5e821183 fixes 2018-04-27 15:28:00 +02:00
Maxime Gimeno c4da8690cb Add NamedParameters to the off IO functions. 2018-04-26 14:00:06 +02:00
Laurent Rineau 2df75cb8ef Merge pull request #2995 from MaelRL/Doc-Fix_minor_issues-GF
Doc: fix minor issues in Surface_mesh and SMP
2018-04-06 18:12:15 +02:00
Mael Rouxel-Labbé 5ff2a0d315 Fixed minor doc issues in Surface_mesh 2018-04-06 11:48:13 +02:00
Laurent Rineau 237735ab73 Merge pull request #2946 from afabri/CGAL-dependencies-GF
Move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh
2018-03-27 10:35:23 +02:00
Laurent Rineau 3c70f8bad0 Fix dependencies by moving files 2018-03-23 14:17:24 +01:00
Laurent Rineau c504ea3e9f Fixes
- cleanup
- be careful not to add things to the documentation
2018-03-22 17:23:28 +01:00
Andreas Fabri 8c41669fb7 move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh 2018-03-22 16:37:37 +01:00
Laurent Rineau 4a7966d145 Merge pull request #2860 from lrineau/Installation-fix_check_headers-GF
Fix CGAL_ENABLE_CHECK_HEADERS, again
2018-03-09 18:39:26 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 182239d6b6
Merge branch 'master' into CGAL-remove_SCL_SECURE_NO_DEPRECATE-GF 2018-03-06 16:49:30 +01:00
Andreas Fabri f7ba8ff4df Fix Box_intersection_d, Minkowski_sum_2, Nef_3, Surface_mesh, Straight_skeleton, Triangulation_3 2018-02-23 11:35:58 +00:00