Commit Graph

425 Commits

Author SHA1 Message Date
Maxime Gimeno 52785ca166 fix parameter name in doc 2019-04-05 10:05:08 +02:00
Maxime Gimeno 1ffd2842ca Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-04-02 13:51:52 +02:00
Maxime Gimeno 1bd785ae44 Don't select clipped points 2019-03-26 15:30:34 +01:00
Maxime Gimeno b96bd1058f Fix mesh_3 2019-03-13 13:16:12 +01:00
Maxime Gimeno 94541df835 Update to master 2019-03-07 14:33:10 +01:00
Maxime Gimeno 4f97ab767b Update to master. 2019-02-15 14:34:34 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sébastien Loriot 6c6244d9b8 Merge pull request #3516 from maxGimeno/Demo-fixes-GF
Polyhedron Demo: Fixes.
2019-01-31 11:41:58 +01:00
Maxime Gimeno 318f0bf1e7 Merge remote-tracking branch 'cgal/master' into Demo-Fix_reload_with_empty_file-GF 2019-01-23 10:48:26 +01:00
Maxime Gimeno b783e78223 Fix conflicts and display_property_plugin 2019-01-21 14:58:28 +01:00
Maxime Gimeno 89a5718174 Change names and use static functions instead of message_interface. 2019-01-14 09:43:26 +01:00
Maxime Gimeno 1816615649 Fix conflicts 2019-01-11 11:32:34 +01:00
Maxime Gimeno 0c551f93f6 Make static functions for message_interface stuff. 2019-01-11 10:56:59 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Maxime Gimeno 8ce9a1ca68 Don't use extra function in scope guard class 2018-12-14 15:27:37 +01:00
Maxime Gimeno 9ff64eb5dc Fix the PCA plugin 2018-12-14 14:03:31 +01:00
Maxime Gimeno 478313d35d Fix the PCA plugin 2018-12-14 13:58:39 +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 9c3008ebd0 Fix warnings in doc 2018-12-11 10:06:14 +01:00
Laurent Rineau 4320a157c2 Merge pull request #3394 from maxGimeno/Demo-Loading_scenes-GF
Polyhedron demo: Add an action to save a scene
2018-12-10 14:39:07 +01:00
Laurent Rineau be12901e5c Merge pull request #3412 from maxGimeno/Demo-Use_metadata_for_runtime_loading-GF
Polyhedron demo: Make the demo customizable at configure and start time

