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
fae635d2fb
Merge pull request #73 from afabri/CGAL-Qt_no_keywords-GF
...
All Qt4-based demos now use `-DQT_NO_KEYWORDS`
2015-05-26 12:32:40 +02:00
98bbdbfc2d
Move functor that detect non void attributes and point in CGAL namespace (before they were in internal); add a missing void typedef.
2015-05-15 19:58:37 +02:00
c5d196f78c
remaining demos
2015-05-06 18:53:44 +02:00
8fc89ebf86
WIP : non-triangle facets management
...
- Sometimes at run time nothing is displayed
for the entire life of the program, sometimes
it's ok but a message is displayed about the
scene radius which is negative
- Voronoi crashes for points sets in 3D (wrong map,
darts xxx does not have a vertex or something similar)
and displays nonsense for 2D set points
2015-04-10 14:29:05 +02:00
7b2f0ebe89
WIP : Upgrade to OpenGL 3 with Qt wrappers
...
- de-activated the light for the points and lines
- rendering with shaders
- need of non-triangle facets management
2015-04-10 09:43:21 +02:00
60b47f0978
Succesfully upgraded to Qt5
2015-04-01 12:18:59 +02:00
0310953938
undo a redundant change in import_from_triangulation_3
2015-04-01 11:02:47 +05:30
78dd583dac
fixes issue of infinite vertex in import_from_triangulation_3
2015-03-31 14:18:41 +05:30
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
93ceb66149
Remove -Wall for demo
2015-03-04 13:36:53 +01:00
c0e4987190
Add wall option for lcc demo
2015-03-03 11:13:25 +01:00
fd4162a5a1
Bug fix in size function in ranges
2015-03-03 10:37:37 +01:00
2ee8f25ba6
Update the undocumented function write_off to allow the export of mesh with dimension higher than 2
2015-02-27 13:57:52 +01:00
9a6ed32a15
Merge branch 'Combinatorial_map-update_attributes-sbrandel'
...
- corresponding to small feature "Combinatorial map update attributes"
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager
Conflicts:
Installation/changes.html
2015-01-08 14:48:47 +01:00
e2c433bd7e
One more remove^Crailing whitespace.
2015-01-06 15:53:51 +01:00
60c9eb8cbc
Remove trailing whitespace.
2015-01-06 15:52:41 +01:00
4d6a8573f5
Add one example.
2015-01-06 12:24:50 +01:00
31f97645d9
Finalize doc + example.
2015-01-05 18:37:50 +01:00
090f2f5cfd
Remove warning
2015-01-02 18:50:49 +01:00
32464de4a5
Update demo for Menger, Sierpinski Carpet and Sierpinski Triangle.
2014-12-28 17:15:02 +01:00
237c4b87fb
Remove warnings.
2014-12-27 20:12:51 +01:00
029724ab67
Add example file
2014-12-25 08:20:52 +01:00
d851f35651
Remove warnings; wrong use of typename and template in viewer; default argument for example.
2014-12-25 08:20:00 +01:00
69b53d262d
Improve demo drawing.
2014-12-24 09:18:55 +01:00
34e9139cde
Update viewers.
2014-12-24 08:19:09 +01:00
bdc0dee6ce
Update operations to use are_attributes_automatically_managed
2014-12-23 22:15:49 +01:00
0860cf5012
Remove trailing whitespaces
2014-12-23 21:52:15 +01:00
c9345af46b
add the new function in Linear cell complex class.
2014-12-23 21:51:04 +01:00
882c6033df
Bug fix; optimize merge volume operations.
2014-12-23 21:07:53 +01:00
919bf8af74
Cleanup + some optimizations.
2014-12-23 09:34:09 +01:00
08af113c95
Adding linear_cell_complex_3_attributes_management.cpp example
2014-12-12 15:41:23 +01:00
b0591661fd
Adding example linear_cell_complex_3_attributes_management.cpp
2014-12-12 15:38:14 +01:00
1cb63c386b
Modification of the names of attributes management functions
2014-12-05 16:03:44 +01:00
2916850771
use iformat for reading doubles
2014-11-26 16:53:50 +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
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
7f408374a1
Modification of LCC CMakeList to make the Qt version missing appears.
2014-08-05 20:13:45 +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
0a457c4b03
Correction of some bug caused by the new find_package way of Qt (Qt4or5) with the Qt4 support.
2014-08-02 14:59:49 -07:00
46c8926854
New way to chose Qt version for projects configuration.
...
Now, we have choice between "WITH_CGAL_Qt4" and "WITH_CGAL_Qt5" (like before because differents CGAL_QtX sources folders return).
Once the libCGALQt4 or libCGALQt5 configured, an cmake config variable "CGAL_QT_RECENT" allow us to know what is the more recent libCGAL_QtX configured.
Automaticaly,the demonstrations chose this recent version of Qt to build their project (even if a Qt version choice is proposed during CMake configuration)
During CMake configuration, when the user change the version of libCGAL_QtX, that change automaticaly the Qt version of find_package(QtX)
Now Qt4or5 is the thing allowing the choice between Qt4 and Qt5 (find_package(CGAL COMPONENT Qt4or5) or find_package(Qt4or5))
2014-08-02 01:37:41 +02:00
6784800dd1
Fusion of CGAL_Qt4 and CGAL_Qt5 into just one CGAL_Qt.
2014-07-31 22:41:44 +02:00
3deb8e7910
Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
...
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.
There was a conflict with two features recently merged into 'master' for
CGAL-4.5:
- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
the small feature:
http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper
- parallelism for Triangulation_3 and Mesh_3:
http://cgal.org/wiki/Features/Parallel_Mesh_3
Conflicts:
Combinatorial_map/include/CGAL/Cell_attribute.h
Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
Polyhedron/demo/Polyhedron/Polyhedron_type.h
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
I also modified the following files during the conflict resolution:
Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
2014-07-18 15:47:14 +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
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
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
d62a535fd7
minor addons in the code, not in the API
2014-06-13 16:02:55 +02:00
5be86812ea
Merge branch 'gsoc2014-CGAL-Qt5_support-vialon' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2014-CGAL-Qt5_support-vialon
...
Conflicts:
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
2014-06-12 22:16:31 +02:00
Maxime Gimeno
Laurent Rineau
Guillaume Damiand
Andreas Fabri
Pranav
Sylvain Brandel
Aurélien Vialon