Commit Graph

83 Commits

Author SHA1 Message Date
Laurent Rineau db338aa1ee Merge pull request #5417 from maxGimeno/Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno
QGLViewer: remove the need for Qt5::Xml
2021-02-18 15:19:06 +01:00
Laurent Rineau 5bd98167d4 Merge pull request #5462 from maxGimeno/CGAL-Fix_qt_warnings-maxGimeno
Fix Qt warnings
2021-02-18 15:18:53 +01:00
Maxime Gimeno 4a6aa7e024 use Qt::MiddleButton instead of MidButton(deprecated since 5.6 or earlier) 2021-02-15 15:22:41 +01:00
Maxime Gimeno 2500331070 Merge remote-tracking branch 'cgal/master' into Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno 2021-02-09 12:33:52 +01:00
Maxime Gimeno c9a020bb1a Remove remaining includes 2021-02-09 12:28:58 +01:00
Maxime Gimeno 9cd0d450f9 Remove QDomElements and need for QtXml 2021-02-09 11:31:34 +01:00
Laurent Rineau c5ba414c72 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:12:42 +01:00
Maxime Gimeno a91d63699f Fix PCA demo and remove debug warnings 2021-01-21 11:06:01 +01:00
Laurent Rineau 9db83004d5 Merge pull request #5107 from maxGimeno/Demo-Optical_zoom_to_pointer-maxGimeno
GraphicsView: Zoom enhancement
2021-01-06 16:11:51 +01:00
Maxime Gimeno b116a92be3 Center the camera on the cursor at first tick of optical zoom 2020-10-23 13:35:05 +02:00
Maxime Gimeno 08469076fc Remove false key binding 2020-10-22 14:06:09 +02:00
Maxime Gimeno 121a23d964 WIP look at on optical zoom 2020-10-14 16:13:14 +02:00
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 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
Sébastien Loriot 58b10a3605 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:58:50 +01:00
Laurent Rineau bf8205642e Fix conversion warnings 2020-01-20 18:18:45 +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
Sébastien Loriot 1ef976e3a5 Remove license notice from libQGLviewer forked files 2019-10-19 16:09:56 +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
Maxime Gimeno 660ebe9e81 Add missing highp and remove unwanted highp 2019-08-05 14:16:02 +02: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
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
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Maxime Gimeno ceee4b8e2d fix axis system 2018-10-26 17:24:10 +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 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 665c25886a Done textured_item and selection_item 2018-09-20 15:11:43 +02:00
Maxime Gimeno fd27bd9c09 Share VBOs between viewers. 2018-09-11 13:06:02 +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 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