# Conflicts:
#	Polyhedron/demo/Polyhedron/MainWindow.h
2018-12-10 14:38:49 +01:00
Laurent Rineau 1742057712 Merge pull request #3454 from maxGimeno/Demo-Fix_visibility_change_time-GF
Polyhedron demo: Fix visibility change
2018-12-10 14:38:32 +01:00
Maxime Gimeno 3049da5111 Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-12-07 14:55:08 +01:00
Laurent Rineau 3057b9b143 Merge pull request #3464 from sloriot/Doc-clean_up_ref_groups
Add missing Reference and uniformize ref man group declaration
2018-12-01 16:30:56 +01:00
Maxime Gimeno 0a1e93ec66 Merge remote-tracking branch 'mine/Demo-Use_metadata_for_runtime_loading-GF' into Demo-Multiple_viewers-GF 2018-11-29 11:38:32 +01:00
Maxime Gimeno 160ec1575c Merge remote-tracking branch 'cgal/master' into Demo-Use_metadata_for_runtime_loading-GF 2018-11-28 15:34:10 +01:00
Maxime Gimeno fcb90e9694 Fix after rebase 2018-11-28 12:54:25 +01:00
Maxime Gimeno 4571c4555e Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-11-28 11:58:55 +01:00
Sébastien Loriot 3a1516e940 add missing Reference and uniformize ref man group declaration 2018-11-20 13:47:16 +01:00
Maxime Gimeno 90723240e6 Fix warnings in Three documentation. 2018-11-19 14:09:51 +01:00
Maxime Gimeno 3cc4a174b9 Resolve conflicts 2018-11-19 12:04:58 +01:00
Maxime Gimeno f3e4183e60 Rename functions. 2018-11-19 12:03:17 +01:00
Sebastien Loriot 641efa944b
Merge pull request #3424 from maxGimeno/Demo-Some_fixes-GF
Polyhedron demo: some fixes
2018-11-15 19:57:46 +01:00
Maxime Gimeno 66961f56f6 Add a way to ignore dataChanged() calls of the Scene to optimize big selection manipulation.
Use it to make the visibility change of a selection of items instant instead of possibly very long.
2018-11-14 11:48:03 +01:00
Sebastien Loriot 00cf0a2889
Merge pull request #3413 from gdamiand/CGAL-cmake_cleanup-gdamiand
Clean CMakeLists.txt of examples and tests
2018-11-12 15:01:46 +01:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Maxime Gimeno 8f5a4d17e0 Add a tab to the clipping_box_plugin to clip from a 2D rectangle. 2018-11-08 16:25:14 +01:00
Maxime Gimeno 30339cc0ab Fix conflicts and remove local QSettings. 2018-11-05 10:19:07 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Maxime Gimeno d7751c0fbd Add default points/lines/normals size in preferences. 2018-10-31 12:26:36 +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
Sébastien Loriot cdbe19b480 Merge pull request #3369 from maxGimeno/AABB_tree-AABB_transformed_traits-GF
[Small Feature] Add collision detection in PMP
2018-10-30 15:49:38 +01:00
Laurent Rineau 821f9c015e Merge pull request #3311 from sloriot/Doc-Pkg_link_name
Update the name of package names reference links
2018-10-29 10:27:53 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0c2dcf7208 Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component. 2018-10-18 14:38:42 +02:00
Laurent Rineau 6893d8960f Check for CMakeLists.txt also in demos 2018-10-18 09:36:37 +02:00
Laurent Rineau 6e90a835ee Create an "empty" CMakeLists.txt to fix the testsuite 2018-10-18 09:36:37 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Laurent Rineau a7c5c92f2f Check for CMakeLists.txt also in demos 2018-10-16 12:42:49 +02:00
Laurent Rineau 727cb4336c Create an "empty" CMakeLists.txt to fix the testsuite 2018-10-16 12:32:11 +02:00
Maxime Gimeno 73291165a1 Remove virtual. 2018-10-11 13:53:55 +02:00
Maxime Gimeno 0d376fa5eb Add an action to save a scene 2018-10-11 13:39:16 +02:00
Maxime Gimeno 7a146d415c Fix conflicts 2018-10-09 15:30:21 +02:00
Maxime Gimeno 81a08465d3 Fix conflicts 2018-10-09 10:59:54 +02:00
Maxime Gimeno 278600266d Add external plugin to AABB_tree for do_intersect demo. 2018-10-09 10:28:42 +02:00
Maxime Gimeno 32de514dd8 Fix printIds and zoomtoid now applies to the currentViewer. 2018-10-08 15:55:44 +02:00
Maxime Gimeno b0bf4e371f Remove wrong permissions 2018-10-08 12:07:26 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Maxime Gimeno ad1a1b3321 fix contextmenu after estimate normals 2018-09-28 16:39:53 +02:00
Maxime Gimeno 4c42612690 Display_properties and incorporate getActiveViewer in Three.h 2018-09-28 11:27:42 +02:00
Maxime Gimeno bfce2fb06e clipping_box_plugin 2018-09-27 10:52:56 +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 3ec39c1d08 WIP image_item. Working scene_image_item. 2018-09-19 10:58:18 +02:00
Maxime Gimeno 871603a05c Done implicit_function_item 2018-09-18 13:34:43 +02:00
Maxime Gimeno 59bf7cbd69 Fix spheres_item 2018-09-18 09:53:13 +02:00
Maxime Gimeno a05e0f5fa2 WIP 2018-09-14 15:35:01 +02:00
Maxime Gimeno 382a89eb9d Fix removeViewer not called and do Scene_plane_item 2018-09-13 13:55:25 +02:00
Maxime Gimeno fd27bd9c09 Share VBOs between viewers. 2018-09-11 13:06:02 +02:00
Maxime Gimeno 9fe814e8d3 WIP: Scene_points_with_normal done. Probably. 2018-09-06 17:55:55 +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 29dcdc424f Fix Warnings and Conflicts 2018-08-23 16:29:52 +02:00
Maxime Gimeno 949f93ab80 Add Default Rendering Mode for Surface_mesh and Point_set items to the settings. 2018-08-21 17:21:51 +02:00
Maxime Gimeno efc2579f4c 2 things :
- Add a function to Scene_item to enable specific default save name and use it for selection item in order to remove a possible (selection) from the name.
- Fix the defaultSaveDir property to remove the extension, using all possible extensions leading to a surface_mesh_item.
2018-08-21 11:12:28 +02:00
Maxime Gimeno 7e1b43c62f Add new item and new program for heat intensity display. 2018-08-01 15:47:37 +02:00
Maxime Gimeno 9b776fa516 Fix behaviour when loading an empty file. 2018-07-16 14:10:55 +02:00
Maxime Gimeno f80f318503 WIP Shader fixes 2018-07-03 13:53:57 +02:00
Maxime Gimeno 441f2b8da6 Applying new Edges and fix buggy items. 2018-07-02 16:40:45 +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
Laurent Rineau 742dd907ed Merge pull request #3074 from maxGimeno/Demo-Add_transparency-GF
Polyhedron demo: add Depth-peeling and Rendering Helpers
2018-06-28 16:04:12 +02:00
Maxime Gimeno 5b4cf6304d Add missing dummy useless doc for getters and setters 2018-06-26 14:57:44 +02:00
Laurent Rineau ffd78e296e Workaround a strange error from g++
There was a warning:
```
[100%] Building CXX object demo/Polyhedron/CMakeFiles/polyhedron_demo.dir/MainWindow.cpp.o
/home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.cpp: In constructor ‘MainWindow::MainWindow(bool, QWidget*)’:
/home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.cpp:312:11: error: request for member ‘addDockWidget’ is ambiguous
     this->addDockWidget(Qt::BottomDockWidgetArea, dock);
           ^~~~~~~~~~~~~
In file included from /home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.h:8:0,
                 from /home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.cpp:4:
/home/lrineau/Git/cgal/Three/include/CGAL/Three/Three.h:54:8: note: candidates are: void CGAL::Three::Three::addDockWidget(QDockWidget*)
   void addDockWidget(QDockWidget* dock_widget);
        ^~~~~~~~~~~~~
In file included from /usr/include/qt5/QtWidgets/QMainWindow:1:0,
                 from /home/lrineau/Git/cgal/GraphicsView/include/CGAL/Qt/DemosMainWindow.h:31,
                 from /home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.h:7,
                 from /home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.cpp:4:
/usr/include/qt5/QtWidgets/qmainwindow.h:166:10: note:                 void QMainWindow::addDockWidget(Qt::DockWidgetArea, QDockWidget*, Qt::Orientation)
     void addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget,
          ^~~~~~~~~~~~~
/usr/include/qt5/QtWidgets/qmainwindow.h:165:10: note:                 void QMainWindow::addDockWidget(Qt::DockWidgetArea, QDockWidget*)
     void addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget);
          ^~~~~~~~~~~~~
```

