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

aabb tree: more code cleanup

This commit is contained in:
Pierre Alliez 2009-06-27 15:19:29 +00:00
parent 27b1291320
commit dfa149a2d7
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AABB_tree/include/CGAL/AABB_intersections.h
View File

@ -13,5 +13,5 @@
#include <CGAL/AABB_intersections/Triangle_3_plane_3_intersection.h> #include <CGAL/AABB_intersections/Triangle_3_plane_3_intersection.h>
#include <CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h> #include <CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h>
#include <CGAL/AABB_intersections/nearest_point_triangle_3.h>
#include <CGAL/AABB_intersections/nearest_point_segment_3.h> #include <CGAL/AABB_intersections/nearest_point_segment_3.h>
#include <CGAL/AABB_intersections/nearest_point_triangle_3.h>

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

@ -72,9 +72,9 @@ public:
* @param traits the traversal traits that define the traversal behaviour * @param traits the traversal traits that define the traversal behaviour
* @param nb_primitives the number of primitive * @param nb_primitives the number of primitive
* *
* General traversal query, the traits class allows to use it for the various * General traversal query. The traits class allows using it for the various
* traversal methods we need: listing, counting, detecting intersections, * traversal methods we need: listing, counting, detecting intersections,
* drawing the boxes... * drawing the boxes.
*/ */
template<class Traversal_traits, class Query> template<class Traversal_traits, class Query>
void traversal(const Query& query, void traversal(const Query& query,
@ -102,7 +102,7 @@ private:
Primitive& right_data() { return *static_cast<Primitive*>(m_p_right_child); } Primitive& right_data() { return *static_cast<Primitive*>(m_p_right_child); }
private: private:
/// bounding box /// node bounding box
Bounding_box m_bbox; Bounding_box m_bbox;
/// children nodes, either pointing towards children (if children are not leaves), /// children nodes, either pointing towards children (if children are not leaves),

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

@ -346,9 +346,8 @@ namespace CGAL {
if(new_closest_point != m_closest_point) if(new_closest_point != m_closest_point)
{ {
m_closest_primitive = primitive.id(); m_closest_primitive = primitive.id();
m_closest_point = new_closest_point; m_closest_point = new_closest_point; // this effectively shrinks the sphere
} }
// m_sphere = AABBTraits().sphere(query, m_closest_point);
} }
bool do_intersect(const Point& query, const Node& node) const bool do_intersect(const Point& query, const Node& node) const