Commit Graph

323 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 220a4454ab Regroup OpenInventor I/O headers 2020-01-17 17:10:02 +01:00
Mael Rouxel-Labbé 06c6659981 Add STL.h as a convenience header regrouping STL I/O headers 2020-01-17 17:02:14 +01:00
Mael Rouxel-Labbé f0027e7250 Regroup VTK I/O 2020-01-17 17:01:12 +01:00
Mael Rouxel-Labbé 6f10eb1599 Regroup 3MF 2020-01-17 17:00:09 +01:00
Mael Rouxel-Labbé 3ca94b1c78 Move Writer_OFF (which is completely unused...) to IO/OFF 2020-01-17 16:49:40 +01:00
Mael Rouxel-Labbé 345529e4f6 Get rid of deprecated files that were not documented in the first place 2020-01-17 16:46:35 +01:00
Mael Rouxel-Labbé 548149da48 Move Alpha_shape_3_VRML_2_ostream to Alpha_shape_3 and make it GPL
The code uses Alpha_shape_3 which is GPL, so the license change is
not too extreme.
2020-01-17 15:38:03 +01:00
Mael Rouxel-Labbé 1d8124e27f Move two VRML-files into IO/VMRL + add convenience header 2020-01-17 15:16:50 +01:00
Mael Rouxel-Labbé 9c9ac95e75 Fix licenses 2020-01-17 14:20:06 +01:00
Mael Rouxel-Labbé d620198049 Merge branch 'CGAL_IO-maxGimeno-old' into CGAL_IO-maxGimeno 2020-01-17 12:34:08 +01:00
Maxime Gimeno b59e55731c add misisng namespace 2020-01-13 10:30:33 +01:00
Maxime Gimeno 6c35826afd Fixes and apply to multipolygon 2020-01-03 10:51:19 +01:00
Maxime Gimeno 4c36c04fd6 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2019-12-19 11:26:55 +01:00
Andreas Fabri 9a330fd140 Stream_support: Fix reading WKT POLYGON 2019-12-05 16:17:37 +01:00
Sébastien Loriot b9a079b530 remove cpp11/cpp0x 2019-11-04 11:34:53 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Maxime Gimeno 80b7a5575c Empty Polyhedron_IO. 2019-09-27 10:35:39 +02:00
Maxime Gimeno af5773cf4e Integration of WS Server to the demo. Sessions handled and Remove the point_sets and polylines management from the 3mf plugin 2019-09-26 14:59:36 +02:00
Maxime Gimeno 5a03f5d7c7 Continue working on the table 2019-09-25 15:52:18 +02:00
Maxime Gimeno 01c7259d0d Fixing read_OBJ() 2019-09-24 13:42:38 +02:00
Maxime Gimeno c8c46d6f00 Finished the `Supported file formats` page 2019-09-19 13:27:06 +02:00
Sebastien Loriot eb712a67e9
Merge pull request #4094 from MaelRL/PMP-Snap_pp-GF
PMP: speed improvements for snap.h
2019-08-12 09:02:50 +02:00
Maxime Gimeno 6638d51fe8 - Unify the Facegraph builders (GOCAD and STL for now)
- Make a BGL STL_reader
- Add a test for it.
2019-08-09 13:53:33 +02:00
Maxime Gimeno 6dbf2d3d78 Move STL bgl writer into BGL, and replace it by a soup writer in Stream_support.
Write a SS test for read and write soups in STL
2019-08-09 12:09:20 +02:00
Maxime Gimeno ebbe8571ee Move GOCAD's IO BGL code to BGL. 2019-08-08 11:46:10 +02:00
Maxime Gimeno 9c794aa228 Fix GOCAD reader to not duplicate vertices 2019-08-08 10:23:09 +02:00
Maxime Gimeno 4aed6a9a54 move WKT traits files and make a GOCAD reader and writer from the one in the demo. 2019-08-07 16:41:44 +02:00
Maxime Gimeno 8f793736c7 Move LGPL stuff to Stream_support, and Polyhedron_IO GPL stuff to Polyhedron/include/CGAL/IO. Deprecate headers that need it.
As a consequence, Inventor and Polyhedron_IO are entirely deprecated.
2019-08-07 16:00:47 +02:00
Maxime Gimeno 914c37b72f Move OFF files from Polyhedron_IO to Polyhedron/include/CGAL/IO 2019-08-07 15:25:26 +02:00
Maxime Gimeno 0a38d23764 Add all missing files.
Enable the STL_reader to read multiple "solid"s in a same soup.
2019-08-07 15:12:50 +02:00
Maxime Gimeno 5373b35b9f Start regrouping in Stream Support and robustify readers. 2019-08-06 16:11:56 +02:00
Maxime Gimeno 2698704f87 Add vertex nomals in write_OBJ for Surface_mesh 2019-07-29 15:55:38 +02:00
Mael 9ba0870ebd
Merge branch 'master' into PMP-Snap_pp-GF 2019-07-18 17:43:04 +02:00
Sébastien Loriot 724e70b97f Merge pull request #3984 from LiangliangNan/master
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
2019-07-18 17:05:25 +02:00
Sebastien Loriot e4adb62011
Merge pull request #4078 from maxGimeno/Fix_some_warnings-GF
Fix warnings
2019-07-18 16:35:51 +02:00
Sebastien Loriot fbf6fb375d
Merge pull request #4050 from sgiraudot/Surface_mesh-Fix_PLY_warning-GF
[Surface Mesh / PLY] Fix uninitialized warning and error on unhandled properties
2019-07-18 16:31:17 +02:00
Mael Rouxel-Labbé f0b1052732 Add missing header includes 2019-07-18 15:54:32 +02:00
Maxime Gimeno 64253458aa Fix warnings 2019-07-12 10:49:10 +02:00
Liangliang Nan a9fd80cc7a Update Stream_support/include/CGAL/IO/PLY.h
Replace <boost/property_map/property_map.hpp> by <CGAL/property_map.h>

