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
8ae9c144a8
make cgal_create_CMakeLists and its brethren recognize all common C++ source file extensions
...
Rationale: cgal_create_CMakeLists and related scripts used to not
consider files ending on anything else than .cpp or .C as C++ sources.
This patch allows for the list of extensions considered as C++ source
files as stated in the g++ man page.
2015-06-25 15:55:55 +02:00
5f8116e075
Precision avec SFINAE, access control, and C++11
2015-06-23 19:30:24 +02:00
cbf2104c5f
Fix the link to our Sympa archives
2015-06-19 11:05:34 +02:00
cce0d3ec64
Merge pull request #100 from sloriot/gsoc2014-Polyhedron_shortest_path-skiazyk
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polyhedron_shortest_path
This package provides methods to compute the surface-constrained shortest path on 3d models. It was written as a project during GSoC 2014.
2015-06-15 10:45:25 +02:00
71207cac07
Merge pull request #116 from sloriot/gsoc2014-VCM_3-jmeyron
...
GSoC 2014, VCM feature from Jocelyn Meyron, Sébastien Loriot, and Quentin Mérigot
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/vcm_computation_and_applications
2015-06-15 10:37:29 +02:00
447c5fd2af
Merge pull request #69 from efifogel/MS_2-of_holes-efif
...
Add in `Minvoski_sum_2`:
- handling of polygons with holes,
- the new "reduced convolution" implementation.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Minkowski_sum_2_polygons_with_holes_and_RC
2015-06-10 12:24:00 +02:00
648ccb1510
CMake>=2.6.3 is required
...
I have tested: with CMake-2.6.2, there is a configuration error:
CMake Error: Error in cmake code at
/home/lrineau/Git/cgal/Installation/cmake/modules/CGAL_Macros.cmake:213:
Parse error. Function missing ending ")". Instead found left paren with text "(".
With CMake-2.6.3, that works.
2015-06-08 14:09:51 +02:00
c2cd87865e
Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
...
Conflicts:
Installation/changes.html
Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt
Point_set_processing_3/doc/Point_set_processing_3/examples.txt
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-04 11:27:56 +02:00
d123ce5a47
Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk
...
Conflicts:
Documentation/biblio/geom.bib
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Documentation/doc/Documentation/packages.txt
Documentation/scripts/generate_how_to_cite.py
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-01 17:47:31 +02:00
0f7cb5c709
Merge branch 'MS_2-of_holes-efif-old' into MS_2-of_holes-efif
...
Conflicts:
Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h
Documentation/biblio/cgal_manual.bib
Minkowski_sum_2/test/Minkowski_sum_2/test_Minkowski_sum.cpp
2015-05-03 11:41:36 +03:00
c1dcc13c30
add more accentuate letters
...
Conflicts:
Documentation/scripts/generate_how_to_cite.py
2015-04-23 08:09:58 +02:00
1b2dbf1181
Merge branch 'CGAL-require_Boost_1.48-lrineau'
...
We now document that Boost-1.48 or later is required.
Tested in CGAL-4.6-Ic-171.
2015-04-07 15:28:28 +02:00
e2b0b02dc7
Merge pull request #25 from bo0ts/Remove_note_in_bib
...
Make the bibliography more uniform
Tested in CGAL-4.6-Ic-171.
2015-04-07 15:23:46 +02:00
4eef28be7e
Minimal version of Boost: 1.48
2015-04-01 17:31:17 +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
d1c85c8daf
Add a link to www.cgal.org in the horizontal menu
2015-03-26 12:30:18 +01:00
74cddd1e47
Make the bibliography more uniform
...
If a note is simply a URL turn it into a url. Also turn all occurrences
of \path|http://www.cgal.org | into \url{http://www.cgal.org }.
2015-03-23 16:24:58 +01:00
513e1cc1a5
update urls
2015-02-23 15:51:55 +01:00
aac974b83d
decode is not available in python 3
...
trivial bugfix for master
2015-02-10 11:16:47 +01:00
696980d0a2
improve wording
2015-02-03 09:05:21 +01:00
cc9ab9c3be
fix dependancies
2015-02-03 08:24:55 +01:00
5b4062cbca
make sure the bibtex author string is ascii
2015-02-01 09:47:50 +01:00
804040b11e
forgot to add the new script
2015-02-01 09:30:41 +01:00
d8162fe5b2
move scripts to scripts directory
2015-01-31 16:34:07 +01:00
137d6a02b7
remove unused file
2015-01-31 16:33:50 +01:00
545cdcabe6
add a new script to generate how_to_cite files that no longer need bibtex2html
2015-01-31 16:16:23 +01:00
a1cd210984
remove unused files
2015-01-31 10:02:24 +01:00
b6f5088676
Merge branch 'Scale_space_reconstruction_3-tvanlank'
...
Tested in CGAL-4.6-Ic-104
Approved by the release manager
2015-01-14 16:09:11 +01:00
8d433181f4
Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu'
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Point_set_processing_new_algorithms
Tested in CGAL-4.6-Ic-101
Approved by the release manager
2015-01-13 17:28:21 +01:00
c6ece2b10e
Fix permissions
2015-01-12 16:23:14 +01:00
8929fd43c1
Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
...
Approved by the release manager
Conflicts:
Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
babaa99826
Merge branch 'CGAL-Getting_Started-GF'
...
Approved by the release manager
Conflicts:
Documentation/doc/Documentation/main.txt
2015-01-12 11:29:26 +01:00
6e36a853a9
Merge branch 'Surface_mesh-new_package-GF'
...
Approved by the release manager
Conflicts:
Documentation/doc/Documentation/dependencies
Documentation/resources/how_to_cite_cgal.bib.in
Installation/changes.html
2015-01-12 11:27:35 +01:00
07e62f3a1a
take bibtex input file from master and put the Surface_mesh entry at the right spot
2015-01-12 10:24:39 +01:00
4b3c35870c
take bibtex input file from master and put the Polyline Simplification entry at the right spot
2015-01-12 10:20:49 +01:00
ecda2555ab
Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu-old' into gsoc2013-Point_set_processing_3-point_set_consolidation-swu
2015-01-09 15:55:40 +01:00
2c961258cb
update changes and bibtex file
2015-01-09 14:14:30 +01:00
53c52bc516
Merge branch 'old/Scale_space_reconstruction_3-tvanlank' into Scale_space_reconstruction_3-tvanlank
2015-01-09 14:03:59 +01:00
40ec4f4ff6
cosmetic
2015-01-09 11:36:40 +01:00
74b99bd5a8
fix bibtex file to match the order of packages and add an entry for deformation
2015-01-09 11:33:18 +01:00
9349ab87ca
add Triangulations in the bibtex input file and update release date
2015-01-09 10:54:15 +01:00
0218954ea6
Merge branch 'barycentric_coordinates_2-dmitry'
...
Tested in CGAL-4.6-Ic-99 and CGAL-4.6-Ic-100
Approved by the release manager
Conflicts:
Installation/changes.html
Kernel_23/include/CGAL/internal/Projection_traits_3.h
2015-01-09 10:35:20 +01:00
d53b73514d
add bibtex entry
2015-01-09 10:32:46 +01:00
691dd0692b
do not generate latex doc
2015-01-09 10:25:51 +01:00
e0b402b094
Merge branch 'Triangulation-higher_dimensions-odevil_shornus'
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Triangulation_d
Tested in CGAL-4.6-Ic-98
Approved by the release manager
2015-01-08 18:15:34 +01:00
a801f9e185
Improve the examples which illustrate problems with double
2015-01-08 12:28:14 +01:00
7be3c2cbd2
Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu-old' into gsoc2013-Point_set_processing_3-point_set_consolidation-swu
2015-01-06 18:34:43 +01:00
aa374e3e99
reference biblio
2015-01-06 16:53:47 +01:00
120890cacc
Add manual.txt
2014-12-30 12:19:55 +01:00
Maxime Gimeno
Alexander Kobel
Laurent Rineau
Sébastien Loriot
Efi Fogel
Laurent Rineau
Andreas Fabri
Philipp Möller
Clement Jamin
Remy Thomasse