songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
113,626 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

590 Commits

Author SHA1 Message Date
Laurent Rineau 7a48e35ffe Merge pull request #5042 from maxGimeno/Viewer-Zoom_to_rectangle 
Viewer zoom to rectangle
 2020-10-09 16:50:24 +02:00
Maxime Gimeno a28dd524b7 another warning fix 2020-10-07 09:59:18 +02:00
Maxime Gimeno dcbb50a134 fix warning 2020-10-06 12:58:45 +02:00
Maxime Gimeno 43a49605e0 Fix conflicts 2020-10-05 13:20:40 +02:00
Sebastien Loriot 9a9acceb10
Merge pull request #4761 from maxGimeno/GraphicsView-Fixes_for_Regular_triangulation_2-maxGimeno 
GraphicsView: Regular_triangulation_2 enhancements
 2020-10-02 15:20:20 +02:00
Maxime Gimeno e75b70064a Recenter the scene resets the FOV 2020-10-01 10:05:18 +02:00
Maxime Gimeno a175741570 Add help for optical zoom 2020-10-01 09:10:33 +02:00
Maxime Gimeno 06995b543a Add a zoom with z+wheel 2020-09-30 16:28:25 +02:00
Maxime Gimeno bd5d625e7b restore rectangle drawing while zooming on position 2020-09-30 13:12:23 +02:00
Maxime Gimeno 9503a6a18b Remove state of camera. It is supposed to be reinit when launching the app and sometimes it leads to not being to visualize anything 2020-09-29 16:06:35 +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
Laurent Rineau 66040cb5f3 A few fix to our LEDA testsuite 2020-07-20 17:13:01 +02:00
Maxime Gimeno 624e8e803a Fix flag fix 2020-06-12 10:34:48 +02:00
Maxime Gimeno a9795c3562 Fix deprecation warnings 2020-06-11 13:11:36 +02:00
Maxime Gimeno e28a3ac2cc Fix some edge width and add a double click event to add a 0 wheighted point. 2020-06-02 12:55:25 +02:00
Sebastien Loriot 2d3e126450
Merge pull request #4602 from gdamiand/gsoc2019-nccycles-thien 
Surface mesh topology shortest cycle
 2020-04-29 09:10:37 +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 58b10a3605 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:58:50 +01:00
Sébastien Loriot c1a42c7d37 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:21 +01: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
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 bf8205642e Fix conversion warnings 2020-01-20 18:18:45 +01:00
Laurent Rineau 67b1b0e04f Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand 
Surface mesh topology (new package)
 2020-01-15 17:24:06 +01:00
Laurent Rineau 25bcb34608 Merge pull request #4440 from maxGimeno/CGAL_qt-Fix_deprecation_warnings-maxGimeno 
Graphics_view : Fix QTime warnings
 2020-01-15 17:19:22 +01:00
Maxime Gimeno 8b30d9c752 remove obsolete hint fon antialiasing 2020-01-13 15:52:36 +01:00
Maxime Gimeno 1968f2cf20 Replace `QTime`s by `QElapsedTimer`s. It seems the header of QTime has been deprecated but it has not been documented... 2020-01-02 10:04:31 +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 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
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
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
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
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
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
jasmeet9323 1a04afdae4 Experimenting with bounding box-ray intersection 2019-06-17 14:20:30 -07:00
Jasmeet Singh 1c852ed586 Add several points to display a ray. 
The viewer stopped displaying anything.
 2019-06-14 21:59:03 -07:00
Jasmeet Singh abe9f2f7e4 Checking directions of rays. 2019-06-14 19:18:55 -07:00
Jasmeet Singh a06f4f9aa2 Add method add_line(point, vector) in Basic_viewer_qt to view rays. 2019-06-12 23:38:38 -07:00
Jasmeet Singh 608ba3eee8 Start to implement infinite line in basic viewer. 2019-06-12 23:05:10 -07:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Maxime Gimeno 4b66010b75 Fix znear management in orthographic mode 2019-05-21 13:33:05 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Sebastien Loriot b87db08b08
Merge pull request #3355 from maxGimeno/Demo-Multiple_viewers-GF 
Polyhedron demo: Multiple Viewers
 2019-04-23 10:34:26 +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
