8ab112f5bd
Merge and new plugin fixes
2015-06-30 13:03:20 +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
81ca925a34
Alpha_shapes_3
2015-05-06 09:17:14 +02:00
ba4ede5f50
Clean-up
...
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
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
ce428fd9ed
Memory Optimisation
...
- Resized the buffers and vao arrays to fit their actual numbers.
2015-04-09 10:54:20 +02:00
07222c791f
Upgrade to OpenGL3 with Qt wrappers
...
- added a function "alphaChanged" to update only the facets when the alpha number changes.
- added the set of function for the shaders
- added a function initializeGL and made Viewer inheritate from QGlFunctions to be able to use the QOpenGL functions
2015-04-09 09:57:57 +02:00
60b47f0978
Succesfully upgraded to Qt5
2015-04-01 12:18:59 +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
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
f1f6218ca7
Fix of some bugs with Arrangement on surface 2 and others demonstrations.
...
Improvement of some comentaries.
Change of findQt5.cmake flags using.
2014-08-14 02:15:02 +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
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
88ef561715
Fix the call to Q_INIT_RESOURCE
...
For resources that are shipped by the CGAL_Qt4 library, one need to call
CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources
(exported by the CGAL_Qt4 DLL)
2011-10-11 09:51:29 +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
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
cfc69020a5
const QString& -> QString
2010-08-23 10:37:11 +00:00
76eac30b99
Add static_cast
2010-06-25 07:39:10 +00:00
63ca9795b3
move missing file
...
rm void directory
2010-05-20 16:32:36 +00:00
84f71661c9
step N for moving the 3D Alpha Shape demo
2010-04-08 16:04:44 +00:00
2a30ec09c7
step N-1 for moving the 3D Alpha Shape demo
2010-04-08 16:03:16 +00:00
082667ba2c
Get the old demo out of the way
2010-04-08 15:58:15 +00:00
3ca3002436
Renamed data files so that they can be read by the demo
2008-12-15 15:06:33 +00:00
f10a590672
Mass-remove vcproj files.
2008-10-21 09:21:22 +00:00
fc6a3d9990
Remove that CMakeLists.txt. The auto-generated one will be sufficient.
2008-10-02 08:37:04 +00:00
6188beb113
remove alpha_shapes_3
2008-09-29 19:00:19 +00:00
a5941f81cf
Alpha_shapes_3/demo needs a submitted/commited CMakeLists.txt.
2008-06-30 11:29:53 +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
ea71b8eaa1
.C ->.cpp and autolinking
2007-04-11 13:59:20 +00:00
704933f79a
replace obsolete variable CGAL_WINDOW_LDFLAGS by CGAL_LDFLAGS
2007-03-11 09:57:31 +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
083c2b007b
changed .C to .cpp in examples
2006-07-09 19:01:37 +00:00
5f8d18ffd4
Uniformize '# CGAL_MAKEFILE' line.
2006-05-20 07:52:02 +00:00
e42659d1a4
Fixed svn:executable, svn:keywords and svn:eol-style properties of the whole trunk
2006-05-04 09:15:26 +00:00
cdf3a90818
upgrade to VC7.3 and fixes
2006-04-26 20:47:38 +00:00
7a2fec4821
renamed {demo,examples}/Makefile to {demo,examples}/makefile to avoid
...
being matched by "Makefile" in dont_submit
2006-03-17 18:00:59 +00:00
51545d677b
- Rename Data/ directories to data/ for homogeneity.
2006-03-11 22:21:10 +00:00
d3c9bf2e4a
Changed names of examples and demos
2006-03-09 09:56:28 +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
f95e742de3
Move packages to trunk root
2006-02-14 08:58:13 +00:00
Maxime Gimeno
Andreas Fabri
Aurélien Vialon
Laurent Rineau
Sébastien Loriot
Fernando Cacciola
Joachim Reichel
Sylvain Pion
Laurent Saboret