That is strange, because the call is not ambiguous at all: all three
candidates have different numbers of parameters!

Anyway, the workaround is an explicit qualified call to
`QMainWindow::addDockWidget`.
2018-06-13 10:45:33 +02:00
Maxime Gimeno 6b5a162d1d Fix doc 2018-06-13 09:35:47 +02:00
Maxime Gimeno 6bcf2fe30e Use ::Point_d 2018-06-13 09:32:24 +02:00
Maxime Gimeno 0a14aec59e Add misisng license header 2018-06-08 09:11:29 +02:00
Maxime Gimeno c9c3fbc702 Add license to the new file 2018-06-05 09:28:00 +02:00
Maxime Gimeno 6d60cd99ba Add static functions to gain access to the mainwindow and the scene.
Use it to automatically decide which selection_io_plugin should be used.
2018-06-04 12:27:22 +02:00
Maxime Gimeno e144852e25 Add dependencies to Three 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 99582b35f7 Update license files 2018-06-04 12:00:21 +02:00
Maxime Gimeno 12ba1084ad Add classes and functions to factorize and facilitate rendering an item.
Make Surface_mesh_item use them.
2018-06-04 12:00:21 +02:00
Maxime Gimeno 0add845fae Fix snapshot with alpha. 2018-06-04 12:00:21 +02:00
Maxime Gimeno c8d5453a31 Fix c3t3 and add action to viewer to set total number of passes 2018-06-04 12:00:21 +02:00
Maxime Gimeno 1882658a94 Add depth-peeling to the scene. 2018-06-04 12:00:20 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Maxime Gimeno 50c471253a Move context creation to qglviewer. Replace initializeGL() by init()in demo viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 39a0b8a8d5 Restore pivot point drawing 2018-05-17 10:20:55 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau f092c04180 Merge pull request #2607 from maxGimeno/Selection_plugin_fix-GF
Polyhedron demo: Fixes for QGLViewer 2.7 and remove GlSplat
2018-03-06 16:23:58 +01:00
Maxime Gimeno 9db54327db conflict resolution 2018-03-01 08:48:02 +01:00
Maxime Gimeno 3c770e07df Fix 2d painting for selection 2018-03-01 08:40:26 +01:00
Maxime Gimeno b50fddc9d8 Add a function to decide which filter should be the default when saving. 2018-02-14 13:56:00 +01:00
Maxime Gimeno 78bda89857 Add a function to the group_item that specifies which of its children are selected along with it.
This allows the c3t3_item to override it and return an empty list, so it ignores the selection behavior of the group and keeps it possible to apply an operation only to the c3t3 when it has children like visible tets.
2018-01-23 09:26:11 +01:00
Laurent Rineau 65f4e42acc Merge pull request #2606 from sloriot/CGAL-create_release_with_cmake
Add script to create release with cmake
2017-12-05 18:24:58 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau 3466eb83f0 Polyhedron demo: do not use the OpenGL API directly 2017-11-28 17:54:38 +01:00
Maxime Gimeno cba9061d81 Fix warning 2017-11-23 11:19:23 +01:00
Sébastien Loriot 700351d093 remove useless files 2017-11-16 16:50:52 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Maxime Gimeno 91d5ee0247 Remove parentGroup()'s child in group's removeChild() 2017-10-19 14:10:43 +02:00
Laurent Rineau edac6aaa5a Merge pull request #2454 from maxGimeno/Mesh_3_plugin_fix-GF
Polyhedron demo: Fix tets rendering on Windows
2017-10-13 16:53:26 +02:00
Maxime Gimeno 53829630ec Darken the intersection color and avoid the Z-fighting. 2017-09-22 15:12:02 +02:00
Maxime Gimeno c723e97e20 Add missing override in code and doc example. 2017-09-18 12:38:02 +02:00
Laurent Rineau 6f5f5af785 Merge pull request #2070 from maxGimeno/Polyhedron_demo-Use_modern_context-GF
Polyhedron_demo: Use a recent OpenGL context if possible
2017-09-07 17:19:58 +02:00
Laurent Rineau f002ab7d3c Merge pull request #2254 from maxGimeno/Output_surface_facets_to_facegraph-GF
Surface_mesher: Output Surface Facets To Facegraph
2017-09-04 15:09:44 +02:00
Maxime Gimeno 92814e8858 Rename recentFunctions; 2017-08-30 10:27:00 +02:00
Maxime Gimeno bca74e4a8e Rename isRecent into isOpenGL_4_3 2017-08-30 10:26:59 +02:00
Maxime Gimeno 71a8c1c178 Use GS in modern openGL for an optimal flat shading. 2017-08-30 10:26:58 +02:00
Maxime Gimeno 6393d0bc3e Sets an OpenGL 4.3 format if possible and create a QOpenGLFunctions_4_3_Compatibility in that case. 2017-08-30 10:25:05 +02:00
Maxime Gimeno d57be1d856 Add documentation and update changes.html 2017-08-09 10:31:04 +02:00
Maxime Gimeno 04649a598a Rebase and doc. 2017-08-01 14:59:58 +02:00
Maxime Gimeno 599fd8322b Add an interface for transparent items so there faces are always drawn after the rest of the scene. This way their position in the scene entries does not affect the display of other items. 2017-08-01 14:59:58 +02:00
Maxime Gimeno 484e03570f - add clipping planes management in main shaders. (with and without lights, flat and no_selection)
- Add plugin for use of a clipping box
2017-08-01 14:59:58 +02:00
Maxime Gimeno 13723a704f Targeting and ID now displays a zone of Ids.
This zone is affected by vertex/edge/face printing or not.
ZoomToId displays a zone around the targeted Id.
2017-07-25 10:02:07 +02:00
Maxime Gimeno ee93ab34dd Selection_items keep displaying their polyhedron_items ids and zoomToId doesn't override the sceneCenterPoint anymore. 2017-07-25 10:01:28 +02:00
Maxime Gimeno 3c08937edb Fix display all. 2017-07-25 10:01:28 +02:00
Maxime Gimeno 49818ae489 Split the display into vertices, edges and faces text lists. Add an option for each in the contextMenu. 2017-07-25 10:01:28 +02:00
Laurent Rineau e0f7e1ff2c Merge pull request #2229 from maxGimeno/Fix_clipping_bug-GF
Polyhedron_demo: Fix clipping bug
2017-07-10 15:35:30 +02:00
Maxime Gimeno ced658ce82 typo 2017-07-04 15:51:31 +02:00
Maxime Gimeno 4454047702 Add a signal and slots to avoid clipping bugs when playing with items visibility and RenceterScene. 2017-07-04 14:14:49 +02:00
Maxime Gimeno b889359928 FIx Polyhedron_demo for QGLViewer v2.7.0 2017-07-03 09:35:14 +02:00
Maxime Gimeno 2e506fe18d Add Q_DECL_OVERRIDE in the examples 2017-05-30 15:17:12 +02:00
Maxime Gimeno b04c1e1a96 Change name for UI so it matches the naming convention. 2017-05-30 15:17:12 +02:00
Maxime Gimeno a84acd367d Add the misisng interface file 2017-05-30 15:17:12 +02:00
Maxime Gimeno 4132b2d55d Finish updating the doc 2017-05-30 15:17:12 +02:00
Maxime Gimeno c60acf58c4 Update example plugins 2017-05-30 15:17:12 +02:00
Maxime Gimeno f85a6a52aa Finish updating the in code doc. 2017-05-30 15:17:12 +02:00
Maxime Gimeno 2570bd3a53 Explicitates the TextRenderer's doc. 2017-05-30 15:15:55 +02:00
Maxime Gimeno 05126f0971 Enhancements :
- Explicitate the doc
- Make the Scnee_print_item_interface a real interface
2017-05-30 15:15:54 +02:00
Maxime Gimeno 965e6f545d Make Viewer_interface more interface-like. 2017-05-30 15:12:31 +02:00