650f9b4295
Merge branch 'AABB_tree-one_primitive_per_object-sloriot-old' into AABB_tree-one_primitive_per_object-sloriot
...
Conflicts:
.gitattributes
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/dont_submit
AABB_tree/include/CGAL/AABB_traits.h
AABB_tree/include/CGAL/AABB_tree.h
AABB_tree/include/CGAL/internal/AABB_tree/AABB_traversal_traits.h
AABB_tree/test/AABB_tree/AABB_test_util.h
AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp
AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
AABB_tree/test/AABB_tree/aabb_distance_triangle_hint_test.cpp
AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp
Boolean_set_operations_2/examples/Boolean_set_operations_2/bezier_traits_adapter2.cpp
Installation/cmake/modules/CGAL_Common.cmake
Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
Installation/cmake/modules/CGAL_Macros.cmake
Installation/cmake/modules/CGAL_SetupBoost.cmake
Installation/cmake/modules/CGAL_SetupDependencies.cmake
Installation/cmake/modules/CGAL_SetupGMP.cmake
Installation/cmake/modules/CGAL_SetupGMPXX.cmake
Installation/cmake/modules/CGAL_SetupLEDA.cmake
Installation/cmake/modules/CGAL_SetupMPFI.cmake
Installation/cmake/modules/CGAL_SetupNTL.cmake
Installation/cmake/modules/CGAL_SetupRS.cmake
Installation/cmake/modules/CGAL_UseMPFI.cmake
Installation/cmake/modules/CGAL_UseNTL.cmake
Installation/cmake/modules/CGAL_UseRS.cmake
Installation/cmake/modules/CGAL_VersionUtils.cmake
Interval_skip_list/examples/Interval_skip_list/isl_terrain.pts
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_triangulation.cpp
Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm
Point_set_processing_3/include/CGAL/property_map.h
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_cuboids_3.h
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_3.h
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_tetrahedra_3.h
Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_segments_3.cpp
Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp
Scripts/developer_scripts/list_package_files.rb
Scripts/developer_scripts/mirror_all_packages.rb
Scripts/developer_scripts/mirror_package.rb
Scripts/developer_scripts/mirror_package_files.rb
Scripts/developer_scripts/remove_package_files_from_build_tree.rb
Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex
Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex
2013-06-18 11:50:30 +02:00
d198458ca7
Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller
...
Conflicts:
.gitattributes
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
AABB_tree/include/CGAL/AABB_traits.h
AABB_tree/include/CGAL/AABB_tree.h
AABB_tree/test/AABB_tree/AABB_test_util.h
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2/arr_queries.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/Arr_trapezoid_ric_point_location.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/intro.tex
Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
Filtered_kernel/include/CGAL/Lazy.h
Filtered_kernel/include/CGAL/Lazy_kernel.h
Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h
Intersections_2/test/Intersections_2/test_intersections_2.cpp
Intersections_3/test/Intersections_3/test_intersections_3.cpp
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_23/include/CGAL/Kernel/Type_mapper.h
Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
2012-12-04 17:57:53 +01:00
3ffb31cc44
Convert all CRLF files to LF
2012-12-04 15:55:58 +01:00
1adf441b18
Convert all CRLF files to LF
2012-12-03 18:44:24 +01:00
80140d1bba
move function
2012-08-28 13:12:59 +00:00
8f22de68ce
concept bugfix
...
* CODE+DOC: Bbox_3 is a nested type in CGAL's Kernel; the code uses Bbox_3
* DOC: Add Compute_squared_distance_3 in AABBGeomTraits as it is needed by AABBTraits
* DOC: remove Splitting_direction from AABBTraits as it is not used
* DOC: Squared_distance in AABBTraits is only used between two points
(I guess the confusion from the fact that nearest_point use the other
version but without using the AABBTraits model).
* CODE+DOC add the function to construct Squared_distance functor in AABBTraits + AABB_traits
and use it instead of AABBTraits::Compute_squared_distance_3 which was not in the concept
* DOC: remove from AABB_traits types Ray_3, Line_3 and Segment_3 that are not required by AABBTraits
* CODE: The code was using AABBTraits::Point which is not in the concept. Use Point_3 instead
* CODE: reorder typedefs in AABB_traits to match concept order
2012-08-28 12:21:57 +00:00
a3cde4717f
typos
2012-06-05 09:03:41 +00:00
0bf796b59a
update TODO+typo
2012-06-04 14:43:46 +00:00
21283eab97
remove requirements of having get_reference_point and get_datum in the traits
2012-06-04 14:14:11 +00:00
567e637484
document previous changes
...
add new concept for primitive with shared data
rename Extra_data -> Shared_data
2012-06-01 15:24:17 +00:00
008d297172
typos
2012-05-09 12:28:05 +00:00
b516d75bd5
* AABB tree documentation doesn't talk about metafunctions anymore
2011-11-16 17:46:28 +00:00
376b6309f4
Adapted AABB_tree to the new concept and documented the API changes
2011-11-15 17:13:09 +00:00
08978d7a11
formatting
2009-07-16 11:45:51 +00:00
0d7cc0b6b5
Fix: AABBTraits must not require size_type. The size_type is an
...
implementation detail of the class template AABB_tree, and traits classes
cannot know that type.
2009-07-08 16:16:15 +00:00
1d6e776431
AABB tree: some more cleanup.
2009-07-01 20:49:03 +00:00
597f9459d5
aabb tree: some cleanup
2009-06-25 20:08:51 +00:00
f6de9a1ec4
Caps in titles,
...
AXIS_X -> X_AXIS
Split_... returns void
2009-05-14 07:51:11 +00:00
51de43bfca
capitalize words in headings
2009-05-14 07:39:17 +00:00
075911ec75
Laurent's remark: add the bounding box stuffs
2009-05-13 22:35:39 +00:00
df0e2ec0bc
size_type must be lowercase.
2009-05-12 14:29:36 +00:00
c733708add
while finishing to conform the code to the documentation,
...
I realized it made sense to let the traits do the sorting.
2009-05-11 23:17:01 +00:00
7184e5d681
les deux remarques d'Andreas
2009-05-11 20:16:00 +00:00
9087e9b14b
updated documentation with functors in the AABBTraits concept.
...
Should we keep the const& in the description of the functors ?
I kept them in AABBTraits, but we do not have them in AABBGeomTraits...
What should be the policy?
Note that the functors do not have the "_3" in AABBTraits,
but have it in AABBGeomTraits. This is on purpose.
2009-05-11 11:54:50 +00:00
55dc498d00
AABB tree: one global pass on the narrative.
2009-05-09 21:52:02 +00:00
811f08256b
added missing types to the AABBTraits concept.
...
(I have added the missing methods for the distance queries too)
2009-05-08 11:28:10 +00:00
1f4c9a150e
cleaning of the traits. Not finished yet.
...
I've removed all references to the Sphere (it was used only internally anyway),
because we will not use it anymore: we replace its use by direct calls to is_closer.
2009-05-08 11:20:14 +00:00
c26e8531e1
AABB tree: intersections now return CGAL::Objects.
2009-05-07 21:03:21 +00:00
bf4043be63
replaced Point_and_primitive by Point_and_primitive_id and Object_and_primitive_id
2009-05-07 13:18:02 +00:00
4b720e0c06
documentation compilation issues
2009-05-07 11:30:29 +00:00
fd017c5595
AABB tree: first version of boost::optional for any*
...
obscure compilation issue for now.
more on doc too
2009-05-07 06:44:59 +00:00
b40571b407
most of Andreas requested changes.
...
See the wiki for details.tex
I did not address Laurent's changes, except for the rebuild thing.
2009-05-04 20:46:10 +00:00
6f050ab6ca
tentative API for dealing correctly with the degenerate cases:
...
it changes NOTHING to the existing code, except that
number_of_intersections is renamed into number_of_intersected_primitives.
2009-05-02 18:02:11 +00:00
b4cff1bb34
AABB tree: more on ref manual
2009-05-02 09:27:05 +00:00
23f94c802b
AABB tree: started to implement new API
...
CAREFUL: does not compile anymore - will fix this next week.
2009-04-30 22:26:53 +00:00
159e2428db
AABB tree: prepare material for illustrations
2009-04-30 15:38:12 +00:00
6c4f25b95b
AABB: rename to less_x/y/z
2009-04-27 18:13:06 +00:00
3e25916b51
AABB tree: added two examples and alter doc where the data type is now the Object type.
2009-04-24 11:29:00 +00:00
f01b6e147f
AABB tree: important pass on the documentation from A.Fabri's review and several discussions with S.Tayeb, L.Rineau and C.Wormser.
...
remove all _type suffixes to types
distinguish datum from data
A primitive wraps a "geometric object" and an Id - not a primitive and an ide (confusing)
added any_intersected_primitive() to be consistant
2009-04-24 09:42:43 +00:00
9f43b3a035
AABB tree: more on documentation.
2009-04-22 08:22:00 +00:00
37b3262e71
AABB tree: added doc
2009-04-16 11:22:16 +00:00
Sébastien Loriot
Philipp Möller
Sébastien Loriot
Philipp Möller
Camille Wormser
Laurent Rineau
Pierre Alliez
Andreas Fabri