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
1097079153
Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin
2015-06-12 16:04:59 +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
4e9eefd891
Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri
2015-06-08 15:17:47 +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
6c4785a29c
On Polygon_mesh_processing_OpenMesh-GF: fairing pour openmesh
2015-05-13 16:10:21 +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
b0f50afafe
fix citation
2015-04-24 15:26:38 +02:00
c1dcc13c30
add more accentuate letters
...
Conflicts:
Documentation/scripts/generate_how_to_cite.py
2015-04-23 08:09:58 +02:00
674159d412
fixes of doxygen warnings/errors
2015-04-14 14:37:42 +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
de5058ae84
Merge branch 'Point_set_shape_detection_3-cjamin_old' into Point_set_shape_detection_3-cjamin
...
Conflicts:
Documentation/doc/Documentation/dependencies
Documentation/doc/Documentation/packages.txt
2015-04-03 16:01:03 +02:00
9f1f8ae95d
add random access range
...
and use boost::size instead of distance
2015-04-01 18:11:39 +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
5767addb9c
Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer
...
Conflicts:
Documentation/biblio/cgal_manual.bib
Documentation/biblio/geom.bib
Documentation/doxyassist.xml
2015-03-26 16:26:15 +01:00
d1c85c8daf
Add a link to www.cgal.org in the horizontal menu
2015-03-26 12:30:18 +01:00
3344ff0909
Add doc for package Solver_interface
2015-03-24 13:42:58 +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
ef96f4886b
a bit of reorganization of the doc
...
also add a ref to the PMP book
2015-03-12 17:06:48 +01:00
d39f201724
in triangulate_hole_polyline, replace begin and end iterators by PointRanges
2015-03-10 11:38:08 +01:00
513e1cc1a5
update urls
2015-02-23 15:51:55 +01:00
fdfccf482e
decode is not available in python 3
...
trivial bugfix for master
(cherry picked from commit aac974b83d
2015-02-10 11:21:48 +01:00
aac974b83d
decode is not available in python 3
...
trivial bugfix for master
2015-02-10 11:16:47 +01:00
1ed289cc7e
Merge branch 'old/gsoc13-CurveSkeleton-new_package-xgao' into gsoc13-CurveSkeleton-new_package-xgao
...
Conflicts:
Documentation/doc/Documentation/Doxyfile.in
Documentation/resources/how_to_cite_cgal.bib.in
2015-02-09 12:43:41 +01:00
eeae2f392a
Merge branch 'local/Remove_condition_on_CGAL_version' into Polygon_mesh_processing-GF
2015-02-05 14:47:56 +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
137805d091
Merge branch 'old/Polygon_mesh_processing-GF'
...
Conflicts:
Operations_on_polyhedra/include/CGAL/orient_polyhedron_3.h
Polygon_mesh_processing/include/CGAL/orient_polygon_soup.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2015-01-30 17:55:22 +01:00
31855de8be
Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri
...
Conflicts:
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
2015-01-15 18:56:05 +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
e9763e3acf
Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF
...
Conflicts:
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h
Polygon_mesh_processing/include/CGAL/Self_intersection_polyhedron_3.h
2015-01-12 11:47:38 +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
fc6f9368a0
move Hole Filling in the new Polygon Mesh Processing package
2015-01-06 11:37:25 +01:00
d52e392748
Merge branch 'Polyhedron_HoleFilling-GF' into Polygon_mesh_processing-GF
2015-01-06 11:05:21 +01:00
67cb148918
fix doc warnings and add to package overview
2015-01-06 10:52:48 +01:00
120890cacc
Add manual.txt
2014-12-30 12:19:55 +01:00
c480d71f22
Merge branch 'old/Scale_space_reconstruction_3-tvanlank' into Scale_space_reconstruction_3-tvanlank
...
Conflicts:
.gitignore
Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-12-29 10:15:53 +01:00
766673bd8c
resolve merge conflicts
2014-12-22 17:46:59 +01:00
315ffdcbc8
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-12-18 09:32:23 +01:00
4fe13d1b32
Merge branch 'gsoc13-CurveSkeleton-new_package-xgao-old' into gsoc13-CurveSkeleton-new_package-xgao
...
Conflicts:
Documentation/doc/Documentation/packages.txt
2014-12-18 07:12:27 +01:00
18941ef053
fix documentation about how to install TBB on Windows
2014-12-15 16:09:14 +01:00
63406293e1
Merge branch 'Projection_traits-add_more_functors-sloriot' into barycentric_coordinates_2-dmitry
...
Conflicts:
Documentation/biblio/cgal_manual.bib
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
2014-12-12 14:24:17 +01:00
b2858d9408
add a link to organization in Getting Started
2014-12-03 16:54:33 +01:00
853a78a9be
use real CGAL classes in concepts/models
2014-12-03 14:10:16 +01:00
631e3452cc
Add a page on the Organization of the Manual
2014-12-03 08:37:55 +01:00
34a06c004a
Add a figure with concepts and models
2014-12-01 21:26:36 +01:00
d48a67f36a
polish links
2014-12-01 11:07:20 +01:00
4eb40cfc94
Add Organization of the Reference Manual
2014-11-28 18:15:38 +01:00
6f4123db35
cleanup
2014-11-28 16:12:50 +01:00
5f3d0f2e34
tell that HalfedgeGraph and InputIterator are also concepts
2014-11-28 14:06:29 +01:00
6d07743d29
Add another example for concept/model
2014-11-28 11:15:28 +01:00
ef657ba6fb
Add a section for Concepts and Models
2014-11-27 15:10:27 +01:00
8a7b5448b7
Merge branch 'old/Polyhedron_HoleFilling-GF' into Polyhedron_HoleFilling-GF
...
Conflicts:
Documentation/doc/Documentation/packages.txt
2014-11-21 13:17:40 +01:00
c6de2a50b2
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-11-20 19:19:23 +01:00
4355794781
iterator_range moved the package
2014-11-12 14:40:51 +01:00
9796930299
Fix the font weight for links long descriptions prototypes
2014-11-10 14:52:18 +01:00
136006894d
add to how_to_cite
2014-11-07 17:43:17 +01:00
de6c026d8f
Merge branch 'GraphicsView-try_export_to_SVG-lrineau' into Triangulation_2-NewPolylineConstraint-GF
2014-11-07 17:40:01 +01:00
cae5e7417b
better introduction and illustration, bibtex entry
2014-11-07 16:10:09 +01:00
e5b72ac5b3
Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
...
Conflicts:
Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
BGL/examples/BGL_arrangement_2/primal.cpp
BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.hpp
Installation/changes.html
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
2014-11-05 16:11:35 +01:00
18bf568569
Fix missing curly bracket
2014-11-04 22:50:38 +01:00
bf88d82a31
added two references in cgal_manual.bib
2014-11-05 02:54:53 +08:00
6cef5aa870
Use the MathJaX CDN with https://
...
Otherwise, Firefox, when reading CGAL documentation pages through an
https connection, will refuse to load MathJaX via the CDN.
(cherry picked from commit 6f24960677
2014-10-21 17:03:27 +02:00
fe219593e6
Add where to find doc of previous releases
2014-10-21 10:49:19 +02:00
f70eb8a2b4
Use the MathJaX CDN with https://
...
Otherwise, Firefox, when reading CGAL documentation pages through an
https connection, will refuse to load MathJaX via the CDN.
(cherry picked from commit 6f24960677
2014-10-17 19:06:08 +02:00
9af438d488
add example path and write intro
2014-10-15 14:35:34 +02:00
4be974b230
Improve Getting Started
2014-10-14 18:38:18 +02:00
f720e3a07f
Proofreading the documentation
2014-09-26 11:53:30 -04:00
fbc46bd95e
rename Polyhedron_shortest_path -> Surface_mesh_shortest_path
2014-09-19 17:33:43 +02:00
d0db4d87db
fix package overview
2014-09-18 11:08:42 +02:00
35bae7aae9
revert wrong modifications in a6ea82cb
2014-09-18 10:59:23 +02:00
7b347ed166
Added a new example of the sequence visitor to the docs
...
Also fixed/updated some of the documentation images
2014-09-18 04:47:35 -04:00
99a9367396
added visibility paper of EuroCG 2014 arXiv version
2014-09-17 16:36:42 +02:00
088774528a
First round of Reference Manual revisions
2014-09-16 17:11:08 -04:00
99f663b8bd
merged with the reduced convolution branch
2014-09-15 19:33:17 +03:00
8f259e5dea
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-09-09 11:20:33 +02:00
5fde9635d2
Reorder packages in the Part Geometry Processing: Surfaces, Points, 2D
2014-08-29 15:57:51 +02:00
d5d9104736
typo
2014-08-27 11:28:55 +02:00
e23cbaaa67
typo
2014-08-27 11:22:39 +02:00
6f24960677
Use the MathJaX CDN with https://
...
Otherwise, Firefox, when reading CGAL documentation pages through an
https connection, will refuse to load MathJaX via the CDN.
2014-08-25 16:51:08 +02:00
3061863027
Some corrections about documentation.
2014-08-19 19:52:30 +02:00
ec39bd6ea9
Add of Qt5 support into documentation.
2014-08-19 18:50:38 +02:00
b1985a2674
update videos for the deformation package
2014-08-15 08:50:01 +02:00
c6360ce3a4
Cite Behar & Lien's paper in reduced convolution M-sum method documentation
2014-08-13 15:01:29 +02:00
5083f0b6c3
Merge branch 'gsoc13-CurveSkeleton-new_package-xgao-old' into gsoc13-CurveSkeleton-new_package-xgao
2014-08-12 15:07:49 +02:00
bbfddeb0d9
Merge branch 'Polyhedron_HoleFilling-GF-old' into Polyhedron_HoleFilling-GF
...
Conflicts:
Documentation/doc/Documentation/dependencies
Documentation/doc/Documentation/packages.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
Solver_interface/include/CGAL/Eigen_solver_traits.h
2014-08-12 07:11:07 +02:00
9cda3aa2ea
Add user manual for package with figures and examples
2014-08-08 14:17:34 -04:00
4a50711cf8
add halfspaces_intersection_with_construction_3 + doc + benchmark
2014-08-08 17:32:58 +02:00
43b8390a70
Merge branch 'Triangulation_2-NewPolylineConstraint-GF-old' into Triangulation_2-NewPolylineConstraint-GF
2014-08-08 12:47:15 +02:00
a6ea82cbf7
Add an example using OpenMesh
...
Involves several changes to the Polyhedron_shortest_path class which were
not conformant to the Face Graph concept.
2014-08-04 22:59:51 -04:00
d2a2e9d64b
Fix a minor bug in the generated documentation
...
Probably due to a bug of Doxygen, two sentences were glued, without any
whitespace.
2014-08-01 10:47:43 +02:00
9a48be8c59
Merge branch 'Polyhedron_demo-point_item_knows_if_it_has_normals-local' into Point_set_shape_detection_3-cjamin
2014-07-28 09:18:17 +02:00
90ec02f576
Prepare for CGAL-4.5
2014-07-22 12:47:50 +02:00
33ab5502f0
Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin
...
Conflicts:
Documentation/doc/Documentation/packages.txt
2014-07-21 13:41:05 +02:00
fbf824c711
Merge branch 'Mesh_3-parallel-cjamin'
...
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3
Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
6ed1ba826e
Merge branch 'to-be-tested/Stop_testing_taucs-sloriot'
...
Taucs, Lapack and Blas supports are no longer tested
Approved by the Release Manager
Tested in CGAL-4.5-Ic-97
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-07-16 20:19:21 +02:00
a158d13647
initial version of Surface_mesh package
2014-07-15 12:08:51 +02:00
776a940df4
Merge branch 'gsoc13-CurveSkeleton-new_package-xgao-old' into gsoc13-CurveSkeleton-new_package-xgao
...
Conflicts:
Documentation/biblio/geom.bib
Documentation/biblio/manual-4.3.bib
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/packages.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
Solver_interface/include/CGAL/Eigen_solver_traits.h
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Edge_profile_impl.h
2014-07-10 00:45:05 +02:00
08edac829d
Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer
...
Conflicts:
Documentation/biblio/how_to_cite.html
Documentation/biblio/how_to_cite_cgal.txt
2014-07-09 12:39:23 +02:00
16441b0f6d
Merge branch 'Surface_modeling-integration_with_BGL-GF'
...
Introduces the Surface modeling package that allows
to deform a triangulated surface mesh
Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager
Conflicts:
Installation/changes.html
2014-07-08 19:53:36 +02:00
a83605cf94
This should never have been commited
2014-07-04 20:56:08 +02:00
e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
aeb094e4cc
more Taucs removal
2014-06-25 15:58:37 +02:00
0230e979e2
Merge branch 'CGAL-use_leda-GF-OLD' into CGAL-use_leda-GF
...
Conflicts:
Arrangement_on_surface_2/test/Arrangement_on_surface_2/construction_test_suite_generator.cpp
Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp
Documentation/doc/Installation.txt
Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
2014-06-18 22:50:06 +02:00
cb58227f62
Merge branch 'Polyhedron_demo-add_scene_polyhedron_selection_item-sloriot' into Surface_modeling-integration-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Travel_isolated_components.h
2014-06-18 11:53:16 +02:00
70d72d7155
Merge branch 'Polyhedron_HoleFilling-GF-old' into Polyhedron_HoleFilling-GF
...
Conflicts:
Operations_on_polyhedra/include/CGAL/Self_intersection_polyhedron_3.h
Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-06-16 15:30:55 +02:00
3a8004e2b3
Processed Andreas' quick review of the documentation.
2014-06-10 15:39:22 +02:00
770a5820d7
Trivial bug fix
...
The files how_to_cite_cgal*.html were created in the source directory,
and not the binary directory.
2014-06-02 16:58:30 +02:00
05efa677a1
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
...
Conflicts:
NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h
NewKernel_d/test/NewKernel_d/Epick_d.cpp
2014-05-28 14:53:26 +02:00
eb360523c6
changed CGAL package registration (added point_set_shape_detection_3 in some places)
...
adapted benchmark
small change in documentation text
2014-05-26 10:03:47 +02:00
64953a88e4
Update first documentation just before CGAL submission.
...
Performance table added.
2014-05-23 17:16:09 +02:00
194e4241d4
try to add the polyline simplification documentation
2014-05-16 14:51:27 +02:00
8275d99909
fixed typo
2014-05-16 11:07:05 +02:00
9c2bea6308
fixes in polyline simplification
2014-05-15 17:52:44 +02:00
85b29aed5f
treat merge conflicts
2014-05-15 16:09:24 +02:00
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00
07a8ed657a
the post processing also collects fig anchors in the reference manual pages
...
(cherry picked from commit 8576c41a06
2014-04-11 10:32:38 +02:00
8576c41a06
the post processing also collects fig anchors in the reference manual pages
2014-04-10 17:43:28 +02:00
2892c2fb4e
Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF
...
Conflicts:
Documentation/biblio/geom.bib
Documentation/doxyassist.xml
2014-04-08 14:41:09 +02:00
7cb7fe806a
doc fix: set year to XX and XXXX in default generated bibtex file and page
2014-03-28 15:42:22 +01:00
0fa931348a
doc fix: publish the doc only if bash and bibtex are present
2014-03-28 15:41:19 +01:00
c5ae1d35a9
Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri
2014-03-26 12:55:58 +01:00
879e652d08
Add the "Triangulation" package in the lists so that the doc is correctly generated
2014-03-19 14:11:23 +01:00
36efbf79a4
* clean up the "CGAL_DEBUG_MODE" blocks
...
* GENERATE_LATEX was changed, but I don't know why
2014-03-17 16:12:23 +08:00
157cd0465f
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/demo/Mesh_3/Mesh_3_optimization_plugin_cgal_code.cpp
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h
Mesh_3/include/CGAL/Mesh_3/config.h
Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/include/CGAL/exude_mesh_3.h
Mesh_3/test/Mesh_3/test_meshing_utilities.h
Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
2014-03-10 17:01:03 +01:00
621bea5579
Fix bibtex2html with TexLive
...
See the question:
http://tex.stackexchange.com/q/37822/47086
where the answer "openout_any=a pdflatex file" was given.
2014-02-28 17:12:27 +01:00
eb72332c92
Handle errors of makebiblio, in the cmake script
2014-02-28 17:12:10 +01:00
cc4712d360
Turn messages to WARNING
2014-02-28 17:11:46 +01:00
16a9178d7a
Quiet bibtex2html
2014-02-28 17:11:10 +01:00
8de7596d1d
Make makebiblio fail on errors of sub-commands
2014-02-28 17:10:24 +01:00
076ce96561
BaseDoxyFile.in update.
...
Update the option to generate the pdf output together with html.
2014-02-27 23:32:24 +01:00
553547c8eb
doc postprocessing bug fix: update <title></title> of concept classes
2014-02-27 08:05:32 +01:00
d283c86017
Small corrections.
...
Some small corrections to the first local commit of the package Barycentric_coordinates_2.
2014-02-20 22:20:30 +01:00
590fa4402f
My first commit.
...
This is the first local commit of the new package Barycentric_coordinates_2 with some types of 2D generalized barycentric coordinates.
2014-02-20 21:41:48 +01:00
95aa50d5e5
decouple the generation/reading of tag files to avoid issue in parallel build
...
We give to doxygen two different directories for writing and reading
tag files. An additional target is taking care of copying the tag files.
In order to keep the PKG_doc target, I needed to duplicate the
generation commands (since the subtargets added are needed to have a
correct dependancy handling for the doc target).
2014-02-19 11:46:27 +01:00
74367ba164
fix incorrect use of DEPENDS in add_custom_target
2014-02-19 11:46:03 +01:00
0592f2abca
update path for windows compatibility
2014-02-12 08:46:37 +01:00
9c88f54de2
only replace a link to a fig if it was collected
2014-02-11 17:36:23 +01:00
3eb177cab4
portable overwrite of files
...
On windows os.rename cannot overwrite an existing file, it must be removed first
2014-02-11 17:19:03 +01:00
9114db9085
restore figure source files removed in 0fa2cacb
...
| commit 0fa2cacb60
2014-02-10 14:54:23 +01:00
5b9c0343ce
remove duplicated id for package and add a default one
...
doc bugfix
2014-01-27 08:22:55 +01:00
a72ee0c2a0
Merge branch 'Surface_mesh_segmentation-sloriot'
...
Introduces the Triangulated Surface Mesh Segmentation Package
See also wiki/Features/Surface_mesh_segmentation
Tested in 4.4-Ic-84
Approved by the release manager
Conflicts:
Documentation/biblio/how_to_cite.html
Documentation/biblio/manual-4.3.bib
Manual/doc_tex/Manual/geom.bib
2014-01-10 00:15:18 +01:00
0d550585ad
update logo
2013-12-11 07:29:12 +01:00
da83251018
Add bibtex entries and citations
2013-12-09 15:16:48 +01:00
a5ad82916b
update the cgalPkgDemo macro to use the CGAL version
2013-12-06 12:29:11 +01:00
79a294e689
remove extra %
2013-12-06 12:04:30 +01:00
46265569e2
request sh instead of bash for the bibtex generation
2013-12-06 12:03:49 +01:00
4fb79eedd7
handle bibtex generation on non linux/unix system
...
it uses a default when it is not possible to generate it
2013-12-06 09:11:01 +01:00
52cbc39a3c
Make cmake generate the bibtex files for the doxygen manual
...
WIP working only on Linux/Unix and with cmake >= 2.8.11
2013-12-05 22:57:30 +01:00
f3899f9f36
update installation manual to use cgalReleaseNumber
2013-12-05 13:31:56 +01:00
6d3b7d5b9f
add the doxygen macro cgalReleaseNumber in the Documentation package doc
2013-12-05 13:30:33 +01:00
139d3aa365
clean up developer manual
...
*rename developer manual chapter anchors
*linking issues
*update html links
2013-12-05 12:29:25 +01:00
25234d5578
reorder dependancy
2013-12-05 11:46:28 +01:00
961a7644a0
rename doc targets consistently
2013-12-05 11:24:30 +01:00
ed40c09acf
Merge remote-tracking branch 'origin/Documentation-improvement-lrineau'
...
change the target to build the documentation to doc,
Documentation_doc now builds the doc in Documentation package
2013-12-05 11:16:09 +01:00
c1c29b2353
handle figure numbering for the developer manual
2013-12-05 09:36:51 +01:00
032c6e428a
Add the developer manual to the Manual
2013-12-03 17:17:43 +01:00
288e034e2c
Merge branch 'gsoc13-CurveSkeleton-new_package-xgao-old' into gsoc13-CurveSkeleton-new_package-xgao
...
Conflicts:
Polyhedron/demo/Polyhedron/CGAL_demo/Scene_interface.h
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene.h
2013-12-03 15:59:00 +01:00
ce47c6e331
Hook the Advancing Front Surface Reconstruction inot the manual
2013-11-28 15:16:20 +01:00
6802db2f6b
Merge branch 'old' into Advancing_front_surface_reconstruction-afabri
...
Apply "My branch is really old.." from the FAQ
Conflicts:
Installation/changes.html
Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp
Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h
Polyhedron/demo/Polyhedron/include/CGAL/gl_render.h
2013-11-28 14:58:29 +01:00
17f17382eb
cleanup and add doxygen version of the manual
2013-11-28 14:44:33 +01:00
ec8e949d21
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-11-21 10:50:55 +01:00
0d4340d7c3
Merge branch 'Aos_2-polyline_upgrade-fub-old' into Aos_2-polyline_upgrade-fub
2013-11-10 09:51:05 +01:00
ecce128af5
Merge branch 'Documentation-add_missing_dll_link-GF'
...
Add a link to the common dll for all demos
Tested in CGAL-4.4-Ic-15
Approved by the release manager
2013-11-04 11:19:50 +01:00
fff5b7bc1a
Merge branch 'Aos_2-polyline_upgrade-fub-old' into Aos_2-polyline_upgrade-fub
2013-10-26 16:02:04 +02:00
cff2fa8d3a
Merge branch 'Doxygen_cgalModif-gdamiand'
...
Add two macro used to mark modified text; this is usefull to simplify reviewing process.
Approved by the release manager.
2013-10-24 19:49:38 +02:00
4578828057
update dll path
2013-10-22 14:12:35 +02:00
979306eb93
add a link to common demo dlls and update demo macro to avoid repeating Demo
2013-10-22 12:16:48 +02:00
564a6c794d
Synchronized with a recent version of master
2013-10-22 10:00:18 +03:00
700cfba92f
doxygen does not like reference ending with -
2013-10-18 15:23:02 -07:00
Laurent Rineau
Clement Jamin
Andreas Fabri
Sébastien Loriot
Jane Tournois
Efi Fogel
Sven Oesau
Laurent Rineau
Maxime Gimeno
Michael Hemmer
Philipp Möller
Remy Thomasse
Shihao Wu
Stephen Kiazyk
Aurélien Vialon
Sebastian Morr
Jocelyn MEYRON
Thijs van Lankveld
Dmitry Anisimov
Dror Atariah
Guillaume Damiand