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

285 Commits

Author SHA1 Message Date
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +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
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 160ec1575c Merge remote-tracking branch 'cgal/master' into Demo-Use_metadata_for_runtime_loading-GF 2018-11-28 15:34:10 +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 278600266d Add external plugin to AABB_tree for do_intersect demo. 2018-10-09 10:28:42 +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 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 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