Commit Graph

232 Commits

Author SHA1 Message Date
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
Maxime Gimeno de47fb3348 Fix conflicts 2019-04-09 10:31:10 +02:00
Andreas Fabri 44f52f436a Add include of sstream 2019-04-08 16:16:51 +02:00
Sébastien Loriot 93f9a83ad3 STL writer is now under LGPL 2019-04-04 14:24:07 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +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
Andreas Fabri 5d58bde7f2 Polyhedron: Fix Issue #3108 2019-03-19 17:39:04 +01:00
Maxime Gimeno 94541df835 Update to master 2019-03-07 14:33:10 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +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 9256c04157 Replace old color API using global const variable with new one using functions 2019-02-26 13:48:59 +01:00
Andreas Fabri 7fa9781894 Remove derivation as workaround for a typedef 2019-02-14 12:12:01 +01:00
Andreas Fabri e989b87dfe Distance, Generator, HDS, Convex_hull, Polyhedron, PCA 2019-02-14 10:39:56 +01:00
Maxime Gimeno c650f26c23 Fix OFF reader to detect sooner the flux errors. 2019-02-11 12:45:27 +01: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 e3e0efb4f8 Replace old color API using global const variable with new one using functions 2019-01-24 14:18:49 +01:00
Simon Giraudot 12dfbd6353 Reorganize PLY IO functions/files 2019-01-22 10:00:23 +01:00
Maxime Gimeno c71d1066a2 Fix conflicts 2019-01-11 13:59:08 +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
Maxime Gimeno 9e8bfa3ded Fix code in ply_writer 2018-12-21 09:18:03 +01:00
Maxime Gimeno 1f961fa27b Replace template name in write_ply to show it only works with surface_mesh 2018-12-20 14:11:53 +01:00
Simon Giraudot 1cfcb1ba5b Fix stream status handling everywhere PLY reader is used 2018-12-18 15:28:02 +01:00
Maxime Gimeno a4022d5445 Add hedge uv management to the ply_reader and incorporate it to the ply_io_plugin. IO for textured_surface_mesh 2018-12-18 14:35:32 +01:00
Simon Giraudot f7366b0118 Improve PLY element handling and thus fix bug when reading unknown element 2018-12-18 09:35:02 +01:00
Maxime Gimeno ebab49ea00 Add a PLY writer for textured scene_surface_mesh_items 2018-12-17 15:55:52 +01:00
Simon Giraudot 858d10070b Improve PLY element handling and thus fix bug when reading unknown element 2018-12-17 13:07:56 +01:00
Maxime Gimeno 9112b41b50 normalize normals length in display. Also, make them a little bit bigger. 2018-12-14 15:48:24 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Laurent Rineau 8d0345c373 Merge pull request #3372 from afabri/Polyhedron_IO-inline-GF
inline fill_point()
2018-10-29 10:42:32 +01: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
Andreas Fabri e977ce76b3 inline 2018-10-04 19:37:11 +02:00
Mael Rouxel-Labbé 31246ab517 Test the STL reader a bit more thoroughly 2018-08-03 14:24:34 +02:00
Mael Rouxel-Labbé ef6a6af122 Made STL reader compatible with SequenceContainers
It's useful to not be constrained to cpp11::arrays when the polygon soup
is to be processed through reparation functions (for example)
2018-08-03 14:21:17 +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
Maxime Gimeno 1cba5df6b6 Fix looping overload 2018-06-20 08:38:04 +02:00
Mael Rouxel-Labbé f738319cdc Fixed whitespace (no real changes) 2018-06-11 14:07:56 +02:00
Mael Rouxel-Labbé da95ade46e Added a few more difficulties to the tests 2018-06-11 14:03:31 +02:00
Mael Rouxel-Labbé abfeaf39cd Improved STL reader 2018-06-11 14:02:39 +02:00
Maxime Gimeno 911b6eb4c1 Fix error in print_polyhedron 2018-06-06 16:44:39 +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
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 ed0976600b Fix dependencies 2018-03-09 10:03:58 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Sébastien Loriot bdc9377e20 fix reading of ASCII STL with a name broken by a previous fix 2018-02-26 15:15:59 +01: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
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Andreas Fabri 22bd2815a3 Polyhedron 2018-01-17 17:13:53 +00:00
Andreas Fabri 84be28c0d6 fix error and warning inside a test file 2017-12-13 07:04:58 +00:00
Andreas Fabri cd7f1af9c4 bug fix 2017-12-11 16:39:53 +00:00
Andreas Fabri 49128e332a Also parse headers of binary STL files starting with the keyword 'solid' 2017-12-07 14:57:39 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
Sébastien Loriot ff26773f7b remove include directive for checking GPL compliance in LGPL headers 2017-11-12 10:21:35 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Laurent Rineau e73c95d4cd Do not test demos 2017-10-20 17:01:43 +02:00
Laurent Rineau fd9be189d8 Merge pull request #2536 from sloriot/Demo-add_STL_writer
Add STL writer
2017-10-17 15:20:34 +02:00
Sébastien Loriot 7c3cf02bb2 use unit_normal 2017-10-13 07:48:58 +02:00
Sébastien Loriot 8f50be14c0 add function to write triangle mesh as STL file (binary+ascii)
update IO plugin in the demo
2017-10-12 19:23:11 +02:00
Simon Giraudot d30a044018 Handle case where PLY faces property uses "vertex_index" instead of "vertex_indices" 2017-10-04 09:10:31 +02:00
Simon Giraudot 7f7bcf1511 Check if stream is not bad instead of checking if it's good (yes...) 2017-10-02 11:14:25 +02:00
Simon Giraudot 8e6e35cebd Handle both uint and int for list of indices in PLY input 2017-08-09 09:48:36 +02:00
Simon Giraudot 41f0203222 Read PLY mesh with colors 2017-08-02 14:10:44 +02:00
Simon Giraudot a0bc442741 PLY writer for FaceListGraph 2017-08-02 14:10:43 +02:00
Simon Giraudot db36c0d92c Fix constness and tag name 2017-08-02 14:10:42 +02:00
Simon Giraudot 583a700d96 First version of PLY writer for polygon soups 2017-08-02 14:10:42 +02:00
Simon Giraudot 8311c681e2 First version of PLY reader for polygon soups 2017-08-02 14:10:41 +02:00
Andreas Fabri d94d386f59 fix the testsuite 2017-06-30 18:12:14 +02:00
Andreas Fabri f9827278a2 Document read_off(), and write_off() for Polyhedron_3 and Surface_mesh 2017-06-30 18:12:14 +02:00
Maxime Gimeno 5ae96fc2aa Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found. 2017-05-23 16:12:56 +02:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Sebastien Loriot 162bdc67b4 Merge pull request #1151 from afabri/Polyhedron_IO-stl_reader-GF
ignore triangles with 2 or 3 identical vertices
2016-06-13 09:15:53 +02:00
Andreas Fabri ab3292caa0 ignore triangles with 2 or 3 identical vertices 2016-06-10 14:43:59 +02:00
Maxime Gimeno c2f02afee5 Enhancement
- Moved the code to read an .obj file to OBJ_reader.h
- Made it compatible with not triangle objects.
2016-06-09 16:16:18 +02:00
Sébastien Loriot 11b8eb428b Merge pull request #558 from maxGimeno/Polyhedron_demo-display_indices_of_primitives-GF
Display indices of Polyhedron_item primitives in Polyhedron_demo
2016-05-26 17:09:23 +02:00
Maxime Gimeno b8ecd34eb5 Fix facet color reading 2016-05-12 17:11:28 +02:00
Maxime Gimeno 31b9e81e6d Fix for the polyhedron readOFF with colors 2016-05-12 17:11:28 +02:00
Maxime Gimeno 6761dcae8e Fix tellg/seekg errors 2016-05-12 17:11:28 +02:00
Maxime Gimeno 30a12a8dca Fix for the smooth normals 2016-05-12 17:11:26 +02:00
Maxime Gimeno 128adc4c32 Addition of a color management of the not oriented OFF with colors 2016-05-12 17:11:26 +02:00
Maxime Gimeno 92abf686b3 WIP : add color to IO_OFF 2016-05-12 17:09:14 +02:00
Maxime Gimeno dbb5c07709 Draw text done. WIP Blending 2016-04-27 14:02:27 +02:00
Sébastien Loriot 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sébastien Loriot 2d191d6651 commit CMakeLists.txt for all examples and tests 2016-03-07 17:39:36 +01:00
Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF
Conflicts:
	Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2015-07-16 16:52:53 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00