Commit Graph

781 Commits

Author SHA1 Message Date
Sébastien Loriot 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sébastien Loriot 2d191d6651 commit CMakeLists.txt for all examples and tests 2016-03-07 17:39:36 +01:00
Laurent Rineau def3952e0e Merge pull request #767 from bo0ts/Documentation-no_internal_in_title-pmoeller
Remove internal release number from documentation title
2016-02-11 15:42:40 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +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
Sébastien Loriot e211843b4f Merge pull request #654 from maxGimeno/FixForMac-GF
Demo fix for OS X (fix for #437)
2016-02-03 14:39:48 +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
Sébastien Loriot b2196fca0c remove non-needed OpenGL instructions 2016-01-18 13:17:41 +01:00
Sebastien Loriot 32a3972c33 Merge pull request #592 from afabri/CGAL-dont_submit_cleanup-GF
Towards getting rid of dont_submit files
2016-01-08 14:14:08 +01:00
Sebastien Loriot f3bc10ef81 Merge pull request #549 from afabri/Polyhedron-clipping_in_shader-GF
Improve C3T3 item and meshing of a segmented image
2016-01-07 13:49:16 +01:00
Sébastien Loriot e64ae35a6e Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
Andreas Fabri a41165b6eb various 2016-01-05 18:04:14 +01:00
Andreas Fabri 56bfaa2746 merge 2016-01-05 17:06:04 +01:00
Sebastien Loriot 2b49997c7e Merge pull request #493 from afabri/CGLAL-thread_local_storage-GF
Remove boost thread dependency
2016-01-04 16:49:26 +01:00
Andreas Fabri 078afb18b3 Alpha_shapes_2 2015-12-31 16:19:26 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Andreas Fabri 88596c38ce bugfix: the datum was a segment not a triangle 2015-12-16 16:58:27 +01:00
Pierre Alliez a33f8326d4 Update aabb_tree.txt
fix typos (, vs .) in table
2015-12-15 09:35:48 +01:00
Andreas Fabri 0b2b5ee1e6 Add an AAB tree primitive for C3T3 facets 2015-12-11 16:15:36 +01:00
Philipp Möller 79b7fc5081 Handle the INPUT cases where the whole include dir is used 2015-12-10 17:03:46 +01:00
Sébastien Loriot ee5f29b07c add a warning to not put degenerated objected in the tree 2015-11-24 00:12:36 +01:00
Andreas Fabri 547be5cd2a Use wrapper for the very basic mutex locking 2015-09-04 08:42:34 +02: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