55c30d0808
Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only
2015-08-04 10:55:26 +02:00
c6e8f8baa2
Do not build the demo when WITH_CGAL_Qt5=OFF
2015-08-03 17:09:52 +02:00
cb0bdd3ad2
Remove warnings about unused moc files
...
Should fix #194 .
2015-08-03 16:27:28 +02:00
aa72eaa371
Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF
...
Qt5 support, GSoC 2014
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support
In this commit, I have fixed the permissions of the file:
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points
In this commit, I have also modified:
Installation/changes.html
2015-07-17 14:13:37 +02:00
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
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
2daae8eb1b
static_casts
2015-07-09 16:18:01 +02:00
ede49f1b48
Fix a warning -Wnarrowing
2015-07-08 16:00:01 +02:00
f17d91f4e3
Fix warnings about unused variables/local types/local functions
2015-07-08 15:01:36 +02:00
76a1911042
A viewer to specify the OpenGL context for QGLViewer's constructor
2015-07-08 13:10:11 +02:00
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
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
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
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
4a2e163620
Changed() fixed
2015-07-07 09:49:10 +02:00
7b95334c69
Changed fixed.
2015-07-07 09:44:50 +02:00
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
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
de7db3ca68
Merge pull request #111 from aympelle/Periodic_3_Delaunay_triangulation_traits_3-APelle
...
- Rename `Periodic_3_triangulation_traits_3` to `Periodic_3_Delaunay_triangulation_traits_3`.
- Rename the concept `Periodic_3TriangulationTraits_3` to `Periodic_3DelaunayTriangulationTraits_3`.
- Create `Periodic_3_triangulation_traits_3`.
- Create the concept `Periodic_3TriangulationTraits_3`.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/rename_p3tt3_p3dtt3
2015-06-17 09:59:33 +02:00
72f9d2ccbb
Add tests for backward compatibility.
2015-06-10 23:39:18 +02:00
dab94dbcb5
Complete copyright years.
2015-06-10 14:11:47 +02:00
7be51168fd
Fix copyright years.
2015-06-10 00:44:56 +02:00
72c30d6eef
Add copyright info.
2015-06-09 18:44:15 +02:00
6e3e79977b
Include P3TT3.h after declaring Filtered_periodic_predicate.
2015-06-08 17:30:30 +02:00
2abe69b7c0
Fix : add an include for removing an error on Windows.
2015-06-01 20:20:50 +02:00
b4133b40ca
P3DTT_base_3 inherites from P3TT_base_3 now.
...
Fix : P3TT_base_3 did have Delaunay functions.
CGAL_DEPRECATED is used on P3TT3.
2015-05-29 20:02:00 +02:00
7438f17852
Minor fix : remove note in P3DTT3 concept.
2015-05-18 19:07:30 +02:00
e56c1cfbd9
Remove \cgalModif... macros and fix link problems.
2015-05-07 15:48:06 +02:00
7092718826
Add a warning for P3TT3.
2015-05-07 15:35:52 +02:00
a3dc72f5d2
Doc : Move types and functions from P3TT3 concept to P3DTT3 concept.
2015-05-06 19:42:30 +02:00
c5d196f78c
remaining demos
2015-05-06 18:53:44 +02:00
7ce4c9c759
Missing \cgalRefines.
2015-05-06 14:06:41 +02:00
b8f0e24a68
Remove doc of P3TT3 concept from doc of P3DTT3 concept.
2015-05-05 16:45:52 +02:00
0f233129f1
Fix links and traits names.
2015-05-05 15:33:36 +02:00
ba4ede5f50
Clean-up
...
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
b01dbe1f2d
Addition of a destructor.
...
- Added a destructor to take care of the buffers and VAOs.
2015-04-16 09:48:06 +02:00
978885384c
Upgrade of periodic_Lloyd_3_demo
...
- Implementation of shader rendering
- suppression of the function gl_draw_surface
2015-04-16 09:17:20 +02:00
9fb08ad647
End of deletion of the useless functions
...
-deleted remaining references to make_draw_list that made the program crash
2015-04-15 13:07:24 +02:00
a45d2fc063
Upgrade of Periodic_triangulation_3_demo
...
- Had to create cylinders from scratch to replace glu
- Had to redo every transformation calculation to fit my cylinder model
- Had to replace the length of a tube by a scaling to be able to use instanced rendering
2015-04-15 12:52:39 +02:00
85c8e7e270
Upgrade of AABB_Tree Demo to Qt5
...
- setBackgroudColor was called too soon(in the constructor of the viewer), now called in InitializeGL
2015-04-02 11:54:06 +02:00
2e47961cce
Successfully upgraded to Qt5.
2015-04-01 13:40:02 +02:00
52dc3b265d
Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5
...
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.
Conflicts:
GraphicsView/demo/Polygon/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
Installation/cmake/modules/CGAL_Macros.cmake
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
Mesh_3/demo/Mesh_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
2015-03-30 16:02:51 +02:00
1631be5368
Merge branch 'Periodic_3-split_test_for_MSVC-GF'
...
Approved by the release manager
2015-01-15 12:40:36 +01:00
af09f13a81
do not test Lazy_exact_nt<Expr>
2015-01-12 12:28:07 +01:00
f511291e38
Trivial warning fix : Fix Missing statement in P3T3::point(Cell_handle, int).
2015-01-12 11:56:38 +01:00
c42e1c8744
derecursify operator==
2015-01-09 16:15:35 +01:00
85d61e36dc
on Windows skip the test of the traits with Lazy<Expr
2015-01-09 13:59:01 +01:00
7d9f8b9a7f
Corrections in the doc of Periodic_3_triangulation_3.
2015-01-07 13:08:16 +01:00
07860bb1ca
Update Periodic_3_triangulation_3 doc.
...
Concepts:
Periodic_3TriangulationTraits_3
Periodic_3DelaunayTriangulationTraits_3
Traits:
Periodic_3_Delaunay_triangulation_traits_3
Periodic_3_triangulation_traits_3
2014-12-04 15:34:51 +01:00
6d972f52ec
Small changes in Periodic_3_Delaunay_triangulation_statically_filtered_traits_3.
...
Periodic_3_Delaunay_triangulation_statically_filtered_traits_3 inherits from
Periodic_3_triangulation_statically_filtered_traits_3 now.
2014-12-04 09:21:49 +01:00
5f1c440a2e
Remove predicates unused by Periodic_3_triangulation_traits_3.
2014-12-03 19:10:32 +01:00
9519952035
Create Periodic_3_triangulation_traits_3.
...
Add class Periodic_3_triangulation_traits_3.
Add class Periodic_3_triangulation_filtered__traits_3.
Put Traits_with_offsets_adaptor in a separate header.
Put Periodic_3_construct_point_3 in a separate header.
Update tests.
2014-12-03 18:11:15 +01:00
2f11363155
Add the 3D Period Lloyd demo in the manual
2014-12-03 12:36:58 +01:00
bc8853e6e5
Rename Periodic_3_triangulation_filtered_traits_3 Periodic_3_Delaunay_triangulation_filtered_traits_3.
...
The class Periodic_3_triangulation_filtered_traits_3 is renamed.
The class Periodic_3_triangulation_filtered_traits_base_3 is renamed.
New header file.
Periodic_3_triangulation_filtered_traits_base_3 is set deprecated.
2014-11-27 15:56:46 +01:00
caa3164db5
Rename Periodic_3_triangulation_traits_3 Periodic_3_Delaunay_triangulation_traits_3.
...
Classes Periodic_3_triangulation_traits_3 and
Periodic_3_triangulation_traits_base_3 are renamed.
Tests, examples, ... are updated.
Doc is updated.
Periodic_3_triangulation_traits_3.h is set deprecated.
2014-11-26 18:23:21 +01:00
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
6df9530094
All GraphicView demonstrations ported to the new Qt inclusion way.
...
Change of Qt4or5 variables names.
Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
QT_VERSION_USED => number of Qt version wanted (4 or 5).
QT4 => TRUE if Qt4 chosen.
QT5 => TRUE if Qt5 chosen.
2014-08-05 18:13:39 +02:00
9a1461442b
Some bug correction for new Qt inclusion way.
...
Following demonstrations ported to Qt4or5 way :
- Polyhedron
- Linear Cell Complex
- Mesh_3
- Periodic_3_Triangulation
- Periodic_Llyod_3
- Surface_reconstruction_point_3
2014-08-04 20:16:44 +02:00
283807572f
restore correct permissions (not-executable)
2014-08-01 10:32:42 +02:00
a3a84ce2e8
Fix attempt of git problem + Periodic_3_triangulation_3 and Periodic_Llyod_3 demonstrations ported.
2014-07-11 19:22:13 +02:00
ab909badb9
Demonstrations AABB_tree, Alpha_shapes_3 and Circulat_kernel_3 ported. Working on Mesh_3, Polyhedron and Periodic_3_triangulation_3.
2014-07-03 15:07:00 +02:00
adfd3510fa
remove extra include
2014-06-27 13:51:38 +02:00
e4b033e964
Add/remove #include
...
- I remove <CGAL/basic.h> when I see it, in favor of <CGAL/config.h>.
- <CGAL/ipower.h> is needed for CGAL::ipower
- <ctime> is needed for std::time
2014-06-26 19:10:06 +02:00
afa40bc6a4
Merge branch 'Periodic_3_triangulation_3_inexact_locate-APelle'
...
- This small feature adds a method to locate point with inexact predicates in
Periodic_3_triangulation_3.
(cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_inexact_locate_in_Periodic_3_triangulation_3 )
- Tested in CGAL-4.5-Ic-13
- Approved by the Release Manager.
2014-04-17 18:30:59 +02:00
4910a198f2
periodic_inexact_locate stops also if the max num of turns is reached.
2014-04-15 15:11:07 +02:00
7259c76434
Fix warning : Some variables weren't unused in inexact_periodic_locate.
2014-04-09 17:01:49 +02:00
830cea27e0
Add a test for inexact_locate in Periodic_3_triangulation_3.
2014-04-07 16:16:53 +02:00
c05c4c56f1
Fix bug in inexact_orientation.
...
We use construction_point() instead of doing a fail addition between
point and offset.
2014-04-07 10:11:36 +02:00
304916004a
Fix more warnings (unused local typedefs)
2014-04-01 16:29:34 +02:00
a8ff620f3f
Fix the remaining warnings on my platform
...
That was mostly "unused locally defined typedefs".
2014-04-01 14:50:51 +02:00
d1572615b5
Fix : Cartesian isn't auto-linked to the Cartesian page anymore.
...
Cartesian -> %Cartesian
2014-03-20 11:50:39 +01:00
9666fec537
Small correction in the documentation of inexact_locate().
2014-03-18 17:42:25 +01:00
43c826d666
Add inexact_locate() documentation.
2014-03-13 16:30:16 +01:00
acbeac0983
In p3T3, inexact_locate() is added.
2014-03-11 18:57:52 +01:00
2175dd4237
In P3T3, inexact_periodic_locate is done.
...
inexact_locate() have to be done now.
2014-03-11 18:46:06 +01:00
bec402f3c3
The inexact_locate architecture is applied on periodic_locate function instead.
2014-03-11 17:24:37 +01:00
bf2a73f220
Add inexact_locate() in P3T3. But, it does nothing for the moment.
2014-03-11 16:31:58 +01:00
9114db9085
restore figure source files removed in 0fa2cacb
...
| commit 0fa2cacb60
2014-02-10 14:54:23 +01:00
0fa2cacb60
remove doc_tex documentation (including developer manual) and old manual tools
2013-12-03 17:27:02 +01:00
6c547e5663
Mainly added includes
2013-09-13 22:24:30 +02:00
bc03aaf30b
Put doc/ in the global dont_submit file
2013-08-20 10:57:03 +02:00
9a8eeb8867
remove Figure work added by the macro+postprocessing
2013-08-08 23:01:09 +02:00
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
56faf80e3d
Merge branch 'Triangulation_3-array-glisse'
...
fixes array initialization in c++11
Successfully tested in CGAL-4.3-Ic-103
Approved by the interim release manager
2013-07-29 07:44:03 +02:00
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
e3af5e6443
typo
2013-07-26 09:20:27 +02:00
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
143a2181b3
add latex format for \imagei doxygen command
...
perl -pe 's/^(\s*)\\image\s+html\s+(.*)\s*$/$1\\image html $2\n$1\\image latex $2\n/' -i
2013-07-25 11:50:53 +02:00
74a1ac055e
remove pdf files from doxygen doc include path
2013-07-25 11:15:18 +02:00
519b301130
remove gif files from doxygen doc include path
2013-07-25 11:14:16 +02:00
4389b0bac8
remove the usage of gif in the doxygen doc as pdflatex does handle them
...
replace the files with png
2013-07-25 11:06:13 +02:00
a59bc5edd5
Finish Philipp's patch on initializing arrays.
2013-07-25 07:53:57 +02:00
0889773189
* Changed template parameter Predicate_ to Functor_ (for the traits classes of P2T2 and P3T3)
...
* Added side_of_bounded_circle to the predicates in the 2D traits classes
2013-07-15 13:06:45 +02:00
716f87d2d7
rename Hidden_type to unspecified_type and update its description
2013-06-13 18:48:58 +02:00
4d9caf3763
Added names that were missing into the Doxyfile.in entries.
...
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +02:00
4d469821f7
Generated Doxyfile.in and dependencies
2013-05-30 14:13:47 +02:00
7e15467c72
new cgal doxygen advanced macro to put the text inside a div
2013-05-27 19:36:33 +02:00
Laurent Rineau
Andreas Fabri
Maxime Gimeno
Sébastien Loriot
Aymeric PELLE
Aurélien Vialon
Nico Kruithof
Ross Hemsley
Philipp Möller