Maxime Gimeno e02eef8aa3 add misisng highp in compatibility shaders 2019-03-18 09:33:22 +01:00
Maxime Gimeno 1761c62087 Fix forgotten compileSoureShader 2019-03-18 09:24:01 +01:00
Maxime Gimeno 0059f92326 Fix normals to normal 2019-03-15 16:07:52 +01:00
Maxime Gimeno 38828181aa Dont call mat3() constructor 2019-03-15 15:38:44 +01:00
Maxime Gimeno f39fce13e3 Remove remaining #version from compatibility glsl and use compatibility shaders in basic_viewer 2019-03-15 13:36:36 +01:00
Maxime Gimeno 4f97ab767b Update to master. 2019-02-15 14:34:34 +01:00
Maxime Gimeno d069b6f673 Only use -Wdeprecated-copy if GCC version is >=9 2019-01-30 11:15:51 +01:00
Andreas Fabri a7d65b7913 Try to fix Polyhedron examples with Basic Viewer 2019-01-24 18:22:02 +01:00
Andreas Fabri f627339eea Fix Vec and Exponent_vector 2019-01-15 18:32:48 +01:00
Maxime Gimeno 955053e239 Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-12-11 10:49:41 +01:00
Maxime Gimeno 4571c4555e Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-11-28 11:58:55 +01:00
Guillaume Damiand edfdc8d346 Readd the random face color option for lcc viewer. 2018-11-27 17:02:38 +01:00
Guillaume Damiand a5e1edd698 Continue to update the lcc demo and the basic viewer. 2018-11-27 11:59:29 +01:00
Guillaume Damiand 9c3faed5c5 Bug fixes; nyf 2018-11-26 22:06:13 +01:00
Sébastien Loriot e925b1aba6 Merge pull request #3225 from maxGimeno/Demo-Remove_polyhedron_item-GF 
Polyhedron demo: remove the Scene_polyhedron_item
 2018-10-30 15:50:17 +01:00
Laurent Rineau 73dd93c4e1 Merge pull request #3405 from gdamiand/CGAL_basic_viewers-bugfix-gdamiand 
Basic viewers: bugfix for Epeck
 2018-10-29 10:27:37 +01:00
