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

175 Commits

Author SHA1 Message Date
Sebastien Loriot be27bf69b7 Merge pull request #1198 from maxGimeno/Import_AABB_Tree_demo-GF 
Polyhedron_Demo: Import AABB_Tree demo
 2016-07-07 13:37:55 +02:00
Maxime Gimeno fc68989e60 Use Simple_cartesian<double> to greatly enhance the performance. 2016-07-05 15:58:43 +02:00
Laurent Rineau 1cde972cdb Remove whitespace at end of lines 2016-06-29 11:04:29 +02:00
Guillaume Damiand 8ac37cc7df Add missing link with glu in demo. 2016-06-02 12:25:39 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Maxime Gimeno 524a8da107 Remove glu from all the CMakeLists 2016-04-14 09:29:50 +02:00
Guillaume Damiand a528ff0847 Remove commented line 2016-03-09 14:42:24 +01:00
Guillaume Damiand dff63d83d3 Correct the problem of cmake qt5 macro not available in header only when configuring cgal_qt5. 
To solve this problem, we added in the macro check_cgal_component the find package of qt5 if we are configuring cgal_qt5.
 2016-03-09 10:44:15 +01:00
Clement Jamin c27ff9e85c Rename some cmake variables 2016-03-09 10:42:46 +01:00
Clement Jamin 221c9462db Should be set, not message 2016-03-09 10:37:58 +01:00
Guillaume Damiand 561b1f2a38 Do not need cgal_include_moc_files macro 2016-03-09 10:37:58 +01:00
Guillaume Damiand 16a19eb33e Ok for demo for aabbtree 2016-03-09 10:37:57 +01:00
Guillaume Damiand 78cde742ce Work on demo with qt5; ok for AABBtree (but need to be improved) 2016-03-09 10:35:22 +01:00
Maxime Gimeno 0a37521263 Revert "Fix for the context" 
This reverts commit 552aaa159f.

Conflicts:
	Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
 2016-02-11 14:16:04 +01:00
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +01:00
Maxime Gimeno ec0928c044 Fix for AABB_demo 
- The scene was not initialized when viewer->initializeGL() wwas called (still because OS X calls initialzeGL() during the setupUI instead of the first draw)
 2016-01-19 17:13:06 +01:00
Andreas Fabri a41165b6eb various 2016-01-05 18:04:14 +01:00
Andreas Fabri 078afb18b3 Alpha_shapes_2 2015-12-31 16:19:26 +01:00
Maxime Gimeno 61072a8e75 Clean-up 2015-08-10 09:04:01 +02:00
Maxime Gimeno 71b0fd8d31 Replaced the OpenGL 3 3 Core context by a 2_1 context. 2015-08-10 08:46:09 +02:00
Maxime Gimeno 970e767bbf GL security enhancement 
- Version of the shaders added and depth test enabled at each draw.
 2015-08-06 15:05:00 +02:00
Maxime Gimeno fd38d1192b Plane manipulated secured 
- Should resolve all the remaining problems about the manipulated frame, except for the wheels events.
- Added glEnable(GL_DEPTH_TEST) to the draw() function of the viewer to avoid errors in certain cases
 2015-08-06 14:47:21 +02:00
Laurent Rineau 508b467203 Merge branch 'CGAL-Qt5_support-GF' 2015-08-05 11:23:40 +02:00
Laurent Rineau 55c30d0808 Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only 2015-08-04 10:55:26 +02:00
Maxime Gimeno 839d09e82a ManipulatedFrame fps fix 
- I used the startTimer(0) to cadence the calls to cutting_plane()
- Now if the plane is spinning, the fast_distance is used.
 2015-08-04 09:03:15 +02:00
Laurent Rineau 87a406ab81 Fix a warning with MSVC 
> aabb_tree_demo\Scene.cpp(1313) : warning C4138: '*/' found outside of comment

Trivial bug-fix.
 2015-07-30 13:04:29 +02:00
Sébastien Loriot 6dc5695989 remove unused variable warning 2015-07-22 15:47:23 +02:00
Jane Tournois 012110cfa5 fix warning for windows 2015-07-21 15:59:03 +02:00
Sébastien Loriot cffdb2ca5d fix unused variable warning 2015-07-17 13:56:04 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos 
Previous versions are not tested by the CGAL daily test suite.
 2015-07-09 17:50:22 +02:00
Maxime Gimeno 278e9d9829 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 
Conflicts:
	Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
 2015-07-08 12:40:14 +02:00
Maxime Gimeno f76bb19734 Windows fix 
- add an attribute at the application in the main() function
- add a custom context to the viewer
 2015-07-08 12:16:51 +02:00
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +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
Maxime Gimeno 620abb640d WIP : still on the windows OGL context 2015-07-07 15:23:15 +02:00
Maxime Gimeno ce6e05e8bd WIP : forcing windows to use the right opengl context. 2015-07-07 15:12:41 +02:00
Maxime Gimeno 47e827764a Trying to force the context to use OpenGL3_3_Core. 2015-07-07 13:42:37 +02:00
Maxime Gimeno 22dbcfaa2c Still on that SIGSEGV 2015-07-07 11:50:05 +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
Maxime Gimeno 8b02b4f914 Still trying to fix that SIGSEGV with glGenTextures 2015-07-07 11:18:14 +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 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 2c8bb3f978 changed() fixed 
-  are_buffers_initialized = true instead of ==true in initialize_buffers().
 2015-07-07 08:36:17 +02:00