Commit Graph

339 Commits

Author SHA1 Message Date
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Laurent Rineau 2c5826dd6f Merge pull request #4474 from sloriot/CGAL-warning_macro
Update warning macro usages

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
2020-01-17 16:29:49 +01:00
Laurent Rineau fe91249ac4 Merge pull request #4474 from sloriot/CGAL-warning_macro
Update warning macro usages

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
2020-01-17 16:27:13 +01:00
Sébastien Loriot 4fbd1ed69c use CGAL_warning_msg instead of CGAL_warning to display a message 2020-01-16 14:14:13 +01:00
Laurent Rineau d19f79ee0d Merge pull request #4163 from MaelRL/T2-Throw_on_collinear_strongly_intersecting_segments-GF
CDT2: Throw on constraint intersections that do not require constructions
2019-12-05 11:05:47 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Sébastien Loriot 1bf02b2d94 remove license statements 2019-11-13 15:32:23 +01:00
Guillaume Damiand f42c9ab89d Update licences 2019-11-13 14:44:45 +01:00
Guillaume Damiand 7d2cf8df71 Bugfix in draw nef3 2019-11-13 14:38:22 +01:00
Guillaume Damiand d638c80b5a
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet 2019-11-12 22:13:10 +01:00
Laurent Rineau 30b02eea63 Merge pull request #4303 from sloriot/CGAL-SPDX_updates
Update SPDX tags
2019-10-25 16:26:13 +02:00
Constantinos Chamzas a55b90ef2a Namespaced newell function 2019-10-22 11:31:09 -05:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +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
Mael Rouxel-Labbé e4c0bcffa0 Update usage of intersection tags 2019-09-19 18:32:34 +02:00
Guillaume Damiand 2b381af544 Remove more warnings 2019-09-16 17:19:49 +02:00
Jasmeet Singh 63d1838b60 Merge remote-tracking branch 'cgal/master' into gsoc2019-add_basic_viewer-jasmeet 2019-07-23 12:27:41 -07:00
Jasmeet Singh b188dabef4 Small Environment variable fix. 2019-07-12 11:45:55 -07:00
Jasmeet Singh a943d8e479 Specialize draw() function for Nef_3 viewer 2019-07-12 11:12:57 -07:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Jasmeet Singh e5986189a5 Correct vertex normals. Gourard Shading works. 2019-07-03 13:53:08 -07:00
Jasmeet Singh ac5b76c0d1 Remove unused compute_vertex() method, display nef in one color 2019-07-02 16:35:53 -07:00
Jasmeet Singh 16992e743e Add color to faces. Code cleanup 2019-06-29 19:12:43 -07:00
Jasmeet Singh 625ab7583d Count and tally the number of edges drawn for validation. 2019-06-29 18:08:07 -07:00
Jasmeet Singh f9690fb852 Add face normal computation. 2019-06-29 17:53:35 -07:00
Jasmeet Singh 5b19e7d1a5 Add debug output. Classify newell_single_step_3 function using namespace CGAL to avoid ambiguity. Add example file to draw. 2019-06-29 14:25:43 -07:00
Jasmeet Singh 42c09f550d Add viewer for faces of Nef Polyhedron. 2019-06-28 13:25:09 -07:00
Jasmeet Singh 9995083b9e Add a visitor class to view the elements of Nef Polyhedron. Only vertices viewed for now. 2019-06-28 11:44:52 -07:00
Jasmeet Singh 6843c2ed69 Add viewer for Nef Polyhedra. Only points viewed for now.
File Buffer_for_vao.h modified to classify the ambiguous call to the function newell_single_step_3().
Added namespace identifier 'internal::' to avoid conflict with function in normal_vector_newell_3.h included in
Nef_polyhedron_3.h
2019-06-27 12:44:38 -07:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Laurent Rineau 5dc823d509 Merge branch 'releases/CGAL-4.14-branch' 2019-05-23 08:49:56 +02:00
Laurent Rineau 7be5e3fbe5 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-23 08:44:39 +02:00
Sébastien Loriot a84ff2d663 fix index order of triangles 2019-04-24 09:48:45 +02:00
Sébastien Loriot ca755e35a8 Merge pull request #3599 from maxGimeno/Nef_3-Document_Nef_3_to_Polygon_soup-GF
Nef_3 : Document convert_nef_polyhedron_to_polygon_soup-GF
2019-04-23 09:52:26 +02:00
Sébastien Loriot 28ec0d926d remove unused typedef 2019-04-12 17:52:31 +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
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 ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +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 8ec090d1d1 remove condition for cpp11 in Nef 2019-03-29 10:41:50 +01:00
Andreas Fabri a77988e149 Fix Nef_3 2019-01-24 18:06:03 +01:00
Maxime Gimeno e2f2c63e76 Modifications after review 2019-01-23 11:25:00 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Andreas Fabri 09ae18b191 Fix Nef_3 2019-01-22 19:07:31 +01:00
Andreas Fabri 9fc58ff874 Fix SNC_sphere_map 2019-01-22 19:07:31 +01:00
Andreas Fabri d8f608fa51 fix Nef_3 2019-01-15 18:20:36 +01:00
Maxime Gimeno ce72dd895f First draft of the doc 2019-01-15 12:38:04 +01:00