Maxime Gimeno ceee4b8e2d fix axis system 2018-10-26 17:24:10 +02:00
Maxime Gimeno 9e563d1307 Fix conflicts 2018-10-16 09:30:04 +02:00
Guillaume Damiand f8a9bec308 Expose local type so that we can use them in basic viewers. 2018-10-15 14:18:24 +02:00
Maxime Gimeno b0bf4e371f Remove wrong permissions 2018-10-08 12:07:26 +02:00
Maxime Gimeno 20a6797bea Replace nullptr by NULL in qglviewer. 2018-10-08 11:55:24 +02:00
Maxime Gimeno 32c0064900 Use the same QSettings everytime to save 200ms everytime. 2018-10-05 15:56:42 +02:00
Maxime Gimeno d6c1301e0a Fix conflicts 2018-10-04 14:06:16 +02:00
Maxime Gimeno c3fab3df15 workaround for multiple linking under windows. 2018-10-03 09:16:27 +02:00
Maxime Gimeno ab3ad395fc RemoveViewer on context destroyed 2018-10-03 09:02:43 +02:00
Maxime Gimeno 6d54163bbd Edit_sphere_item 2018-09-25 12:13:37 +02:00
Maxime Gimeno 9ca2833588 Fix conflicts, fix polygon_soup normals computation, change Extrude Item text. 2018-09-24 11:34:32 +02:00
Maxime Gimeno 665c25886a Done textured_item and selection_item 2018-09-20 15:11:43 +02:00
Guillaume Damiand 865e6bf01e Move operator << inside CGAL::qglviewer namespace. 2018-09-11 17:26:15 +02:00
Maxime Gimeno fd27bd9c09 Share VBOs between viewers. 2018-09-11 13:06:02 +02:00
Guillaume Damiand 1db0bd0a79 Bugfix for operator<< 2018-09-11 11:46:26 +02:00
Guillaume Damiand 64c7a083ce Bugfix in doc 2018-09-11 11:46:13 +02:00
Guillaume Damiand 243a12be43 Fix viewer in 2D for 2D data sets. 2018-09-10 12:20:10 +02:00
Guillaume Damiand bf20b43ea5 Start to implement 2D mode for viewers; nyf. 2018-09-07 20:19:41 +02:00
Guillaume Damiand 71555b18cf Update namespace 2018-09-06 18:46:39 +02:00
Guillaume Damiand 2c8af2ebcc Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program. 2018-09-06 18:43:32 +02:00
Maxime Gimeno e5aaab93d5 Remove visibleBbox from scene. Working subviewer. 2018-09-04 10:35:46 +02:00
Maxime Gimeno 06ce5dddca WIP : trying to figure out why the items are not drawn. 2018-09-03 10:51:01 +02:00
Maxime Gimeno daac3e124d WIP: integrate is_sharing in qglviewer 2018-09-03 09:21:09 +02:00
Maxime Gimeno 805e4669e4 Avoid having the visual hints hidden by the mesh when zooming too much. 2018-08-21 09:32:29 +02:00
Maxime Gimeno 818e0d1f11 Clean-up 2018-07-06 12:33:52 +02:00
Maxime Gimeno c8adcc3e86 Downgrade to GLSL 150 (OpenGL 3.3) because of some systems. 2018-07-05 15:35:30 +02:00
Maxime Gimeno b68f63e508 Fix basic_viewer 2018-07-05 15:21:58 +02:00
Maxime Gimeno 4c58c214c3 make 2 versions of all shaders : 1 for --old and 1 for 4.3 2018-07-05 14:34:10 +02:00
Maxime Gimeno 640243a658 Remove calls to glLineWidth, as OpenGL ES 2.0 doesn't support higher than 1. 2018-07-05 10:37:41 +02:00
Maxime Gimeno 9a258d081f Remove remaining calls to GL_LIGHT smth 2018-07-04 15:37:24 +02:00
Jane bace15874b to the app to force use 2.1 context.he commit. 2018-07-04 13:34:26 +01:00
Maxime Gimeno 73adc3e300 Fix edit_plugin 2018-07-04 13:58:01 +02:00
Jane d72fd85053 context is correct.commit message for your changes. Lines starting 2018-07-04 12:52:27 +01:00
Maxime Gimeno f80f318503 WIP Shader fixes 2018-07-03 13:53:57 +02:00
Maxime Gimeno 2dbbca18b3 Restore point size 2018-07-02 11:09:48 +02:00
Maxime Gimeno 54e0e16167 Restore 4.3 context 2018-07-02 10:04:40 +02:00
Jane 93d9e8e227 Remove problematic gl calls 2018-06-29 18:40:25 +02:00
Maxime Gimeno 301416c151 Pass to OpenGL_ES_2 2018-06-29 12:06:06 +02:00
Maxime Gimeno 2f4f22d236 Merge remote-tracking branch 'cgal/master' into Demo-Add_transparency-GF 2018-06-21 11:42:26 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF 
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
 2018-06-20 17:21:01 +02:00
Laurent Rineau 2b33f0690d Merge pull request #2687 from maxGimeno/OpenGL-debugging_option-GF 
Polyhedron demo: add some OpenGL debugging information
 2018-06-14 17:36:54 +02:00
Laurent Rineau 08043e442c Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand 
Add basic viewers
 2018-06-14 17:36:37 +02:00
Laurent Rineau 3a4121b207 Merge pull request #3148 from maxGimeno/Demo-Fix_orthographic_projection-GF 
Polyhedron demo:Fix_orthographic selection

# Conflicts:
#	GraphicsView/include/CGAL/Qt/qglviewer_impl.h
 2018-06-14 17:36:26 +02:00
