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

use the AABB_tree internal to Side_of_triangle_mesh 

this avoids incompatibility issues,
and simplifies the code in Polyhedral_mesh_domain_3
This commit is contained in:
Jane Tournois 2017-06-26 09:40:44 +02:00
parent 862300b609
commit 77896f38fe
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
View File

@ -36,9 +36,7 @@
#include <CGAL/Surface_mesh.h>
#include <CGAL/Side_of_triangle_mesh.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <sstream>
#include <CGAL/Default.h>
@ -267,10 +265,10 @@ public:
typedef IGT R;
public:
typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> AABB_primitive;
typedef class AABB_traits<IGT,AABB_primitive> AABB_traits;
typedef class AABB_tree<AABB_traits> AABB_tree_;
typedef typename Side_of_triangle_mesh<Polyhedron, IGT> Inside_functor;
typedef typename Inside_functor::AABB_tree AABB_tree_;
typedef typename AABB_tree_::AABB_traits AABB_traits;
typedef typename AABB_tree_::Primitive AABB_primitive;
typedef typename AABB_tree_::Primitive_id AABB_primitive_id;
typedef typename AABB_tree_::Primitive Primitive;
typedef typename AABB_traits::Bounding_box Bounding_box;
@ -842,8 +840,7 @@ Is_in_domain::operator()(const Point_3& p) const
{
if(r_domain_.bounding_tree_ == 0) return Subdomain();
CGAL::Side_of_triangle_mesh<Polyhedron, IGT>
inside_functor(*(r_domain_.bounding_tree_));
Inside_functor inside_functor(*(r_domain_.bounding_tree_));
Bounded_side side = inside_functor(p);
if(side == CGAL::ON_UNBOUNDED_SIDE) { return Subdomain(); }