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
1f976af9c2
warning fix
2015-07-31 14:50:14 +02:00
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
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
f17d91f4e3
Fix warnings about unused variables/local types/local functions
2015-07-08 15:01:36 +02:00
a642c37ba1
Fix a warning that looks like a real error
2015-07-08 14:43:21 +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
0d431e39ab
remove qt4 specific code
2015-07-07 18:00:43 +02:00
41e2bb2fe1
Fix changed and sphere normals
...
- empty sphere changed the number of normals for all the spheres instead of just itself, and it was breaking the rendering of all the vertex spheres.
2015-07-07 10:35:47 +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
46bf663ecd
Triangulation_3 demo
2015-05-06 15:53:49 +02:00
ba4ede5f50
Clean-up
...
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
99b137f193
Upgrade of Triangulation_3_demo
...
-added the missing files
2015-04-17 14:13:40 +02:00
bd67dc70d5
Upgrade of Triangulation_3_Demo
...
- Use of shaders and Qt Wrapper
- No more Glu dependencies
2015-04-17 14:12:25 +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
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
bb3264c563
remove conditions that are outdated
2015-02-05 14:46:36 +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
2d65524aea
All last demonstrations ported to Qt4or5. Need to check working of it on Linux.
2014-08-12 22:12:42 +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
3e873a1f5c
Fix #ifdef mismatch bug
2014-07-01 17:02:09 +02:00
1bb441317d
Add missing CGAL_ prefix
2014-07-01 16:57:26 +02:00
e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
5de63179f0
setMouseBindingDescription API has been updated in libQGLViewer 2.5.0
2014-06-18 15:45:22 +02:00
956bdabe0e
Addition of find_package(Qt5) file and command into CMakeList of LCC, Triangulation_3 and Surface_mensher demonstrations.
2014-06-12 21:46:52 +02:00
6ec9415dc1
Demonstrations LCC and Trigulation_3 and surface mesher working.
2014-06-12 14:34:19 +02:00
5f09ccde1a
Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3.
2014-06-01 22:46:14 +02:00
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00
1b5f70c871
fix deprecation warning
2014-05-12 12:57:33 +02:00
6e8625845b
Code and comments clean-up
2014-04-08 10:26:00 +02:00
6b65ad71da
Changes in the "lock data structure" concept and models
...
The concept is now much more generic (SurjectiveLockDataStructure).
The names have been changed accordingly.
2013-10-16 12:17:56 +02:00
72d877ffc7
Updated the TDS typedef in the T3 demo
2013-10-14 17:55:13 +02:00
04c1a83977
Minor alignment change
2013-06-28 15:18:13 +02:00
079c39eef4
Update CMakeLists according to changes in FindTBB
2013-06-28 15:16:49 +02:00
eeeb6cc841
Smaller tag names (continued)
2013-05-28 15:42:39 +02:00
1cc98e9abd
Updated doc + code clean-up
2013-04-03 17:34:21 +02:00
9b3b218b9c
Bugfix
...
The sequential version doesn't know what "TBB" is!
2013-03-27 14:31:09 +01:00
db6b4e9559
Updated the demo (parallel code)
2013-03-27 14:02:09 +01:00
de1f43e30b
The remove is now fully parallel.
...
The remove operations are done in parallel as long as the dimension stays = 3, then the few remaining points are removed sequentially.
2013-03-27 13:47:40 +01:00
3eae2927e7
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-03-04 15:50:57 +01:00
8d5352e15f
Better grid lock data structure.
...
There is just one grid lock data structure class now, with several specialization.
Moreover, now the type of the lock data structure is only defined in the triangulation.
2013-02-18 12:58:57 +01:00
bce43fbb8e
Improved the way parallelism is handle in Mesh_3/Triangulation_3
...
Added a better support for parallelism in Triangulation_3.
Simplified how to enable/disable concurrency in Mesh_3.
Moved the Compact_container stategies to a new file.
2013-02-15 18:07:43 +01:00
516579f454
reverse accidental commit of a cmake target
2013-02-15 09:27:12 +01:00
abab3ad602
Suppress warnings in spatial_sort used with a QList.
...
The bug of Qt is that they have ptrdiff_t as difference type,
but they only provide iterator + int and not
iterator + difference_type
2013-02-14 15:38:05 +01:00
f8b8e7c643
0.1 -> 0.1f to avoid a warning
2013-02-08 12:45:30 +01:00
82b2ebc865
apply the cpp0x namespace renaming in all files
2012-12-19 11:33:17 +01:00
2db4effa7e
CMake: Fix the handling of cmake_policy
...
That is a followup-to my commit last year:
| ------------------------------------------------------------------------
| r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
|
| Try to fix my last revision about cmake_policy, with CMake-2.6.x
|
| CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
| x.y.z is greater than the current CMake version.
|
| ------------------------------------------------------------------------
The following check:
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
cmake_minimum_required(VERSION 2.6.2)
The script used to fix that was:
#!/usr/bin/env perl
$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
else()
cmake_policy(VERSION 2.6)
endif()
END
while(<>) {
if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
while(<>) {
if(/^endif\(\)/) {
print "$replacement";
while(<>) {
print;
}
exit 0
}
}
}
print;
}
2012-08-22 12:35:03 +00:00
4c3e1c3138
Fix mixed eol styles
2012-08-02 13:35:03 +00:00
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
c7ca93c07e
Include <CGAL/glu.h> before any use of GLU
2011-11-09 14:24:17 +00:00
f9b288db90
Merged branch ^/branches/features/gsoc2011-copy_n-pmoeller.
...
Small feature page: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Replace_copy_n
2011-08-26 14:34:10 +00:00
78b2f8ba39
Remove the use of QT ASSISTANT in CMakeLists.txt (not actually used)
2011-06-14 14:02:42 +00:00
3c02e07b23
Try to fix my last revision about cmake_policy, with CMake-2.6.x
...
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
c97205f085
Global handling of CMake policies (second part)
...
We declare
cmake_minimum_required(VERSION 2.6.2)
but we also use
cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.
That way, we no longer need any declaration of specific policies.
Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
0631943153
Uniform capitalization in our CMake script: use lowercase for commands
2011-04-28 10:36:18 +00:00
ca5c92e034
Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
...
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
- change cmake_minimum_required to VERSION 2.6.2
- no longer any need for the policy CMP0003 (was for 2.4.x)
- no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
7605aa0891
remove generated file and remove warnings
2011-02-23 10:00:48 +00:00
48889a4c7e
one more icon cleaned
2011-01-03 08:02:30 +00:00
ae537cc23e
cosmetic
2011-01-02 18:08:30 +00:00
8a312f551e
improve some comments
2011-01-02 18:04:50 +00:00
fc9fa9aebb
a few icons replaced by home-made icons (using ipe)
2011-01-02 17:58:54 +00:00
33ff6e921e
yet another missing file...
2010-12-21 09:30:53 +00:00
2cfe7faeb9
added missing file
2010-12-21 09:23:10 +00:00
543fec7ccf
new T3 demo using Qt4 and QGLViewer
...
This demo was written in the framework of the GSoC by Fei (Sophie) Che, co-mentored by Manuel and me.
2010-12-20 13:31:30 +00:00
a363b9f1fa
Geomview demos moved one floor up
2010-12-20 13:05:32 +00:00
b74c45cc26
directory for Geomview demos
2010-12-20 13:02:37 +00:00
e80a597760
Fix typos.
2009-11-05 12:29:42 +00:00
828a6eeabc
Merge the Triangulation_3_Location_policy branch.
...
- Deprecate the "hierarchy" implementation detail in the package API.
- Introduce a Location_policy parameter instead.
- Add a "Complexity and Performance" section in the user manual.
- Add a benchmark program (dont_submit'ed for now)
Note : merge done by hand as svnmerge.py got too easily confused...
2009-11-04 12:57:51 +00:00
70ec9b7ff7
Remove obsolete (?) makefile.
2009-07-20 09:40:24 +00:00
a14be60b7b
rename T3 demo .cpp, to avoid duplicated target names
2008-12-15 09:44:03 +00:00
50c483ccb7
Commit missing CMakeLists.txt for demos.
2008-12-10 11:03:43 +00:00
f93437ca22
Removed *unmodified* auto-generated CMakeLists.txt (now created by create_internal_release)
2008-05-05 14:01:55 +00:00
b704509dcf
Examples/Demos/Test CMake scripts updated
2008-03-05 21:14:02 +00:00
a659cd852a
Added project() and conditional test for CGAL_DIR
2008-02-14 15:42:36 +00:00
14043c43a0
Replaced CGALROOT by CGAL_DIR (the latters is used by CMake automatically)
2008-02-08 17:47:21 +00:00
afddfc4fca
CMake scripts for demos/examples/test added
2008-02-06 19:06:24 +00:00
8aaa7e25ca
Remove local include directive.
2007-08-20 20:32:19 +00:00
a7f0ead112
Triangulation_3 iterator range insert and constructors now
...
use spatial_sort.
Examples and demos now call range insert when possible.
2007-03-30 09:30:22 +00:00
b2630cd7e1
Apply trailing whites-spaces and leadgin+trailing empty-lines cleanups
...
to demo/**/*.h and .cpp.
2007-03-10 16:55:12 +00:00
cf872de855
- Add a new TCellBase model Triangulation_cell_base_with_circumcenter_3,
...
which stores the circumcenter.
- Delaunay.dual() now calls the .circumcenter() function of the cell
to retrieve it.
- It implies a new requirement on the TCellBase, for the Delaunay::dual()
case, hence the default model T_cell_base_3 provides a new function
(and the concept is updated).
2006-08-04 18:23:08 +00:00
b746ffb9e2
changed .C to .cpp in examples
2006-07-09 19:51:14 +00:00
11a449ae00
Added/fixed CGAL_MAKEFILE= line in makefiles
2006-03-14 19:35:55 +00:00
db6a8f948c
Change CVS keywords to SVN style
2006-02-16 14:30:13 +00:00
1aad55d4cb
Change CVS keywords to SVN style
2006-02-14 10:08:15 +00:00
ee07ad352c
Move packages to trunk root
2006-02-14 08:58:20 +00:00
Laurent Rineau
Maxime Gimeno
Sébastien Loriot
Andreas Fabri
Aurélien Vialon
Clement Jamin
Jane Tournois
Laurent Rineau
Philipp Möller
Sébastien Loriot
Monique Teillaud
Sylvain Pion
Fernando Cacciola
Christophe Delage
Joachim Reichel
Laurent Saboret