Commit Graph

1038 Commits

Author SHA1 Message Date
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
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 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 ed0c55df89 Bugfix in function that test if a face is convex. 2018-05-29 11:11:50 +02:00
Guillaume Damiand 21012cb0a3 Comment optimization done for convex facets for now, because there is a bug in the test code. Todo: solve the bug (maybe use a better test ?) 2018-05-29 11:11:50 +02:00
Guillaume Damiand 035dd7cd24 Add missing inline; to avoid a multiply defined function. 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 b5a4cd1e4a One more bug fix in Buffer_for_vao.h 2018-05-29 11:04:57 +02:00
Guillaume Damiand 4f93b87634 Update is_facet_convex function; I think this is better now. 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 49de2dee13 Bug fix in quadrangular smooth normals 2018-05-29 11:04:57 +02:00
Guillaume Damiand e0aa99d798 Add the possibility to add weighted point 2 in basic viewer 2018-05-29 11:02:00 +02:00
Guillaume Damiand 62492150e0 Update Buffer_for_vao and Basic_viewer_qt 2018-05-29 11:02:00 +02:00
Guillaume Damiand b22c9959f6 Update buffer for vao to allow the use of indexed points 2018-05-29 11:02:00 +02:00
Guillaume Damiand 9bde858140 update 2018-05-29 11:02:00 +02:00
Guillaume Damiand a7b9656d52 Start to integrate version with indices 2018-05-29 11:02:00 +02:00
Guillaume Damiand 5b8e6d349b Update Buffer_for_vao: byf 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