songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
65,272 Commits 3 Branches 156 Tags 973 MiB
Commit Graph

788 Commits

Author SHA1 Message Date
Sébastien Loriot 948651d961 Merge branch 'releases/CGAL-4.7-branch' 2015-10-27 08:59:20 +01:00
Sébastien Loriot 7e3fe6c776 fix a warning 2015-10-27 08:58:49 +01:00
Sebastien Loriot 2e493f297b Merge pull request #389 from afabri/CGAL-Qt3-GF 
Remove Qt3 based demos
 2015-10-23 17:08:49 +02:00
Andreas Fabri 38d063539a cleanup 2015-10-02 08:17:19 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Andreas Fabri 3532cf956a remove some Qt3 directories 2015-09-29 14:26:23 +02:00
Sébastien Loriot cdfc7f1c31 Merge branch 'old/CGAL-split_packages-GF' into CGAL-split_packages-GF 2015-09-23 10:08:41 +02:00
Sébastien Loriot 22beee18a6 Merge remote-tracking branch 'cgal-dev/Triangulation_2-uninitialized_warning-GF' 2015-09-11 08:39:33 +02:00
Andreas Fabri 3cee140708 fix warning about uninitialized hcl and cleaner assertion code 2015-09-10 10:54:37 +02:00
Laurent Rineau 362e4ef7db Merge pull request #322 from afabri/Triangulation_2-faster_fill_hole_Delaunay-GF 
Triangulation_2: speed up fill_hole_delaunay()
 2015-09-10 10:19:40 +02:00
Jane Tournois 3175ad74d4 add missing ref 2015-09-08 16:33:39 +02:00
Andreas Fabri 21b5f653f6 avoid copying lists 2015-09-07 21:14:53 +02:00
Andreas Fabri 4a8e27f0df cleanup of accidentally added #include 2015-09-07 21:14:09 +02:00
Andreas Fabri 13d3e3d91b Fix a benchmark. Calling n times finite_vertices_begin() is an O(n^2) algorithm 2015-09-07 21:13:48 +02:00
Andreas Fabri 847efcd2b4 fix typo 2015-08-28 11:00:56 +02:00
Andreas Fabri 1e2ff1131e assert -> CGAL_assertion 2015-08-27 16:51:55 +02:00
Sébastien Loriot e9df6fa6cf fix typo 2015-08-25 21:54:38 +02:00
Andreas Fabri f592fb7e89 move test files to TDS_2 and TDS_3 2015-08-23 16:12:02 +02:00
Andreas Fabri 91543fd382 move header files to TDS_2 and TDS_3 2015-08-23 15:36:12 +02:00
Andreas Fabri 67d72675fe split packages 2015-08-17 23:46:59 +02:00
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF 
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
 2015-07-17 15:39:18 +02:00
Laurent Rineau bbd6951161 Merge branch 'afabri/Advancing_front_surface_reconstruction-afabri' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp

There was also two "conceptual conflicts" that git-merge did not see,
in:
        Polyhedron/demo/Polyhedron/CMakeLists.txt
        Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp

Polyhedron/demo/Polyhedron/CMakeLists.txt had to use qt5_wrap_ui instead
of qt4_wrap_ui (that lead to a CMake error), and the declaration of the plugin in
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
was not using the Qt5 way (that lead to a compilation error)
 2015-07-08 17:21:36 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Andreas Fabri 2dea6db3bb Merge branch 'CGAL-add_hash-GF-old' into CGAL-add_hash-GF 
Conflicts:
	Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
 2015-07-06 10:51:23 +02:00
Laurent Rineau c21c9dda35 Merge pull request #141 from afabri/Advancing_front_surface_reconstruction-afabri 
Advancing Front Surface Reconstruction, new package

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Advancing_front_surface_reconstruction
 2015-07-03 16:26:28 +02:00
Andreas Fabri 6c81226831 improve wording in the manual 2015-06-22 12:40:44 +02:00
Laurent Rineau 97cd20e8de Merge pull request #126 from afabri/Triangulation_2-fix_plus_2-GF 
Fix a bug in CDT_plus_2
 2015-06-18 17:31:17 +02:00
Sébastien Loriot df47015db9 Merge branch 'old/Advancing_front_surface_reconstruction-afabri' into Advancing_front_surface_reconstruction-afabri 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/cgal_test_with_cmake
 2015-06-18 09:12:12 +02:00
Andreas Fabri c80a9aaa6c Fix a bug in CDT_plus_2 
Fix issue #122
 2015-06-17 18:52:30 +02:00
Laurent Rineau 6fc32e43fe Merge pull request #74 from lrineau/Triangulation_2-fix_projection_traits-GF 
Fix a bug in Triangulation_2_projection_traits.h and its filtered version
 2015-06-10 12:30:29 +02:00
Andreas Fabri 4e9eefd891 Merge branch 'Advancing_front_surface_reconstruction-afabri-old' into Advancing_front_surface_reconstruction-afabri 2015-06-08 15:17:47 +02:00
Jane Tournois 1faf51b7b1 remove useless include 2015-05-19 09:04:27 +02:00
Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF 
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
	Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
 2015-05-19 09:01:20 +02:00
Jane Tournois 4cf8655c00 move all the cdt.dual(v) code from Triangulation_2 to Mesh_2 
we do not change the API of Triangulation_2 for now
maybe later, and this version should be easy to keep backward compatible
 2015-05-19 08:54:33 +02:00
Jane Tournois 7766251c9f rename example 2015-05-19 08:54:32 +02:00
Laurent Rineau 8f9332324a Smaller, faster code 2015-05-18 14:22:38 +02:00
Laurent Rineau e0c1bae205 cleanup 
Remove:
  - unwanted copy constructors and operator= (apply the rule-of-zero)
  - unwanted std::cerr displays
 2015-05-11 17:39:21 +02:00
Laurent Rineau 2e13efa16e Fix Triangulation_2 projection traits with arbitrary plane 2015-05-08 17:49:49 +02:00
Laurent Rineau 8f0bb6dc46 Add a test case that shows Triangulation_2_projection_traits.h is buggy. 2015-05-08 17:49:49 +02:00
Guillaume Damiand 9c78897ba5 Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin 2015-03-16 14:00:43 +01:00
Laurent Rineau 9818e2bdbe Add the src files of figures of TDS_2 2015-01-28 13:19:12 +01:00
Andreas Fabri 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
Andreas Fabri 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
Andreas Fabri 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
Andreas Fabri 9453a6710e rename file 2015-01-07 14:23:40 +01:00
Andreas Fabri 913539c006 mv new code of Constrained_triangulation_plus_2 2015-01-07 14:15:19 +01:00
Andreas Fabri bbdc196034 remove old code of Constrained_triangulation_plus_2 2015-01-07 14:14:48 +01:00
Andreas Fabri 766673bd8c resolve merge conflicts 2014-12-22 17:46:59 +01:00
Andreas Fabri 87db2e1163 add license header, description.txt 2014-12-22 15:00:38 +01:00
Andreas Fabri b85f97593a Add entry in changes.html 2014-12-19 14:43:08 +01:00