From aeb48895518c8f5e9448c2a1fc3ae1cb33189de1 Mon Sep 17 00:00:00 2001 From: Pierre Alliez Date: Fri, 24 Apr 2009 13:35:41 +0000 Subject: [PATCH] AABB tree: move files up --- .gitattributes | 8 +-- .../AABB_tree/AABB_triangle_3_example.cpp | 49 ++++++++++--------- AABB_tree/examples/AABB_tree/CMakeLists.txt | 1 + .../CGAL/{AABB_tree => }/AABB_intersections.h | 0 .../include/CGAL/{AABB_tree => }/AABB_node.h | 0 .../{AABB_tree => }/AABB_polyhedral_oracle.h | 0 .../AABB_polyhedron_triangle_primitive.h | 0 .../CGAL/{AABB_tree => }/AABB_traits.h | 0 .../include/CGAL/{AABB_tree => }/AABB_tree.h | 0 .../Bbox_3_Bbox_3_do_intersect.h | 0 .../CGAL/{AABB_tree => }/Drawing_traits.h | 0 .../Line_3_Bbox_3_do_intersect.h | 0 .../Plane_3_Bbox_3_do_intersect.h | 0 .../Ray_3_Bbox_3_do_intersect.h | 0 .../Segment_3_Bbox_3_do_intersect.h | 0 .../Sphere_3_Bbox_do_intersect.h | 0 .../Triangle_3_Bbox_3_do_intersect.h | 0 .../Triangle_3_line_3_intersection.h | 0 .../Triangle_3_plane_3_intersection.h | 0 .../Triangle_3_ray_3_intersection.h | 0 .../Triangle_3_segment_3_intersection.h | 0 21 files changed, 30 insertions(+), 28 deletions(-) rename AABB_tree/include/CGAL/{AABB_tree => }/AABB_intersections.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/AABB_node.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/AABB_polyhedral_oracle.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/AABB_polyhedron_triangle_primitive.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/AABB_traits.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/AABB_tree.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Bbox_3_Bbox_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Drawing_traits.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Line_3_Bbox_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Plane_3_Bbox_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Ray_3_Bbox_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Segment_3_Bbox_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Sphere_3_Bbox_do_intersect.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Triangle_3_Bbox_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Triangle_3_line_3_intersection.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Triangle_3_plane_3_intersection.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Triangle_3_ray_3_intersection.h (100%) rename AABB_tree/include/CGAL/{AABB_tree => }/Triangle_3_segment_3_intersection.h (100%) diff --git a/.gitattributes b/.gitattributes index 314cbbc8399..f194392bdda 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,10 +17,10 @@ AABB_tree/dont_submit -text AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_example.cpp -text AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp -text AABB_tree/examples/AABB_tree/CMakeLists.txt -text -AABB_tree/include/CGAL/AABB_tree/AABB_intersections.h -text -AABB_tree/include/CGAL/AABB_tree/AABB_polyhedron_triangle_primitive.h -text -AABB_tree/include/CGAL/AABB_tree/AABB_traits.h -text -AABB_tree/include/CGAL/AABB_tree/Triangle_3_line_3_intersection.h -text +AABB_tree/include/CGAL/AABB_intersections.h -text +AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h -text +AABB_tree/include/CGAL/AABB_traits.h -text +AABB_tree/include/CGAL/Triangle_3_line_3_intersection.h -text AABB_tree/test/AABB_tree/CMakeLists.txt -text AABB_tree/test/AABB_tree/aabb_intersection_test.cpp -text AABB_tree/test/AABB_tree/aabb_projection_test.cpp -text diff --git a/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp b/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp index 562dfed0021..482f194ab20 100644 --- a/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp +++ b/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp @@ -1,29 +1,29 @@ -// Copyright (c) 2009 INRIA Sophia-Antipolis (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org); you may redistribute it under -// the terms of the Q Public License version 1.0. -// See the file LICENSE.QPL distributed with CGAL. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL: $ -// $Id: $ -// -// -// Author(s) : Camille Wormser, Pierre Alliez -// -//****************************************************************************** -// File Description : -// -//****************************************************************************** +// Copyright (c) 2009 INRIA Sophia-Antipolis (France). +// All rights reserved. +// +// This file is part of CGAL (www.cgal.org); you may redistribute it under +// the terms of the Q Public License version 1.0. +// See the file LICENSE.QPL distributed with CGAL. +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL: $ +// $Id: $ +// +// +// Author(s) : Camille Wormser, Pierre Alliez +// +//****************************************************************************** +// File Description : +// +//****************************************************************************** #include -#include +#include #include #include #include @@ -69,6 +69,7 @@ int main(void) Point b(0.0, 1.0, 0.0); Point c(0.0, 0.0, 1.0); Point d(0.0, 0.0, 0.0); + std::list triangles; triangles.push_back(Triangle(a,b,c)); triangles.push_back(Triangle(a,b,d)); diff --git a/AABB_tree/examples/AABB_tree/CMakeLists.txt b/AABB_tree/examples/AABB_tree/CMakeLists.txt index 8a3fbe6efb1..9ef3237099e 100644 --- a/AABB_tree/examples/AABB_tree/CMakeLists.txt +++ b/AABB_tree/examples/AABB_tree/CMakeLists.txt @@ -25,6 +25,7 @@ if ( CGAL_FOUND ) include( CGAL_CreateSingleSourceCGALProgram ) create_single_source_cgal_program("AABB_polyhedron_facet_example.cpp") + create_single_source_cgal_program("AABB_triangle_3_example.cpp") else() diff --git a/AABB_tree/include/CGAL/AABB_tree/AABB_intersections.h b/AABB_tree/include/CGAL/AABB_intersections.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/AABB_intersections.h rename to AABB_tree/include/CGAL/AABB_intersections.h diff --git a/AABB_tree/include/CGAL/AABB_tree/AABB_node.h b/AABB_tree/include/CGAL/AABB_node.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/AABB_node.h rename to AABB_tree/include/CGAL/AABB_node.h diff --git a/AABB_tree/include/CGAL/AABB_tree/AABB_polyhedral_oracle.h b/AABB_tree/include/CGAL/AABB_polyhedral_oracle.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/AABB_polyhedral_oracle.h rename to AABB_tree/include/CGAL/AABB_polyhedral_oracle.h diff --git a/AABB_tree/include/CGAL/AABB_tree/AABB_polyhedron_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/AABB_polyhedron_triangle_primitive.h rename to AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h diff --git a/AABB_tree/include/CGAL/AABB_tree/AABB_traits.h b/AABB_tree/include/CGAL/AABB_traits.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/AABB_traits.h rename to AABB_tree/include/CGAL/AABB_traits.h diff --git a/AABB_tree/include/CGAL/AABB_tree/AABB_tree.h b/AABB_tree/include/CGAL/AABB_tree.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/AABB_tree.h rename to AABB_tree/include/CGAL/AABB_tree.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Bbox_3_Bbox_3_do_intersect.h b/AABB_tree/include/CGAL/Bbox_3_Bbox_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Bbox_3_Bbox_3_do_intersect.h rename to AABB_tree/include/CGAL/Bbox_3_Bbox_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Drawing_traits.h b/AABB_tree/include/CGAL/Drawing_traits.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Drawing_traits.h rename to AABB_tree/include/CGAL/Drawing_traits.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Line_3_Bbox_3_do_intersect.h b/AABB_tree/include/CGAL/Line_3_Bbox_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Line_3_Bbox_3_do_intersect.h rename to AABB_tree/include/CGAL/Line_3_Bbox_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Plane_3_Bbox_3_do_intersect.h b/AABB_tree/include/CGAL/Plane_3_Bbox_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Plane_3_Bbox_3_do_intersect.h rename to AABB_tree/include/CGAL/Plane_3_Bbox_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Ray_3_Bbox_3_do_intersect.h b/AABB_tree/include/CGAL/Ray_3_Bbox_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Ray_3_Bbox_3_do_intersect.h rename to AABB_tree/include/CGAL/Ray_3_Bbox_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Segment_3_Bbox_3_do_intersect.h b/AABB_tree/include/CGAL/Segment_3_Bbox_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Segment_3_Bbox_3_do_intersect.h rename to AABB_tree/include/CGAL/Segment_3_Bbox_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Sphere_3_Bbox_do_intersect.h b/AABB_tree/include/CGAL/Sphere_3_Bbox_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Sphere_3_Bbox_do_intersect.h rename to AABB_tree/include/CGAL/Sphere_3_Bbox_do_intersect.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Triangle_3_Bbox_3_do_intersect.h b/AABB_tree/include/CGAL/Triangle_3_Bbox_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Triangle_3_Bbox_3_do_intersect.h rename to AABB_tree/include/CGAL/Triangle_3_Bbox_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Triangle_3_line_3_intersection.h b/AABB_tree/include/CGAL/Triangle_3_line_3_intersection.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Triangle_3_line_3_intersection.h rename to AABB_tree/include/CGAL/Triangle_3_line_3_intersection.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Triangle_3_plane_3_intersection.h b/AABB_tree/include/CGAL/Triangle_3_plane_3_intersection.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Triangle_3_plane_3_intersection.h rename to AABB_tree/include/CGAL/Triangle_3_plane_3_intersection.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Triangle_3_ray_3_intersection.h b/AABB_tree/include/CGAL/Triangle_3_ray_3_intersection.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Triangle_3_ray_3_intersection.h rename to AABB_tree/include/CGAL/Triangle_3_ray_3_intersection.h diff --git a/AABB_tree/include/CGAL/AABB_tree/Triangle_3_segment_3_intersection.h b/AABB_tree/include/CGAL/Triangle_3_segment_3_intersection.h similarity index 100% rename from AABB_tree/include/CGAL/AABB_tree/Triangle_3_segment_3_intersection.h rename to AABB_tree/include/CGAL/Triangle_3_segment_3_intersection.h