Commit Graph

84 Commits

Author SHA1 Message Date
Maxime Gimeno 5e63293747 Replace plane manipulation by frame manipulation. 2021-02-03 11:41:07 +01:00
Guillaume Damiand a09a4684f4 Start to use manipulated frame for clipping plane 2021-02-03 08:56:52 +01:00
Guillaume Damiand 3b838da50a Re-add clipping plane. 2021-01-27 18:47:38 +01:00
Laurent Rineau 9c97b1dafc Remove trailing whitespaces 2020-10-13 14:34:42 +02:00
Maxime Gimeno 43a49605e0 Fix conflicts 2020-10-05 13:20:40 +02:00
Maxime Gimeno cfa89e9da4 Replace < by O to have it on all keyboards, not only french ones 2020-09-29 15:51:16 +02:00
Sébastien Loriot 30ac63a867 remove trailing whitespaces 2020-08-31 16:08:38 +02:00
Guillaume Damiand 86307add6d Add an option to toggle between 2D and 3D mode for the viewer. 2020-08-31 15:14:53 +02:00
Laurent Rineau 4d59f718ac Add setters to set all those Booleans afterwards 2020-07-24 13:10:51 +02:00
Laurent Rineau e831481e6e Make `redraw()` public 2020-07-24 13:10:37 +02:00
Laurent Rineau a1a1ee4496 Move shortcuts and descriptions in the constructor
@gdamiand Please review this patch
2020-07-23 17:37:23 +02:00
Guillaume Damiand 7ec9d576cd Do not re-use standard keys in basic viewer. 2020-04-27 18:55:25 +02:00
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
Guillaume Damiand 3d0b69be50 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-03 16:15:09 +01:00
Guillaume Damiand 8be7c183b4 Remove warnings (thanks @sloriot) 2019-11-29 15:51:34 +01:00
Guillaume Damiand e4300e4ddc Anticipate a conflict with another branch. 2019-11-26 13:54:15 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Guillaume Damiand c94c1a0874 Continue case with perforated faces. 2019-11-20 16:04:04 +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 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
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
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 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
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 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
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 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
Jasmeet Singh ce1b306d00 Add m_buffer_for_mono_lines and m_buffer_for_colored_lines to view lines.
Trying to visualize bisectors. Formatting changes.
2019-06-19 19:49:09 -07:00
Jasmeet Singh 43015b0059 Add special KeyPressEvent for rays. Format typedefs. Set cgal_test_suit = qEnvironmentVariableIsSet("CGAL_TEST_SUITE")
Adding these changes after learning from the viewers generated by GDamiand.
2019-06-19 14:24:40 -07:00
Jasmeet Singh 955a982a5f Add an example for Voronoi diagram basic viewer.
For rays: draw a really big segment without modifying bounding box.
Hence, the initial screen of the viewer is correctly adjusted.
For faces: drawing only bounded faces for now. The function getSecondPoint(Halfedge)
can help to draw unbounded faces. Keypress R to view/unview rays.
2019-06-19 13:43:07 -07:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Guillaume Damiand cbdd2d536e In 2D, the viewer should also fix the camera orientation (and not only contraint it) 2019-06-19 11:02:17 +02:00
Jasmeet Singh cd3cfc0bc5 Remove wireframe toggle button as it is unavailable in qOpenGLFunctions 2019-06-18 18:27:00 -07:00
Jasmeet Singh ff5e9a3820 Add compute_face() functionality and get_second_point() to find intersection of ray with bounding box
Show wireframe. Not building successfully as qOpenGLFunctions do not support glPolygonMode(). Comitting to save progress.
2019-06-18 17:51:22 -07:00
Jasmeet Singh 2874ce940c Merge remote-tracking branch 'jasmeet9323/cgal/master' into gsoc2019-add_basic_viewer-jasmeet
Sync my branch with remote to avoid conflicts during PR.
2019-06-18 12:56:28 -07:00
Jasmeet Singh 4f9df720ea Toggle ray display with keypress R. Start adding face viewer 2019-06-17 20:45:04 -07:00
Jasmeet Singh 1cc0d12aa4 Revert formatting of the rest of Basic_viewer_qt.h file 2019-06-17 20:13:30 -07:00
Jasmeet Singh 1d4b6242f4 Show rays upto a bounding box 2019-06-17 20:02:08 -07:00