songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch

This commit is contained in:
Laurent Rineau 2019-02-18 16:54:29 +01:00
parent 50d501309c 3b6715cef5
commit ea279fb38c
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AABB_tree/include/CGAL/AABB_tree.h
View File

@ -407,6 +407,12 @@ public:
/// that returns `true` in order to skip the primitive. /// that returns `true` in order to skip the primitive.
/// Defaults to a functor that always returns `false`. /// Defaults to a functor that always returns `false`.
/// ///
/// \note `skip` might be given some primitives that are not intersected by `query`
/// because the intersection test is done after the skip test. Also note that
/// the order the primitives are given to `skip` is not necessarily the
/// intersection order with `query`.
///
///
/// `AABBTraits` must be a model of `AABBRayIntersectionTraits` to /// `AABBTraits` must be a model of `AABBRayIntersectionTraits` to
/// call this member function. /// call this member function.
template<typename Ray, typename SkipFunctor> template<typename Ray, typename SkipFunctor>

16
Scripts/developer_scripts/create_demos_zip_files.sh
View File

@ -1,16 +0,0 @@
pushd AABB_tree_Demo; zip ../AABB_demo.zip * ; popd
pushd Alpha_shapes_3_Demo; zip ../alpha_shape_3.zip * ; popd
pushd Bounding_volumes_Demo; zip ../bounding_volumes_2.zip * ; popd
pushd Circular_kernel_2_Demo; zip ../circular_kernel.zip * ; popd
pushd Mesh_3_Demo; zip ../mesh_3.zip * ; popd
pushd Periodic_3_triangulation_3_Demo; zip ../periodic_3_triangulation_3.zip *; popd
pushd Periodic_Lloyd_3_Demo; zip ../periodic_3_triangulation_3.zip *; popd
pushd Polygon_Demo; zip ../polygon.zip * ; popd
pushd Polyhedron_Demo; zip ../polyhedron_3.zip * ; popd
pushd Segment_Delaunay_graph_2_Demo; zip ../segment_voronoi_diagram_2.zip *; popd
pushd Surface_mesher_Demo; zip ../surface_mesher.zip *; popd
pushd Triangulation_2_Demo;
zip ../regular_triangulation_2.zip Regular_triangulation_2.exe
zip ../constrained_delaunay_triangulation_2.zip Constrained_Delaunay_triangulation_2.exe
zip ../delaunay_triangulation_2.zip Delaunay_triangulation_2.exe
popd