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

rename Property maps template parameter 

set primitive caching to false by default
This commit is contained in:
Sébastien Loriot 2012-05-04 14:49:27 +00:00
parent 58156fb1e9
commit ed6ac1f4fd
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AABB_tree/include/CGAL/AABB_segment_primitive.h
View File

@ -33,13 +33,13 @@ namespace CGAL {
template <class GeomTraits, template <class GeomTraits,
class Iterator, class Iterator,
class PropertyMap=boost::typed_identity_property_map<typename GeomTraits::Segment_3>, class SegmentPropertyMap=boost::typed_identity_property_map<typename GeomTraits::Segment_3>,
bool cache_primitive=true> bool cache_primitive=false>
class AABB_segment_primitive : class AABB_segment_primitive :
public internal::Primitive_caching<typename GeomTraits::Segment_3,Iterator,PropertyMap,cache_primitive> public internal::Primitive_caching<typename GeomTraits::Segment_3,Iterator,SegmentPropertyMap,cache_primitive>
{ {
// types // types
typedef internal::Primitive_caching<typename GeomTraits::Segment_3,Iterator,PropertyMap,cache_primitive> Base; typedef internal::Primitive_caching<typename GeomTraits::Segment_3,Iterator,SegmentPropertyMap,cache_primitive> Base;
public: public:
typedef typename GeomTraits::Point_3 Point; // point type typedef typename GeomTraits::Point_3 Point; // point type
typedef typename GeomTraits::Segment_3 Datum; // datum type typedef typename GeomTraits::Segment_3 Datum; // datum type
@ -51,7 +51,7 @@ private:
public: public:
// constructors // constructors
AABB_segment_primitive() {} AABB_segment_primitive() {}
AABB_segment_primitive(Id it,PropertyMap pmap=PropertyMap()) AABB_segment_primitive(Id it,SegmentPropertyMap pmap=SegmentPropertyMap())
: m_it(it) : m_it(it)
{ {
this->set_primitive(it,pmap); this->set_primitive(it,pmap);

14
AABB_tree/include/CGAL/AABB_triangle_primitive.h
View File

@ -33,13 +33,13 @@ namespace CGAL {
template <class GeomTraits, template <class GeomTraits,
class Iterator, class Iterator,
class PropertyMap=boost::typed_identity_property_map<typename GeomTraits::Triangle_3>, class TrianglePropertyMap=boost::typed_identity_property_map<typename GeomTraits::Triangle_3>,
bool cache_primitive=true> bool cache_primitive=false>
class AABB_triangle_primitive : class AABB_triangle_primitive :
public internal::Primitive_caching<typename GeomTraits::Triangle_3,Iterator,PropertyMap,cache_primitive> public internal::Primitive_caching<typename GeomTraits::Triangle_3,Iterator,TrianglePropertyMap,cache_primitive>
{ {
// types // types
typedef internal::Primitive_caching<typename GeomTraits::Triangle_3,Iterator,PropertyMap,cache_primitive> Base; typedef internal::Primitive_caching<typename GeomTraits::Triangle_3,Iterator,TrianglePropertyMap,cache_primitive> Primitive_base;
public: public:
typedef typename GeomTraits::Point_3 Point; // point type typedef typename GeomTraits::Point_3 Point; // point type
typedef typename GeomTraits::Triangle_3 Datum; // datum type typedef typename GeomTraits::Triangle_3 Datum; // datum type
@ -51,15 +51,15 @@ private:
public: public:
// constructors // constructors
AABB_triangle_primitive() {} AABB_triangle_primitive() {}
AABB_triangle_primitive(Id it,PropertyMap pmap=PropertyMap()) AABB_triangle_primitive(Id it,TrianglePropertyMap t_pmap=TrianglePropertyMap())
: m_it(it) : m_it(it)
{ {
this->set_primitive(it,pmap); this->set_primitive(it,t_pmap);
} }
public: public:
Id& id() { return m_it; } Id& id() { return m_it; }
const Id& id() const { return m_it; } const Id& id() const { return m_it; }
typename Base::result_type datum() const { typename Primitive_base::result_type datum() const {
return this->get_primitive(m_it); return this->get_primitive(m_it);
} }

2
AABB_tree/include/CGAL/internal/AABB_tree/Primitive_caching.h
View File

@ -47,7 +47,7 @@ namespace internal{
template <class Primitive,class Id,class PropertyMap> template <class Primitive,class Id,class PropertyMap>
struct Primitive_caching<Primitive,Id,PropertyMap,false> struct Primitive_caching<Primitive,Id,PropertyMap,false>
{ {
typedef Primitive result_type; typedef typename PropertyMap::reference result_type;
PropertyMap pmap_; PropertyMap pmap_;
void set_primitive(Id,PropertyMap pmap){pmap_=pmap;} void set_primitive(Id,PropertyMap pmap){pmap_=pmap;}