Co-Authored-By: Sebastien Loriot <sloriot.ml@gmail.com>
2019-07-08 10:28:44 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Simon Giraudot a712713111 Fix uninitialized warning 2019-07-03 09:58:37 +02:00
Liangliang Nan 655fa4b30d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-25 14:23:17 +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
Liangliang Nan 4588ba5d9d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-19 15:08:53 +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
Maxime Gimeno 5c6f20e1ec add a writing function for meshes 2019-06-06 13:04:47 +02:00
Liangliang Nan d4b4640139 corrected references (using the new names of the packages) 2019-06-06 00:30:01 +02:00
Liangliang Nan 3b9c73c917 using the new Shape_detection implementation (instead of the deprecated Shape_detection_3) 2019-06-05 21:10:39 +02:00
Liangliang Nan fadaee63a8 integrated PolyFit 2019-06-05 17:50:37 +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 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 c4d774efb8 Fix return values of bool functions 2019-05-22 15:20:54 +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 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
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 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
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
Sébastien Loriot 82c13e6e74 remove cpp11 workaround in kernel related packages 2019-03-29 10:41:50 +01:00
Andreas Fabri 5d58bde7f2 Polyhedron: Fix Issue #3108 2019-03-19 17:39:04 +01:00
Maxime Gimeno 0b31e6e5d8 Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF 2019-03-07 14:01:02 +01:00
Simon Giraudot 110c84bc53 Fix missing class name 2019-02-26 14:14:51 +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
Simon Giraudot a825e5b699 Fix missing LaTeX delimitors 2019-02-26 13:50:53 +01:00
Simon Giraudot fc16f50f22 Remove now useless Color_impl.h file 2019-02-26 13:50:52 +01:00
Simon Giraudot 4672c637bb Fix Color IO in binary + handle alpha 2019-02-26 13:50:52 +01:00
Simon Giraudot 4555385ac1 Fix missing bracket and add undocumented functions r,g,b,a 2019-02-26 13:48:59 +01:00
Simon Giraudot 3fb713de13 Move doc of CGAL::Color to header and rewrite class 2019-02-26 13:48:59 +01:00
Simon Giraudot 07bd0765f2 Fix FT type detection 2019-02-22 16:42:40 +01:00
Laurent Rineau 2559b79405 Reduce inclusions of <CGAL/basic.h> and <CGAL/number_type_basic.h> 2019-02-14 17:40:09 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Simon Giraudot eaa29b9116 Merge branch 'Stream_support-Enhance_color-GF' into Surface_mesh-PLY_IO-GF 2019-01-25 11:41:53 +01:00
Simon Giraudot 3e8810f181 Remove now useless Color_impl.h file 2019-01-24 15:51:53 +01:00
Simon Giraudot 2d7ed851a1 Fix Color IO in binary + handle alpha 2019-01-24 15:21:09 +01:00
Simon Giraudot 9672358b94 Fix missing bracket and add undocumented functions r,g,b,a 2019-01-24 14:46:22 +01:00
Simon Giraudot b3baaf7e92 Move doc of CGAL::Color to header and rewrite class 2019-01-24 14:16:19 +01:00
Simon Giraudot 37a8f12f05 Handle more types 2019-01-24 10:58:57 +01:00
Simon Giraudot 011f919ce6 Fix color binary alignment when writing 3 chars 2019-01-24 10:58:34 +01:00
Simon Giraudot 6789ca1c41 Some more modifications of the PLY interface 2019-01-23 11:25:35 +01:00
Simon Giraudot 12dfbd6353 Reorganize PLY IO functions/files 2019-01-22 10:00:23 +01:00
Maxime Gimeno e107612c31 Fix pre processor test 2019-01-10 08:54:49 +01:00
Maxime Gimeno 743569f854 Also disable WKT if gcc version is <4.5 2019-01-09 16:32:08 +01:00
Andreas Fabri 6183456090 Remove assignemnt instead of adding copy constructor 2019-01-07 09:48:55 +01:00
Andreas Fabri d248e61e04 Add copy constructor in order to avoid warning 2019-01-07 08:03:57 +01:00
Maxime Gimeno c6835292d8 Add include of license 2018-12-12 16:50:51 +01:00
Maxime Gimeno 7b13f4a969 Add misisng license header, rename vtu functions and update change.md 2018-11-23 10:11:23 +01:00
Maxime Gimeno 6e4ab58edc Put write_vtk in Polyhedron_IO 2018-11-20 15:15:53 +01:00
Maxime Gimeno 5731515056 always include cgal types to keep the dependencies (for travis) 2018-11-08 10:29:39 +01:00
Maxime Gimeno 080f63b1b8 Disable WKT for boost < 1.56 2018-11-07 11:58:50 +01:00
Maxime Gimeno 76c8c1f69f Add misisng header for boost 1.55 2018-11-06 11:43:37 +01:00
Maxime Gimeno 96bb50b361 Clean-up 2018-11-05 11:25:07 +01:00
Maxime Gimeno cbf3e04fa6 Doc fix. 2018-10-30 14:15:01 +01:00
Maxime Gimeno da4bb1f26a Clean-up 2018-10-30 12:10:58 +01:00
Maxime Gimeno ea2043a842 remove remaining geometry.hpp 2018-10-30 12:08:50 +01:00
Maxime Gimeno 49b88e533f Move and split vtk_io.h to Mesh_2 and Mesh_3 to avoid license and dependencies problems. Also fix vtu writer of VTK_io_plugin for polygon meshes. 2018-10-03 11:15:37 +02:00
Maxime Gimeno 223fa687c2 Add function for CDT. and use it in Triangulation_2 demo. Missing Doc 2018-08-27 16:29:47 +02:00
Maxime Gimeno 06db5dafbc WIP integrate functions. 2018-08-27 14:56:18 +02:00
Maxime Gimeno 27b7c318fb - Remove TODOs,
- Only support Cartesian kernels
- replace boost included header
2018-07-17 13:55:12 +02:00
Maxime Gimeno 8f3724c011 Add a global reading function 2018-05-15 10:04:23 +02:00
Maxime Gimeno 17f0e880c3 Change doc and remove it from the header to stop mistaking with the one in doc/ when doing fixes. 2018-05-15 10:04:23 +02:00
Maxime Gimeno 32e02c01d6 fix doc 2018-05-15 10:04:23 +02:00
Maxime Gimeno df980abff6 Add WKT IO to 2D demos and add saving to stream_lines_2_demo
Also adds traits for Point_3 to be able to interract with weighted points through them.
2018-05-15 10:04:23 +02:00
Maxime Gimeno 94809fccd9 Add some doc 2018-05-15 10:04:23 +02:00
Maxime Gimeno 3e4b437816 fix misisng include 2018-05-15 10:04:23 +02:00
Maxime Gimeno 14ef2163c4 Move everything to Stream_support 2018-05-15 10:04:23 +02:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Andreas Fabri abe933a684 Address the warning concerning SCL_SECURE for VC++ 2018-02-09 15:00:14 +00:00
Andreas Fabri cbf3a16471 libs compile without warning 2018-01-17 15:02:32 +00:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Simon Giraudot 8043d342e7 Merge branch 'Classification-GF-old' into Classification-GF 2017-07-21 12:06:19 +02:00
Andreas Fabri 7c62b14fd0 Let's remove the manipulators again, as they are of little practical value 2017-06-30 18:13:42 +02:00
Andreas Fabri fbdec23155 inline functions 2017-06-30 18:13:42 +02:00
Andreas Fabri bddd05aef4 fix compilation errors 2017-06-30 18:13:42 +02:00
Andreas Fabri 388a7678e6 Add an undocumented manipulator which allows operator<< to dispatch OFF, PLY, etc 2017-06-30 18:13:40 +02:00
Simon Giraudot 3ce8e9fc64 Merge branch 'Classification-GF-old' into Classification-GF 2017-03-13 07:51:54 +01:00
Andreas Fabri e2fbd2d46d Stream_support: No longer a need for replacement of istream >> double for VC++ 2017-01-13 18:39:40 +01:00
Simon Giraudot 310d81864e Merge branch 'Classification-GF-old' into Classification-GF 2016-11-23 08:55:57 +01:00
Andreas Fabri 73ff40470c Make variable const 2016-11-02 16:30:21 +01:00
Laurent Rineau a34934eab7 Missing #include
Plus rewrap a long line of comments.
2016-10-26 14:54:54 +02:00
Marc Glisse fa61ad20c3 Use Fraction_traits::Compose in read_float_or_quotient. 2016-10-26 13:10:55 +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 1aefb3b0f3 include <CGAL/config.h>, not <CGAL/basic.h> 2016-09-30 15:23:14 +02:00
Laurent Rineau 7dbc756d42 Mesh_3: Fix other conversion warnings 2016-09-29 14:39:11 +02:00
Simon Giraudot 85a5ef28dc Merge branch 'Point_set_classification-GF-old' into Point_set_classification-GF 2016-07-05 13:49:33 +02:00
Sébastien Loriot c951fe0fca Merge pull request #1035 from lrineau/CGAL-fix_Wconversion_warnings-GF
Fix -Wconversion warnings, and issues detected by those warnings
2016-06-24 13:30:48 +02:00