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

5620 Commits

Author SHA1 Message Date
Jane c8c12fdff4 Fix textured_polys. 2018-07-02 16:26:55 +01: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
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
Laurent Rineau 2d9000efde Merge pull request #3111 from sloriot/PMP-coref_preserve_face_attributes 
Add a visitor to track the creation of faces in corefinement functions
 2018-06-28 16:09:37 +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
Laurent Rineau c68cf8fc4c Merge pull request #3129 from sgiraudot/Point_set_processing-Callbacks-GF 
Point Set Processing: Callbacks
 2018-06-27 10:21:40 +02:00
Laurent Rineau b86fff3f90 Merge pull request #3128 from sgiraudot/Solver_interface-Warn_against_diagonalize_traits-GF 
Solver Interface: deprecate CGAL::Diagonalize_traits
 2018-06-27 10:21:37 +02:00
Laurent Rineau e5a960fc1a Merge pull request #3144 from maxGimeno/Demo-Automatically_choose_between_poly_and_sm_selection_io_plugin-GF 
Polyhedron demo: Automatically decide between selection_io_plugin or selection_io_sm_plugin
 2018-06-27 10:21:30 +02:00
Sébastien Loriot 6d89662e2a use need API + add missing overload 2018-06-26 00:17:30 +02:00
Laurent Rineau b44ad18983
Merge branch 'master' into PMP-stitch_after_orient-GF 2018-06-21 12:31:26 +02:00
Maxime Gimeno 2f4f22d236 Merge remote-tracking branch 'cgal/master' into Demo-Add_transparency-GF 2018-06-21 11:42:26 +02:00
Sébastien Loriot 0abfba8ac0 Update branch 'PMP-coref_preserve_face_attributes' from master@5ceb529d0f 2018-06-21 10:53:59 +02:00
Laurent Rineau b08fb6c4ed Merge pull request #3069 from sloriot/PMP-isotropic_remeshing_user_projection 
Fix constrained edge map update and add user projection functor as input
 2018-06-20 17:21:10 +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
Simon Giraudot a043df3619 Fix scene_callback_signaler_EXPORTS variable 2018-06-20 11:02:57 +02:00
Simon Giraudot 7048b5cb17 Update diagonalize traits inclusions + deprecation warnings 2018-06-19 10:57:55 +02:00
Sébastien Loriot 78e4b69359 update plugin using internal function with updated signature 2018-06-19 09:57:50 +02:00
Simon Giraudot c0e79003fc Provide a more generic cpp11::sleep_for() function that handles TBB/STD/MSVC2013 specificities 2018-06-18 16:05:18 +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 1378e30dfb Merge pull request #3165 from maxGimeno/Demo-Fix_dockwidgets_sizing-GF 
Polyhedron demo : Change the sizing preferency for DockWidgets
 2018-06-14 17:36:46 +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 0984402c3d Fix dllimport/-export issue on Windows 2018-06-14 11:11:19 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Maxime Gimeno fdf94c8ee5 Upgrade minimum cmake version in examples to silent cmake warnings 2018-06-13 10:55:41 +02:00
Guillaume Damiand bc4eca82b3 Need double cast 2018-06-13 10:47: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
Laurent Rineau 13f6863397 Fix the indentation 2018-06-13 10:45:00 +02:00
Maxime Gimeno 1d4b1f9183 Merge master to solve conflicts 2018-06-13 09:48:07 +02:00
Maxime Gimeno 8e7fc0b852 Merge master to solve conflicts. 2018-06-13 09:40:56 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Laurent Rineau 5c6eee6ac3 Merge branch 'master' into Demo-Fix_orthographic_projection-GF 2018-06-12 18:01:55 +02:00
Laurent Rineau 97d59289e1 Merge pull request #3029 from maxGimeno/Demo-Use_img_offset-GF 
Polyhedron demo: Use image's offset in display
 2018-06-12 16:38:42 +02:00
Laurent Rineau 3ec18a14a5 Merge pull request #3097 from maxGimeno/Demo-Fix_triangulate_primitive-GF 
Polyhedron demo: Fix triangulation of facets
 2018-06-12 16:38:36 +02:00
Laurent Rineau 3845494b5c Merge pull request #3151 from lrineau/Mesh_3-fix_uninitialized_variables-GF 
Mesh_3: Fix the warnings about uninitialized variables
 2018-06-12 16:38:27 +02:00
Maxime Gimeno 5921e0871d Fix warnings in scene_group_item 2018-06-12 13:43:00 +02:00
Guillaume Damiand 3c6dc005de Update Polyhedron examples, to remove .cin input file. 2018-06-12 09:36:48 +02:00
Maxime Gimeno c17b4a3716 Fix (maybe) the problems of DockWidgets sizing 2018-06-12 09:26:49 +02:00
Maxime Gimeno a095792683 Remove remaining include Viewer.moc 2018-06-12 09:02:22 +02:00
Maxime Gimeno 4843c0562c remove unwanted include for moc. 2018-06-12 08:59:12 +02:00
Guillaume Damiand 9226228a5e Create data directory in Polyhedron example 2018-06-12 08:09:50 +02:00
Laurent Rineau e33030b3a9 Add dependencies to GraphicsView 2018-06-11 15:54:56 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Maxime Gimeno fdeb5621ca replace cast in unsigned long int to std::size_t to fix warnings. 2018-06-07 13:55:22 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +02:00
Maxime Gimeno 4cefdef103 Fix indentation 2018-06-07 11:55:31 +02:00
Maxime Gimeno feef087fed fix warnings 2018-06-07 10:11:24 +02:00
Maxime Gimeno b87aeef1fe Use offset of the image 2018-06-07 10:08:10 +02:00
Maxime Gimeno 87fb0cc39a Remove remaining legacy code that generated GL_STACK_UNDERFLOW errors. 2018-06-07 09:56:08 +02:00