diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex index b97579406b0..0f01204a4a9 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex @@ -33,11 +33,11 @@ Provides the operators: where \ccc{Type_1} and \ccc{Type_2} are relevant types among \ccc{Ray_3}, \ccc{Segment_3}, \ccc{Line_3}, \ccc{Triangle_3}, \ccc{Plane_3} and \ccc{Bbox_3}. Relevant herein means that a line primitive (ray, segment, line) is tested against a planar or solid primitive (plane, triangle, box), and a solid primitive is tested against another solid primitive (box against box). The operator returns \ccc{true} iff \ccc{type_1} and \ccc{type_2} have a non empty intersection.} -\ccNestedType{Intersect_3}{A functor object to construct the intersection between two geometric objects. \\ +\ccNestedType{Intersect_3}{A functor to construct the intersection between two geometric objects. \\ Provides the nested type: \\ \ccc{Result}; where \ccc{Result::Type} is the return type of the \ccc{operator()(A, B)} \\ and the operator: \\ -\ccc{Result::Type operator()(const A& a, const B& b);} \\ where \ccc{A} and \ccc{B} are any relevant types among \ccc{Ray_3}, \ccc{Segment_3}, \ccc{Line_3}, \ccc{Triangle_3}, \ccc{Plane_3} and \ccc{Bbox_3}. Relevant herein means that a line primitive (ray, segment, line) is tested against a planar or solid primitive (plane, triangle, box). +\ccc{Result::Type operator()(const A& a, const B& b);} \\ where \ccc{A} and \ccc{B} are any relevant types among \ccc{Ray_3}, \ccc{Segment_3}, \ccc{Line_3}, \ccc{Triangle_3}, \ccc{Plane_3} and \ccc{Bbox_3}. Relevant herein means that a line primitive (ray, segment, line) is tested against a planar or solid primitive (plane, triangle, box). A model of \ccc{Kernel::Intersect_3} fulfills those requirements. } \ccNestedType{Construct_sphere_3}{A functor object to construct the sphere centered at one point and passing through another one. Provides the operator: diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex index aabf7e65882..e55ffbd52c2 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex @@ -40,8 +40,8 @@ The concept \ccRefName\ provides the geometric primitive types and methods for t \ccTypedef{typedef std::pair Object_and_primitive_id;}{} \end{ccDeprecated} -\ccNestedType{Intersection_and_primitive_id}{An unary metafunction to aquire the -return type of intersections with an object of type \ccStyle{Query} through the member typedef \ccStyle{Type}.} +\ccNestedType{Intersection_and_primitive_id}{A nested type to aquire the +a pair of the return type of intersections with an object of type \ccStyle{Query} and a \ccStyle{Primitive::Id} through the member typedef \ccStyle{Type}.} During the construction of the \ccc{AABB_tree}, the primitives are sorted according to some comparison functions related to the $x$, $y$ or $z$ coordinate axis: diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_tree.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_tree.tex index dbe6e6a3e0b..0ea9418120c 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_tree.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_tree.tex @@ -40,8 +40,8 @@ Class \ccRefName\ is a static data structure for efficient intersection and dist \ccTypedef{typedef std::pair Object_and_primitive_id;}{} \end{ccDeprecated} \ccGlue -\ccNestedType{Intersection_and_primitive_id}{An unary metafunction to aquire the -return type of intersections with an object of type \ccStyle{Query} through the member typedef \ccStyle{Type}.} +\ccNestedType{Intersection_and_primitive_id}{A nested type to aquire the +return type of intersections with an object of type \ccStyle{Query} through the member typedef \ccStyle{Type} equal to \ccStyle{std::pair< >}} \ccCreation