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

use the variant API instead of the Object one

This commit is contained in:
Sébastien Loriot 2016-04-25 17:15:31 +02:00
parent a832d23339
commit a0b97b23fb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/AABB_traversal_traits.h
View File

@ -1,4 +1,3 @@
#ifndef CGAL_INTERNAL_SURFACE_MESH_SEGMENTATION_AABB_TRAVERSAL_TRAITS_H
// Copyright (c) 2014 GeometryFactory Sarl (France). // Copyright (c) 2014 GeometryFactory Sarl (France).
// All rights reserved. // All rights reserved.
// //
@ -14,6 +13,7 @@
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#ifndef CGAL_INTERNAL_SURFACE_MESH_SEGMENTATION_AABB_TRAVERSAL_TRAITS_H
#define CGAL_INTERNAL_SURFACE_MESH_SEGMENTATION_AABB_TRAVERSAL_TRAITS_H #define CGAL_INTERNAL_SURFACE_MESH_SEGMENTATION_AABB_TRAVERSAL_TRAITS_H
namespace CGAL namespace CGAL
@ -35,7 +35,6 @@ class Listing_intersection_traits_ray_or_segment_triangle
typedef typename AABBTraits::Bounding_box Bounding_box; typedef typename AABBTraits::Bounding_box Bounding_box;
typedef typename AABBTraits::Primitive::Id Primitive_id; typedef typename AABBTraits::Primitive::Id Primitive_id;
typedef typename AABBTraits::Point_and_primitive_id Point_and_primitive_id; typedef typename AABBTraits::Point_and_primitive_id Point_and_primitive_id;
typedef typename AABBTraits::Object_and_primitive_id Object_and_primitive_id;
typedef ::CGAL::AABB_node<AABBTraits> Node; typedef ::CGAL::AABB_node<AABBTraits> Node;
typedef typename ::CGAL::AABB_tree<AABBTraits>::size_type size_type; typedef typename ::CGAL::AABB_tree<AABBTraits>::size_type size_type;
@ -51,10 +50,12 @@ public:
void intersection(const Query& query, const Primitive& primitive) { void intersection(const Query& query, const Primitive& primitive) {
//SL: using Kernel_traits is not bad in this context cause we expect a Ray/Segment from a CGAL Kernel here //SL: using Kernel_traits is not bad in this context cause we expect a Ray/Segment from a CGAL Kernel here
typedef typename Kernel_traits<Query>::Kernel GeomTraits; typedef typename Kernel_traits<Query>::Kernel GeomTraits;
typedef typename AABBTraits:: template Intersection_and_primitive_id<Query>::Type Intersection_and_primitive_id;
if ( GeomTraits().do_intersect_3_object()(query, if ( GeomTraits().do_intersect_3_object()(query,
primitive.datum(m_traits.shared_data())) ) { primitive.datum(m_traits.shared_data())) ) {
boost::optional<Object_and_primitive_id> intersection; boost::optional<Intersection_and_primitive_id> intersection
intersection = m_traits.intersection_object()(query, primitive); = m_traits.intersection_object()(query, primitive);
if(intersection) { if(intersection) {
*m_out_it++ = *intersection; *m_out_it++ = *intersection;
} }