Mael Rouxel-Labbé 6283291c8a Moved CGAL::iterator to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Maxime Gimeno 8e7fc0b852 Merge master to solve conflicts. 2018-06-13 09:40:56 +02:00
Laurent Rineau a3a2a1d9de
Use Vec in the CGAL::qglviewer namespace 2018-06-12 16:15:34 +00:00
Laurent Rineau 5c6eee6ac3 Merge branch 'master' into Demo-Fix_orthographic_projection-GF 2018-06-12 18:01:55 +02:00
Laurent Rineau 1df3c3e922 Merge branch 'master' into GraphicsView-no_using_namespace_std-GF 2018-06-12 17:37:15 +02:00
Guillaume Damiand c08546276b Factorize draw functions in Basic_viewer_qt.h, when CGAL_USE_BASIC_VIEWER is not defined. 2018-06-11 13:06:20 +02:00
Maxime Gimeno 87fb0cc39a Remove remaining legacy code that generated GL_STACK_UNDERFLOW errors. 2018-06-07 09:56:08 +02:00
Maxime Gimeno 1c6a96d1cf Add qt gl debugging info. 2018-06-06 16:59:34 +02:00
Maxime Gimeno c4b28fd000 Remove the using namespace from the impl files 2018-06-06 16:15:55 +02:00
Laurent Rineau 1f646405e8 Fix -Wconversion warnings (and a few others) in QGLViewer 2018-06-05 14:48:24 +02:00
Maxime Gimeno 39a645883b add misisng namespace before EXIT_VIEWER 2018-06-05 09:45:40 +02:00
Maxime Gimeno 2e56820d8d Fix after rebase 2018-06-04 12:00:22 +02:00
Maxime Gimeno 21359581c4 Add viewer's modifications to CGAL_Qt5 2018-06-04 12:00:22 +02:00
Maxime Gimeno 025968643b Fix_orthographic selection 2018-06-04 11:44:56 +02:00
Andreas Fabri 1969ee9853 Fix the license header, as the dual licensing does not apply to pur fork 2018-05-31 10:05:46 +01:00
Andreas Fabri f5b6ec67ef Remove 'using namespace std;' from the qglviewer files 2018-05-31 09:44:49 +01:00
Maxime Gimeno 979bde1025 Fix Triangulation_3 viewer 2018-05-29 11:27:53 +02:00
Guillaume Damiand 4c5b0d31d4 Remove unused variable 2018-05-29 11:11:50 +02:00
Andreas Fabri 4b14990209 Fix warnings; Remove typename in non-template code 2018-05-29 11:11:50 +02:00
Guillaume Damiand 39de8ac459 Add licence includes 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 82e30832ed Add a redraw method. 2018-05-29 11:04:57 +02:00
Guillaume Damiand f1e9fc7ed8 Move class in CGAL namespace 2018-05-29 11:04:57 +02:00
Guillaume Damiand 62492150e0 Update Buffer_for_vao and Basic_viewer_qt 2018-05-29 11:02:00 +02:00
Guillaume Damiand f70c6fed86 Update basic viewer to: (1) use a generic class that can maybe be used also in demos; (2) use same name to add mono/colored objects. 2018-05-29 11:02:00 +02:00
Guillaume Damiand 0e6eded6b7 Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand cc3410a729 Bugfix in basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 374da8b55d Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 9e4f2870b8 Work on generic display function. 2018-05-29 11:01:59 +02:00
Maxime Gimeno d617e33253 Add possibly missing include QMouseEvent containing the Qt::NoButton enum. 2018-05-18 10:02:09 +02:00
Andreas Fabri 3804bf6983 Fix Triangulation_3 demo (CGAL_PI) 2018-05-18 08:01:26 +01:00
Andreas Fabri 13454d01c1 Replace M_PI with CGAL_PI 2018-05-17 10:26:08 +01:00
Maxime Gimeno f7d0fc72cd fix the <:: error 2018-05-17 10:20:57 +02:00
Maxime Gimeno 8bf7fcbfe1 Add missing license include 2018-05-17 10:20:57 +02:00
Maxime Gimeno f94a50646f Add license to new file 2018-05-17 10:20:57 +02:00
Maxime Gimeno 03aa69c039 Clean-up the code: 
Remove deprecated functions
Remove useless file
 2018-05-17 10:20:57 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Laurent Rineau 8fbab5edde Enfore singleton, using qApp->property 2018-05-17 10:20:56 +02:00
Jane Tournois 7d49e2fb17 make the copy-constructor private, and do not define it, 
to make sure it will not be used.

and add missing include
 2018-05-17 10:20:56 +02:00
Laurent Rineau 02d5c69066 typo: frok/fork 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0d4c153da2 Fix ImageInterface UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 1c8b2a02c9 use CGAL_QT_EXPORT 2018-05-17 10:20:56 +02:00