Commit Graph

577 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Laurent Rineau 39a245220a Merge pull request #3660 from mglisse/NewKernel_d-lazy_Epeck_d-glisse
Epeck_d
2019-07-01 11:16:33 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Guillaume Damiand 64a8bd2a13 Remove error in raw_surface_mesh_small_faces.h 2019-06-24 10:54:41 +02:00
Mael Rouxel-Labbé 7a5486962d Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-20 14:49:25 +02:00
Laurent Rineau 33e7de45e9 Merge pull request #3919 from maxGimeno/Add_3mf_wrapper-GF
Stream_support: Add a 3mf wrapper
2019-06-20 14:21:11 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Mael Rouxel-Labbé bc32291d36 Re-enable using operator<< and operator>> with 2D meshes 2019-06-20 09:46:32 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +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
Guillaume Damiand 8a3cb666fd Correct links to CGAL::draw functions. 2019-06-19 13:10:08 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Maxime Gimeno c5174f693c Rename soup function 2019-06-17 14:07:27 +02:00
Maxime Gimeno 7de29bdd93 update doc 2019-06-17 14:06:12 +02:00
Maxime Gimeno 1970d94c53 Add a function to Surface_mesh that reads a range of surface_meshes from a 3mf file. 2019-06-17 14:03:55 +02:00
Laurent Rineau 595f38ef54 Merge pull request #3978 from afabri/CGAL-BOOST_FOREACH-GF
Replace BOOST_FOREACH with C++11 for
2019-06-17 13:54:28 +02:00
Laurent Rineau c18d8b97a6 Merge pull request #3981 from afabri/Surface_mesh-property-GF
Surface_mesh: No need to call add_property_map()
2019-06-17 13:54:26 +02:00
Mael Rouxel-Labbé 2d81245744 Fix conversion warning 2019-06-17 08:33:05 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Andreas Fabri 0a7945baac Surface_mesh: No need to call add_property_map() 2019-06-05 11:42:16 +02:00
Laurent Rineau adaed61c20 Merge branch 'releases/CGAL-4.14-branch' 2019-06-05 10:58:12 +02:00
Laurent Rineau 926067967a Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-05 10:43:44 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Andreas Fabri 4e1f2cf017 Replace BOOST_FOREACH with C++11 for 2019-06-04 17:13:53 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Mael Rouxel-Labbé 0b506f5cce Fix package dependencies 2019-05-10 12:41:25 +02:00
Andreas Fabri e2498591da We write x y z even if it is a homgenous point 2019-05-09 15:06:29 +02:00
Andreas Fabri d207889c95 is >> p is wrong if p is a homogeneous point.
Instead read three doubles.
Note that we do not support 4OFF yet which means a fourth homogenization variable
2019-05-09 09:34:32 +02:00
Mael 0efaed2095
Merge branch 'master' into PMP-Locate-GF 2019-05-06 15:57:09 +02:00
Laurent Rineau 149046f8c1
Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-04-29 19:54:03 +04:00
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