From db918ecafea2d9e724768c1a059d03b2b8bc8cd6 Mon Sep 17 00:00:00 2001 From: Pierre Alliez Date: Tue, 5 May 2009 11:51:48 +0000 Subject: [PATCH] AABB tree: undo folder restructuring --- .gitattributes | 12 ++++----- .../AABB_polyhedron_edge_example.cpp | 2 +- .../AABB_polyhedron_facet_example.cpp | 2 +- .../AABB_tree/AABB_segment_3_example.cpp | 2 +- .../AABB_tree/AABB_triangle_3_example.cpp | 2 +- AABB_tree/include/CGAL/AABB_intersections.h | 26 +++++++++---------- .../Bbox_3_bbox_3_do_intersect.h | 0 .../Bbox_3_line_3_do_intersect.h | 0 .../Bbox_3_plane_3_do_intersect.h | 0 .../Bbox_3_ray_3_do_intersect.h | 0 .../Bbox_3_segment_3_do_intersect.h | 0 .../Bbox_3_sphere_3_do_intersect.h | 0 .../Bbox_3_triangle_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 .../nearest_point_segment_3.h | 0 .../nearest_point_triangle_3.h | 0 .../AABB_polyhedron_edge_primitive.h | 0 .../AABB_polyhedron_triangle_primitive.h | 0 .../{primitives => }/AABB_segment_primitive.h | 0 .../AABB_triangle_primitive.h | 0 23 files changed, 23 insertions(+), 23 deletions(-) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Bbox_3_bbox_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Bbox_3_line_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Bbox_3_plane_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Bbox_3_ray_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Bbox_3_segment_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Bbox_3_sphere_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Bbox_3_triangle_3_do_intersect.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Triangle_3_line_3_intersection.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Triangle_3_plane_3_intersection.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Triangle_3_ray_3_intersection.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/Triangle_3_segment_3_intersection.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/nearest_point_segment_3.h (100%) rename AABB_tree/include/CGAL/{intersections => AABB_intersections}/nearest_point_triangle_3.h (100%) rename AABB_tree/include/CGAL/{primitives => }/AABB_polyhedron_edge_primitive.h (100%) rename AABB_tree/include/CGAL/{primitives => }/AABB_polyhedron_triangle_primitive.h (100%) rename AABB_tree/include/CGAL/{primitives => }/AABB_segment_primitive.h (100%) rename AABB_tree/include/CGAL/{primitives => }/AABB_triangle_primitive.h (100%) diff --git a/.gitattributes b/.gitattributes index 52e10b78a9c..7f781fb6087 100644 --- a/.gitattributes +++ b/.gitattributes @@ -27,14 +27,14 @@ AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp -text AABB_tree/examples/AABB_tree/CMakeLists.txt -text AABB_tree/examples/AABB_tree/cleanup.bat -text AABB_tree/include/CGAL/AABB_intersections.h -text +AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h -text +AABB_tree/include/CGAL/AABB_intersections/nearest_point_segment_3.h -text +AABB_tree/include/CGAL/AABB_polyhedron_edge_primitive.h -text +AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h -text AABB_tree/include/CGAL/AABB_search_tree.h -text +AABB_tree/include/CGAL/AABB_segment_primitive.h -text AABB_tree/include/CGAL/AABB_traits.h -text -AABB_tree/include/CGAL/intersections/Triangle_3_line_3_intersection.h -text -AABB_tree/include/CGAL/intersections/nearest_point_segment_3.h -text -AABB_tree/include/CGAL/primitives/AABB_polyhedron_edge_primitive.h -text -AABB_tree/include/CGAL/primitives/AABB_polyhedron_triangle_primitive.h -text -AABB_tree/include/CGAL/primitives/AABB_segment_primitive.h -text -AABB_tree/include/CGAL/primitives/AABB_triangle_primitive.h -text +AABB_tree/include/CGAL/AABB_triangle_primitive.h -text AABB_tree/test/AABB_tree/CMakeLists.txt -text AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp -text AABB_tree/test/AABB_tree/aabb_projection_edge_test.cpp -text diff --git a/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp b/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp index fbcb58a35a9..5013ad3f23d 100644 --- a/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp +++ b/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include diff --git a/AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_example.cpp b/AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_example.cpp index 00a4fb663bf..661edb2a960 100644 --- a/AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_example.cpp +++ b/AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_example.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include diff --git a/AABB_tree/examples/AABB_tree/AABB_segment_3_example.cpp b/AABB_tree/examples/AABB_tree/AABB_segment_3_example.cpp index 18d0ee2e2fe..54b46504bd2 100644 --- a/AABB_tree/examples/AABB_tree/AABB_segment_3_example.cpp +++ b/AABB_tree/examples/AABB_tree/AABB_segment_3_example.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include 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 79cbf94ec86..186e184ee01 100644 --- a/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp +++ b/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/AABB_tree/include/CGAL/AABB_intersections.h b/AABB_tree/include/CGAL/AABB_intersections.h index 5588d29a461..3eeb0200f0c 100644 --- a/AABB_tree/include/CGAL/AABB_intersections.h +++ b/AABB_tree/include/CGAL/AABB_intersections.h @@ -2,18 +2,18 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_bbox_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_bbox_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Bbox_3_bbox_3_do_intersect.h rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_bbox_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_line_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_line_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Bbox_3_line_3_do_intersect.h rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_line_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_plane_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_plane_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Bbox_3_plane_3_do_intersect.h rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_plane_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_ray_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_ray_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Bbox_3_ray_3_do_intersect.h rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_ray_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_segment_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_segment_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Bbox_3_segment_3_do_intersect.h rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_segment_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_sphere_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_sphere_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Bbox_3_sphere_3_do_intersect.h rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_sphere_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_triangle_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_triangle_3_do_intersect.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Bbox_3_triangle_3_do_intersect.h rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_triangle_3_do_intersect.h diff --git a/AABB_tree/include/CGAL/intersections/Triangle_3_line_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Triangle_3_line_3_intersection.h rename to AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h diff --git a/AABB_tree/include/CGAL/intersections/Triangle_3_plane_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_plane_3_intersection.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Triangle_3_plane_3_intersection.h rename to AABB_tree/include/CGAL/AABB_intersections/Triangle_3_plane_3_intersection.h diff --git a/AABB_tree/include/CGAL/intersections/Triangle_3_ray_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_ray_3_intersection.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Triangle_3_ray_3_intersection.h rename to AABB_tree/include/CGAL/AABB_intersections/Triangle_3_ray_3_intersection.h diff --git a/AABB_tree/include/CGAL/intersections/Triangle_3_segment_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/Triangle_3_segment_3_intersection.h rename to AABB_tree/include/CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h diff --git a/AABB_tree/include/CGAL/intersections/nearest_point_segment_3.h b/AABB_tree/include/CGAL/AABB_intersections/nearest_point_segment_3.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/nearest_point_segment_3.h rename to AABB_tree/include/CGAL/AABB_intersections/nearest_point_segment_3.h diff --git a/AABB_tree/include/CGAL/intersections/nearest_point_triangle_3.h b/AABB_tree/include/CGAL/AABB_intersections/nearest_point_triangle_3.h similarity index 100% rename from AABB_tree/include/CGAL/intersections/nearest_point_triangle_3.h rename to AABB_tree/include/CGAL/AABB_intersections/nearest_point_triangle_3.h diff --git a/AABB_tree/include/CGAL/primitives/AABB_polyhedron_edge_primitive.h b/AABB_tree/include/CGAL/AABB_polyhedron_edge_primitive.h similarity index 100% rename from AABB_tree/include/CGAL/primitives/AABB_polyhedron_edge_primitive.h rename to AABB_tree/include/CGAL/AABB_polyhedron_edge_primitive.h diff --git a/AABB_tree/include/CGAL/primitives/AABB_polyhedron_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h similarity index 100% rename from AABB_tree/include/CGAL/primitives/AABB_polyhedron_triangle_primitive.h rename to AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h diff --git a/AABB_tree/include/CGAL/primitives/AABB_segment_primitive.h b/AABB_tree/include/CGAL/AABB_segment_primitive.h similarity index 100% rename from AABB_tree/include/CGAL/primitives/AABB_segment_primitive.h rename to AABB_tree/include/CGAL/AABB_segment_primitive.h diff --git a/AABB_tree/include/CGAL/primitives/AABB_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_triangle_primitive.h similarity index 100% rename from AABB_tree/include/CGAL/primitives/AABB_triangle_primitive.h rename to AABB_tree/include/CGAL/AABB_triangle_primitive.h