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

60402 Commits

Author SHA1 Message Date
Andreas Fabri 8aee37b711 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 15:43:14 +02:00
Maxime Gimeno 8c391c1cdf Windows context problems fixed 
- Called setAttribute(Qt::AA_UseDesktopOpenGL) in the main function.
 2015-07-07 15:31:18 +02:00
Andreas Fabri c99a9708ef Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 15:24:26 +02:00
Maxime Gimeno 620abb640d WIP : still on the windows OGL context 2015-07-07 15:23:15 +02:00
Andreas Fabri 1d146ca31e Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 15:14:40 +02:00
Maxime Gimeno faf3343865 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 15:13:22 +02:00
Maxime Gimeno ce6e05e8bd WIP : forcing windows to use the right opengl context. 2015-07-07 15:12:41 +02:00
Laurent Rineau b80a4b6557 Re-add a removed file 
Partially revert "Merge and new plugin fixes"

This reverts partially commit
8ab112f5bd. Only the removal of
Alpha_shapes_3/test/Alpha_shapes_3/data/fin is reverted.
 2015-07-07 13:50:07 +02:00
Andreas Fabri d168a770d0 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 13:43:56 +02:00
Maxime Gimeno 47e827764a Trying to force the context to use OpenGL3_3_Core. 2015-07-07 13:42:37 +02:00
Andreas Fabri 379511b29a Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 11:52:27 +02:00
Maxime Gimeno 22dbcfaa2c Still on that SIGSEGV 2015-07-07 11:50:05 +02:00
Andreas Fabri 211ea24f76 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 11:43:17 +02:00
Andreas Fabri ad4a0169fb Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 11:26:47 +02:00
Sébastien Loriot 3785112993 remove unused code 2015-07-07 11:26:08 +02:00
Sébastien Loriot d164633493 remove REQUIRED keyword 2015-07-07 11:23:46 +02:00
Sébastien Loriot 9e57211916 add missing check on dependancies 2015-07-07 11:23:46 +02:00
Sébastien Loriot 84dfabf3b4 remove REQUIRED keyword for CGAL_Qt5 in demos 
The handling should be with a status message
 2015-07-07 11:23:46 +02:00
Maxime Gimeno 870795d79d Add some info display 2015-07-07 11:22:01 +02:00
Andreas Fabri 82e56b036d Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 11:20:17 +02:00
Maxime Gimeno 8b02b4f914 Still trying to fix that SIGSEGV with glGenTextures 2015-07-07 11:18:14 +02:00
Andreas Fabri a99071703b Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 11:00:47 +02:00
Andreas Fabri c0149c727f static_casts 2015-07-07 11:00:37 +02:00
Maxime Gimeno 9c501a57d4 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 10:59:42 +02:00
Maxime Gimeno b0d87a9236 Fix for the SIGSEGV at runtime 
- initializeOpenGLFunction and GglGenTextures() have been moved to draw to be sure they have a working context.
 2015-07-07 10:58:30 +02:00
Andreas Fabri 1aa3ca438e Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 10:46:55 +02:00
Andreas Fabri 795a0bfafe static_casts 2015-07-07 10:46:43 +02:00
Maxime Gimeno cde1fea1fa Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 10:45:17 +02:00
Maxime Gimeno d442644c8d Fix for the SIGSEGV at the runtime 
- draw only if the vectors of vertices aren't empty.
 2015-07-07 10:43:52 +02:00
Maxime Gimeno 41e2bb2fe1 Fix changed and sphere normals 
- empty sphere changed the number of normals for all the spheres instead of just itself, and it was breaking the rendering of all the vertex spheres.
 2015-07-07 10:35:47 +02:00
Andreas Fabri 6c8e892ddc Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 10:32:58 +02:00
Andreas Fabri 74913d5cd8 static_casts 2015-07-07 10:32:45 +02:00
Maxime Gimeno 4a2e163620 Changed() fixed 2015-07-07 09:49:10 +02:00
Maxime Gimeno 7b95334c69 Changed fixed. 2015-07-07 09:44:50 +02:00
Maxime Gimeno 557cbeeeb7 Texture ID generation 2015-07-07 09:39:52 +02:00
Maxime Gimeno a540bef1d8 Changed() fixed. 2015-07-07 09:31:05 +02:00
Maxime Gimeno 32a8cb7d0c Changed system fixed. 
- Problem remaining : OFF aren't displayed when loaded.Scene need an additional scene_changed to display OFFs.
 2015-07-07 09:07:04 +02:00
Maxime Gimeno 2c8bb3f978 changed() fixed 
-  are_buffers_initialized = true instead of ==true in initialize_buffers().
 2015-07-07 08:36:17 +02:00
Maxime Gimeno 85afa81ebd Changed() fixed. 2015-07-07 08:33:47 +02:00
Maxime Gimeno f5ddbfdf96 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-07 08:24:24 +02:00
Maxime Gimeno 12501598bb Changed() fix and texture ID generation. 2015-07-07 08:21:56 +02:00
Andreas Fabri 46f7b7437c Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-06 18:21:41 +02:00
Andreas Fabri d57444f71f less typename 2015-07-06 18:21:28 +02:00
Laurent Rineau 1ed3ef23a4 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-06 18:16:27 +02:00
Andreas Fabri 86007c20a9 Add static_casts 2015-07-06 18:15:49 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt 
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
 2015-07-06 18:14:34 +02:00
Laurent Rineau 74aa73e425 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 2015-07-06 17:30:11 +02:00
Laurent Rineau 99f8b0d80e Allow to find QGLViewer-qt5 on Windows too 2015-07-06 17:29:39 +02:00
Andreas Fabri deec6e3278 remove typename 2015-07-06 17:03:39 +02:00
Andreas Fabri 1a3e0e001b add dependendency on svg 2015-07-06 16:31:56 +02:00