Laurent Rineau
0ea4cf4054
Merge branch 'releases/CGAL-5.0-branch'
2019-12-05 11:04:14 +01:00
Guillaume Damiand
157116f7c8
Re-add add_xxx method as static, since they are used without instance in Polyhedron demo.
2019-11-19 10:36:08 +01:00
Guillaume Damiand
1c52b7e715
One more bug
2019-11-13 12:24:30 +01:00
Guillaume Damiand
cc663c5e36
Bugfix for negate normals.
2019-11-13 12:18:27 +01:00
Guillaume Damiand
bb117e9792
Bug fix
2019-11-13 11:51:54 +01:00
Guillaume Damiand
d638c80b5a
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet
2019-11-12 22:13:10 +01:00
Sébastien Loriot
585bb8c7d6
fix license issues
2019-11-07 06:22:28 +01:00
Sébastien Loriot
9a0bff4008
remove BOOST_FOREACH added by recent PRs
2019-11-04 10:59:15 +01:00
Sébastien Loriot
1ef976e3a5
Remove license notice from libQGLviewer forked files
2019-10-19 16:09:56 +02: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
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
d0f23b56f6
update deprecated 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-only/"
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-only/"
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-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
2019-10-18 22:08:05 +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
Laurent Rineau
47fcaf3d47
Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
...
Do not require -DCGAL_HEADER_ONLY
2019-10-15 16:34:09 +02:00
Guillaume Damiand
0707d80d63
Update basic viewer to avoid conflict with another external function.
2019-10-15 11:16:02 +02:00
Guillaume Damiand
9721942d8a
Add possibility to draw text.
2019-10-14 14:26:23 +02:00
Laurent Rineau
24a099afc6
Fix CGAL_Qt5 in non-header-only
2019-10-14 11:24:13 +02:00
Guillaume Damiand
4938528f33
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet
2019-09-16 15:13:25 +02:00
Guillaume Damiand
2325a08b5d
Remove warning
2019-09-16 14:18:19 +02:00
Maxime Gimeno
660ebe9e81
Add missing highp and remove unwanted highp
2019-08-05 14:16:02 +02:00
Maxime Gimeno
b462519b28
Merge remote-tracking branch 'cgal/master' into BasicViewer-Update_shaders-GF
2019-08-05 11:15:20 +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
Sebastien Loriot
9d20767816
Merge pull request #4080 from gdamiand/patch-1
...
Bug fix in is_empty method in Buffer_for_vao
2019-07-19 15:25:15 +02:00
Jasmeet Singh
8250ae7ce0
Correct comment.
2019-07-18 12:16:03 -07:00
Jasmeet Singh
29209076b1
Offset Polygons only in the case of 2D data structures.
2019-07-18 12:13:20 -07:00
Sébastien Loriot
2e747dd300
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD
2019-07-18 17:01:42 +02:00
Sebastien Loriot
667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
...
match @{ and @}
2019-07-18 16:26:43 +02:00
Jasmeet Singh
50bcc2c1c6
Fix the overlap of faces over edges. Edges visible in two-dimensional basic viewers now.
2019-07-15 12:18:22 -07:00
Jasmeet Singh
c94965a0e1
Minor fix in is_empty() method.
2019-07-12 11:59:06 -07:00
Jasmeet Singh
8c2f10fec6
Fix bug in is_empty() method which was making the viewer window crash.
2019-07-12 10:13:51 -07:00
Guillaume Damiand
c57cbb6173
Bug fix in is_empty method in Buffer_for_vao
...
The fix is small; tested locally.
2019-07-12 16:16:40 +02:00
Maxime Gimeno
272b4360d0
Merge remote-tracking branch 'mine/CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF
2019-07-11 10:23:39 +02:00
Maxime Gimeno
480256cbe1
Add a #if for screenat
2019-07-11 10:22:34 +02:00
Jasmeet Singh
596a186963
Update has_zero_*() methods to incorporate rays and lines.
2019-07-10 17:08:34 -07:00
Jasmeet Singh
a542fbdb45
Merge remote-tracking branch 'cgal/master' into gsoc2019-add_basic_viewer-jasmeet and resolve conflicts
2019-07-10 11:48:38 -07:00
Laurent Rineau
dc02598a5c
Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
...
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Maxime Gimeno
261c596cfc
Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF
2019-07-10 14:04:34 +02:00
Maxime Gimeno
1184530530
More warnings fixed
2019-07-10 14:02:06 +02:00
Maxime Gimeno
e6e8d232cb
Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF
2019-07-10 11:52:58 +02:00
Maxime Gimeno
6e1e8e9dc4
add missing modifications
2019-07-09 10:22:30 +02:00
Maxime Gimeno
243c7b1c75
Replace matrix with worldTransform
2019-07-08 14:05:42 +02:00
Sébastien Loriot
983645a51a
match @{ and @}
2019-07-05 21:49:46 +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
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
Jasmeet Singh
c412d3b0f7
Fix bugs in Voronoi Diagram Viewer. Format code. Fix bug in voronoi diagram documentation.
...
Faces have the same color after toggling vertices - fixed.
Rays and dual vertices have different colors from edges and voronoi vertices - fixed.
Toggle for Voronoi vertices created, now V would only toggle vornoi vertices, not all vertices - fixed
2019-06-24 15:21:16 -07:00
Guillaume Damiand
012d44398f
Remove 2 warnings.
2019-06-24 09:24:37 +02:00
Jasmeet Singh
e769c14b00
Change NULL to nullptr in buffer initialization.
2019-06-21 13:20:23 -07:00
Jasmeet Singh
e096af3133
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet
2019-06-21 12:25:30 -07:00
Jasmeet Singh
d1295ce338
Change order of constructor arguments so that existing derived classes from Basic_viewer which call this constructor set the arguments correctly.
2019-06-21 11:30:22 -07:00