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

distance queries conform to the spec

This commit is contained in:
Camille Wormser 2009-05-09 10:22:45 +00:00
parent 33fd59e039
commit 5dc7c35be3
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
AABB_tree/include/CGAL/AABB_traits.h
View File

@ -39,13 +39,14 @@ template<typename GeomTraits, typename AABB_primitive>
class AABB_traits
{
public:
typedef AABB_traits<GeomTraits, AABB_primitive> AT;
/// AABBTraits concept types
typedef typename CGAL::Bbox_3 Bounding_box;
typedef typename CGAL::Object Object;
typedef AABB_primitive Primitive;
typedef typename AABB_primitive::Datum Datum;
typedef typename GeomTraits::Sphere_3 Sphere;
// typedef typename GeomTraits::Sphere_3 Sphere;
typedef unsigned int Size_type;
// TOFIX: Workaround for weighted_point
@ -129,21 +130,53 @@ public:
boost::optional<Object_and_primitive_id> intersection(const Query& q,
const Primitive& pr) const;
Sphere sphere(const Point& center,
/* Sphere sphere(const Point& center,
const Point& hint) const
{
return GeomTraits().construct_sphere_3_object()
(center, GeomTraits().compute_squared_distance_3_object()(center, hint));
}
}*/
/*
template <typename Query>
Point closest_point(const Query& q,
const Primitive& pr,
const Point& bound) const
{
return CGAL::nearest_point_3(q, pr.datum(), bound);
}
} */
// This should go down to the GeomTraits, i.e. the kernel
class Closest_point_3 {
typedef typename AT::Point Point;
typedef typename AT::Primitive Primitive;
public:
Point operator()(const Point& p, const Primitive& pr, const Point& bound) const
{
return CGAL::nearest_point_3(p, pr.datum(), bound);
}
};
// This should go down to the GeomTraits, i.e. the kernel
// and the internal implementation should change its name from
// do_intersect to something like does_contain (this is what we compute,
// this is not the same do_intersect as the spherical kernel)
class Compare_distance_3 {
typedef typename AT::Point Point;
typedef typename AT::Primitive Primitive;
public:
template <class Solid>
bool operator()(const Point& p, const Solid& pr, const Point& bound) const
{
return GeomTraits().do_intersect_3_object()
(GeomTraits().construct_sphere_3_object()
(p, GeomTraits().compute_squared_distance_3_object()(p, bound)), pr);
}
};
Closest_point_3 closest_point_3_object() {return Closest_point_3();}
Compare_distance_3 compare_distance_3_object() {return Compare_distance_3();}
private:
/**
* @brief Computes bounding box of one primitive

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

@ -154,7 +154,7 @@ namespace CGAL {
private:
typedef AABB_node<AABBTraits> Node;
typedef typename AABBTraits::Sphere Sphere;
// typedef typename AABBTraits::Sphere Sphere;
//-------------------------------------------------------
// Traits classes for traversal computation
@ -338,29 +338,27 @@ namespace CGAL {
const Point& hint,
const typename Primitive::Id& hint_primitive)
: m_closest_point(hint),
m_closest_primitive(hint_primitive),
m_sphere(AABBTraits().sphere(query,hint))
m_closest_primitive(hint_primitive)
{}
bool go_further() const { return true; }
void intersection(const Point& query, const Primitive& primitive)
{
// TOFIX
// update m_closest_primitive if needed
Point new_closest_point =
AABBTraits().closest_point(query, primitive, m_closest_point);
Point new_closest_point = AABBTraits().closest_point_3_object()
(query, primitive, m_closest_point);
if(new_closest_point != m_closest_point)
{
m_closest_primitive = primitive.id();
m_closest_point = new_closest_point;
}
m_sphere = AABBTraits().sphere(query, m_closest_point);
// m_sphere = AABBTraits().sphere(query, m_closest_point);
}
bool do_intersect(const Point& query, const Node& node) const
{
return AABBTraits().do_intersect(m_sphere, node.bbox());
return AABBTraits().compare_distance_3_object()
(query, node.bbox(), m_closest_point);
}
Point closest_point() const { return m_closest_point; }
@ -370,7 +368,7 @@ namespace CGAL {
}
private:
Sphere m_sphere;
// Sphere m_sphere;
Point m_closest_point;
typename Primitive::Id m_closest_primitive;
};