Commit Graph

957 Commits

Author SHA1 Message Date
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
Andreas Fabri eda920fba6 reindent to avoid warning 2016-01-26 17:01:20 +01:00
Maxime Gimeno 76df91b4cd Fix for Triangulation_3
- The initializeGL() function being called in setupUI on OS X, the settings were wrong, so I simply moved readSettings in this function so that it is called when it must.
2016-01-19 17:11:28 +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
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 9a9c3ac59e various 2016-01-05 18:14:03 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Sebastien Loriot 60dbff189d Merge pull request #534 from afabri/Polyhedron_3-improve_mesh_3_plugin-GF
Polyhedron 3 improve mesh 3 plugin gf
2015-12-10 21:01:00 +01:00
Philipp Möller 81a8f982dc Handle the easy INPUT cases
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
Sébastien Loriot 1937a361ca add missing _object function 2015-12-08 13:31:55 +01:00
Andreas Fabri b623100175 split the dual() functions; make the power test check for the absence of weights 2015-12-08 11:27:14 +01:00
Andreas Fabri fbf7b579c8 fix typos 2015-12-08 11:13:59 +01:00
Sébastien Loriot 4318feeca0 remove deprecated class since CGAL 3.6 2015-11-24 01:15:21 +01:00
Clement Jamin b6c1581456 Fix type 2015-10-28 11:06:46 +01:00
Clement Jamin ebf4192456 Add missing copy constructor + improve code/formatting 2015-10-27 12:25:14 +01:00
Clement Jamin 857dc76847 Test the parallel insertion of points with info 2015-10-27 12:22:31 +01:00
Clement Jamin 6fc4dd7dd3 Enable parallel insertion of points with info
There was a bug preventing the parallelism to be activated when
using points with info
2015-10-27 12:17:58 +01:00
Clement Jamin 136488b149 Add a test for parallel insertion of points with info (bug: not parallel) 2015-10-27 11:10:41 +01:00
Sebastien Loriot 37ff880fb8 Merge pull request #58 from dfunke/ParallelInsertionWithInfo
Enable parallel insertion of points with info
2015-10-22 09:48:56 +02:00
Laurent Rineau 330a0e75a2 Merge pull request #385 from cjamin/CGAL_headers_only-gdamiand_cjamin
CGAL headers only, step 0
2015-10-13 16:37:38 +02:00
Clement Jamin 145131e2e6 Use Real_timer in PSP3 and T3 since the algorithms might be parallel 2015-10-08 15:34:40 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Sébastien Loriot 38cadeef60 update cmake list 2015-09-24 06:33:35 +02:00
Sébastien Loriot cdfc7f1c31 Merge branch 'old/CGAL-split_packages-GF' into CGAL-split_packages-GF 2015-09-23 10:08:41 +02:00
Andreas Fabri 6692f993ce Add/Remove some cgalPkgDependsOn
Move Visibility package from Arrangements to Polygons
Add some ``  in the Visibility package
Add the keyword 'Geodesic' to the Shortest Path package.
2015-09-09 12:09:57 +02:00
Andreas Fabri f592fb7e89 move test files to TDS_2 and TDS_3 2015-08-23 16:12:02 +02:00
Andreas Fabri 91543fd382 move header files to TDS_2 and TDS_3 2015-08-23 15:36:12 +02:00
Laurent Rineau c9f16f8984 Define the OpenGL functions typedefs
- PFNGLDRAWARRAYSINSTANCEDARBPROC
   - PFNGLVERTEXATTRIBDIVISORARBPROC

Definitions found in glext.h from Mesa.
2015-08-18 18:46:02 +02:00
Andreas Fabri 67d72675fe split packages 2015-08-17 23:46:59 +02:00
Maxime Gimeno 95f87a3ac5 Depth test problem fix
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
2015-08-13 14:08:12 +02:00
Maxime Gimeno 03eee8987e Mesa Fix :
- context set to 2.1
- shaders versions set to 120
- fetch and set the ARB extensions for instanced Rendering
- displays points instead of spheres if the extensions cannot be found
2015-08-10 16:12:47 +02:00
Laurent Rineau 508b467203 Merge branch 'CGAL-Qt5_support-GF' 2015-08-05 11:23:40 +02:00
Laurent Rineau e9b8d6275b Merge pull request #239 from lrineau/CGAL-Fix_demos_with_Qt_5.2-GF
Support Qt-5.2

The use of `QApplication::setAttribute(Qt::AA_UseDesktopOpenGL);` is only for Qt>=5.3.
2015-08-05 10:57:08 +02:00
Laurent Rineau 55c30d0808 Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only 2015-08-04 10:55:26 +02:00
Laurent Rineau c6e8f8baa2 Do not build the demo when WITH_CGAL_Qt5=OFF 2015-08-03 17:09:52 +02:00
Laurent Rineau cb0bdd3ad2 Remove warnings about unused moc files
Should fix #194.
2015-08-03 16:27:28 +02:00
Maxime Gimeno 1f976af9c2 warning fix 2015-07-31 14:50:14 +02:00
Sébastien Loriot 9f14949e69 add missing protecting guards 2015-07-29 08:44:14 +02:00
Laurent Rineau 8be7c27063 Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF
...aka refresh the branch from 'master'.

Conflicts:
	AABB_tree/demo/AABB_tree/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp
2015-07-28 15:30:17 +02:00
Maxime Gimeno 147ac9eabc Warning fix + Trackball appears
- the draw functions had some useless arguments and m_curMode became a m_selMode,
keeping the trackBall to be displayed.
2015-07-22 16:02:15 +02:00
Sébastien Loriot 62906461f2 fix out of array bound warning 2015-07-21 09:12:12 +02:00
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
2015-07-17 15:39:18 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Laurent Rineau fa13f4ed0c Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF 2015-07-10 17:28:07 +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
Laurent Rineau f17d91f4e3 Fix warnings about unused variables/local types/local functions 2015-07-08 15:01:36 +02:00
Laurent Rineau a642c37ba1 Fix a warning that looks like a real error 2015-07-08 14:43:21 +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