Commit Graph

326 Commits

Author SHA1 Message Date
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
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 8535a3c03c Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
2019-06-20 14:20:37 +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
Maxime Gimeno 86ca13a388 change behavior when soup is not orientable in the demo. 2019-06-17 14:11:32 +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 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
Maxime Gimeno 5c6f20e1ec add a writing function for meshes 2019-06-06 13:04:47 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Laurent Rineau 44ea54db97 Merge pull request #3931 from afabri/Stream_support-parseXML-GF
Stream_support:  Add example to read an xml file using boost::property_tree
2019-06-05 11:20:26 +02:00
Andreas Fabri b17b655086 Add for 2019-06-05 07:33:37 +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
Maxime Gimeno 87f7a68ed0 Fix find_path and don't make blue results if 3mf not found 2019-06-03 10:10:39 +02:00
Maxime Gimeno 79008f1618 Fix warnings 2019-05-28 14:03:27 +02:00
Maxime Gimeno a85b09051e add missing includes in Color.h 2019-05-28 09:31:10 +02:00
Maxime Gimeno 32cdcb9a54 Fix WKT doc 2019-05-27 09:34:05 +02:00
Laurent Rineau 78c5ec760f
Fix the URL 2019-05-24 14:20:50 +02:00
Maxime Gimeno c4d774efb8 Fix return values of bool functions 2019-05-22 15:20:54 +02:00
Laurent Rineau b8fe6b10ee Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF
Do not include <CGAL/basic.h>
2019-05-21 16:37:01 +02:00
Maxime Gimeno 1a08685a2f Add build_items and components to work with real case data 2019-05-17 15:39:03 +02:00
Maxime Gimeno 1fba61107d Add an IO plugin for the 3mf 2019-05-16 11:26:22 +02:00
Maxime Gimeno 04c5313a1c Add reading functions for polylines and point clouds 2019-05-16 11:10:35 +02:00
Maxime Gimeno a36c7fe39b Write a 3mf wrapper 2019-05-16 11:10:35 +02:00
Laurent Rineau f839e10dfa Merge pull request #3904 from maxGimeno/Stream_support-Fix_example-GF
Stream_support Examples: Fix CMakeLists
2019-05-14 16:43:20 +02:00
Andreas Fabri be1ad4b855 Stream_support: Show how to read an xml file using boost::property_tree 2019-05-14 11:21:10 +02:00
Laurent Rineau 008a75d439 Merge pull request #3636 from sgiraudot/Surface_mesh-PLY_IO-GF
[Small Feature] Surface Mesh PLY IO
2019-05-06 15:46:07 +02:00
Laurent Rineau ee4a6c5de2 Merge pull request #3686 from lrineau/Number_types-headers_dependency_hell-GF
Reduce inclusions of <CGAL/basic.h> and <CGAL/number_type_basic.h>
2019-05-06 15:46:02 +02:00
Maxime Gimeno 6481c61bd0 Fix CMakeLists 2019-05-06 10:17:46 +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
Andreas Fabri 937cd0ea24 Fix license header 2019-04-15 13:15:01 +02:00
Andreas Fabri 016df7e33c Fix CMakeLists.txt 2019-04-15 12:06:50 +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
Maxime GIMENO 41033a80be
Merge branch 'master' into Graphics_view-Fix_demo_IO-GF 2019-04-12 16:10:36 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF
[Small Feature] Reworked CGAL::Color
2019-04-12 15:54:30 +02:00
Sebastien Loriot 08251247c2
Merge pull request #3831 from afabri/PSP-cleanup-GF
Point Set Processing:  cleanup
2019-04-12 15:34:45 +02:00
Sebastien Loriot fd273fe850
Merge pull request #3779 from afabri/Polyhedron-read_off-GF
Polyhedron:  read_OFF() must not set the badbit if there are 0 vertices
2019-04-12 15:27:24 +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
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Andreas Fabri a2075494da Move trace.h 2019-04-08 16:16:49 +02:00
Andreas Fabri b404898d67 Add operator==() 2019-04-03 11:51:30 +02:00
Simon Giraudot 8333df9a0a Fix missing LaTeX delimitors 2019-04-03 11:51:30 +02:00
Andreas Fabri 05440f6f37 Remove #include 2019-04-03 11:51:30 +02:00
Simon Giraudot c78aa4f72c Remove now useless Color_impl.h file 2019-04-03 11:51:30 +02:00
Simon Giraudot 9a2953d825 Fix Color IO in binary + handle alpha 2019-04-03 11:51:29 +02:00
Simon Giraudot 4cd0e075d6 Fix missing bracket and add undocumented functions r,g,b,a 2019-04-03 11:51:29 +02:00
Simon Giraudot e7492734f3 Move doc of CGAL::Color to header and rewrite class 2019-04-03 11:51:29 +02:00
Maxime Gimeno 422cd589c1 Add missing includes to get BOOST_VERSION and BOOST_GCC 2019-04-03 10:27:55 +02:00