Commit Graph

538 Commits

Author SHA1 Message Date
Maxime Gimeno 524a8da107 Remove glu from all the CMakeLists 2016-04-14 09:29:50 +02:00
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
Sébastien Loriot 45406a5296 Merge pull request #788 from bo0ts/Installation-split_config-pmoeller
Split CGALConfig.cmake and CGALExports.cmake
2016-03-06 15:36:55 +01:00
Philipp Möller 4211a4f01e Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS
This is a Cmake 2.4.3 variable that isn't even documented anymore.
2016-02-16 17:02:55 +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
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +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
Andreas Fabri 38d063539a cleanup 2015-10-02 08:17:19 +02:00
Laurent Rineau 278a28016a Merge branch 'CGAL-Qt5_support-GF'
Fixes #265, fixes #254.
2015-08-27 16:37:37 +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
Maxime Gimeno a3addbfd9b Fix
- Polyhedron : spaces in a shader made it invalid
- Circular Kernel : green intersection spheres are back : wrong attribute in the draw function
- Alpha Shapes : "in" remained in the shaders.
2015-08-14 13:56:43 +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
Jane Tournois feb76b7439 add missing namespaces for msvc2015
avoid ambiguity of calls
2015-08-11 15:48:55 +02:00
Maxime Gimeno 8680431afc Mesa Fix
- Replaced the 3.3 context by a 2.1 context.
- Added the extension search for instanced rendering.
- Added an alternate rendering with points instead of spheres for the case the extensions cannot be found.
2015-08-10 10:02:30 +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 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
Andreas Fabri 2289e5a2af static_ccasts 2015-07-09 13:05: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
Andreas Fabri 3c46e5262d less typenames 2015-07-07 16:45:26 +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
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
Maxime Gimeno a0e7a60973 Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
Conflicts:
	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
	Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
	Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
	GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
	GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
	GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
	GraphicsView/demo/Generator/CMakeLists.txt
	GraphicsView/demo/GraphicsView/CMakeLists.txt
	GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
	GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
	GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
	GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
	GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
	GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
	GraphicsView/demo/Stream_lines_2/CMakeLists.txt
	GraphicsView/demo/Triangulation_2/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
	Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
	Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
	Polyhedron/demo/Polyhedron/Scene_plane_item.h
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
	Surface_mesher/demo/Surface_mesher/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
Andreas Fabri b7f9849599 Replace CGAL::get() with CGAL::get_pointee_or_identity() and remove using get:: 2015-04-30 11:31:21 +02:00
Maxime Gimeno ba4ede5f50 Clean-up
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
Maxime Gimeno 7ba2835c1f Upgrade to OpenGL 3.3 with Qt wrappers
- no more glu dependency
- smooth spheres
- less light but gestion of the light on the circles
2015-04-09 15:31:54 +02:00
Maxime Gimeno 60b47f0978 Succesfully upgraded to Qt5 2015-04-01 12:18:59 +02:00
Sébastien Loriot b28b4607ae use UTF8 for letters with accent 2015-01-31 13:58:08 +01:00
Sébastien Loriot 74dce018ac using Exact_rational 2014-06-27 13:51:25 +02:00
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
2014-02-10 14:54:23 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +01:00
Andreas Fabri ac308f1f26 Replace Quotient<MP_float> with Gmpq if GMP is available
Remove #includes which are not needed
Replace Quotient<Precise_integer> with Precise_rational
2013-09-27 16:00:57 +02:00
Andreas Fabri c9a6e20d1e remove unused typedefs 2013-09-18 11:19:05 +02:00
Andreas Fabri d31c8b4de9 fix copy paste error 2013-09-17 09:03:29 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot 9a8eeb8867 remove Figure work added by the macro+postprocessing 2013-08-08 23:01:09 +02:00
Sébastien Loriot d282ade623 use \cgalCite instead of \cite
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
2013-08-05 18:25:26 +02:00
Sébastien Loriot b2ef3b8673 Merge branch 'doc-remove_gif-local'
Successfully test in CGAL-4.3-Ic-102

This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.

Approved by the interim release manager

xplain why this merge is necessary,
2013-07-26 17:50:07 +02:00
Sébastien Loriot 2dfe8a3d73 workaround for a doxygen bug: remove space after /!* to avoid a verbatim env
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
2013-07-25 14:58:53 +02:00
Sébastien Loriot 74a1ac055e remove pdf files from doxygen doc include path 2013-07-25 11:15:18 +02:00
Sébastien Loriot a925cdaa56 use nested functor instead of free function
trivial bugfix locally tested
2013-06-26 10:12:38 +02:00