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

Merge pull request #6424 from GilesBathgate/Nef_3-cleanup_snc_intersection-GilesBathgate 

Nef_3: Cleanup and performance improvements SNC_intersection
This commit is contained in:
Sébastien Loriot 2022-03-29 17:46:56 +02:00
parent 5e894656f5 913c6155ec
commit 2067913940
7 changed files with 107 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator.h
View File

@ -81,7 +81,6 @@ class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
} }
Point_3 ip; Point_3 ip;
SNC_intersection I;
SNC_constructor C(*sncp); SNC_constructor C(*sncp);
Halfedge_handle e; Halfedge_handle e;
@ -89,7 +88,7 @@ class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
CGAL_NEF_TRACEN( "Found edge " << e->source()->point() CGAL_NEF_TRACEN( "Found edge " << e->source()->point()
<< "->" << e->twin()->source()->point() ); << "->" << e->twin()->source()->point() );
Segment_3 seg(e->source()->point(), e->twin()->source()->point()); Segment_3 seg(e->source()->point(), e->twin()->source()->point());
I.does_intersect_internally(r, seg, ip); SNC_intersection::does_intersect_internally(r, seg, ip);
ip = normalized(ip); ip = normalized(ip);
v = C.create_from_edge(e,ip); v = C.create_from_edge(e,ip);
pl->add_vertex(v); pl->add_vertex(v);
@ -135,7 +134,7 @@ class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
Halffacet_handle f; Halffacet_handle f;
if(assign(f, o)) { if(assign(f, o)) {
CGAL_NEF_TRACEN( "Found facet " ); CGAL_NEF_TRACEN( "Found facet " );
I.does_intersect_internally(r, f, ip); SNC_intersection::does_intersect_internally(r, f, ip);
ip = normalized(ip); ip = normalized(ip);
v = C.create_from_facet(f,ip); v = C.create_from_facet(f,ip);
pl->add_vertex(v); pl->add_vertex(v);

5
Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Ray_hit_generator2.h
View File

@ -87,7 +87,6 @@ class Ray_hit_generator2 : public Modifier_base<typename Nef_::SNC_and_PL> {
} }
Point_3 ip; Point_3 ip;
SNC_intersection I;
SNC_constructor C(*sncp); SNC_constructor C(*sncp);
Halfedge_handle e; Halfedge_handle e;
@ -95,7 +94,7 @@ class Ray_hit_generator2 : public Modifier_base<typename Nef_::SNC_and_PL> {
CGAL_NEF_TRACEN("Found edge " << e->source()->point() CGAL_NEF_TRACEN("Found edge " << e->source()->point()
<< "->" << e->twin()->source()->point()); << "->" << e->twin()->source()->point());
Segment_3 seg(e->source()->point(), e->twin()->source()->point()); Segment_3 seg(e->source()->point(), e->twin()->source()->point());
I.does_intersect_internally(r, seg, ip); SNC_intersection::does_intersect_internally(r, seg, ip);
ip = normalized(ip); ip = normalized(ip);
v = C.create_from_edge(e,ip); v = C.create_from_edge(e,ip);
pl->add_vertex(v); pl->add_vertex(v);
@ -147,7 +146,7 @@ class Ray_hit_generator2 : public Modifier_base<typename Nef_::SNC_and_PL> {
Halffacet_handle f; Halffacet_handle f;
if(assign(f, o)) { if(assign(f, o)) {
CGAL_NEF_TRACEN("Found facet "); CGAL_NEF_TRACEN("Found facet ");
I.does_intersect_internally(r, f, ip); SNC_intersection::does_intersect_internally(r, f, ip);
ip = normalized(ip); ip = normalized(ip);
v = C.create_from_facet(f,ip); v = C.create_from_facet(f,ip);
pl->add_vertex(v); pl->add_vertex(v);

3
Nef_3/include/CGAL/Nef_3/SNC_constructor.h
View File

@ -901,9 +901,8 @@ public:
++t2; ++t2;
if(t2 == segs2.end()) t2=segs2.begin(); if(t2 == segs2.end()) t2=segs2.begin();
SNC_intersection is;
Point_3 ip; Point_3 ip;
bool flag=is.does_intersect_internally(Segment_3(*s1,*t1),Segment_3(*s2,*t2),ip); bool flag = SNC_intersection::does_intersect_internally(Segment_3(*s1,*t1),Segment_3(*s2,*t2),ip);
if(!flag) { if(!flag) {
if(*s1 == *s2) return normalized(*s1); if(*s1 == *s2) return normalized(*s1);
else if(*s1 == *t2) return normalized(*s1); else if(*s1 == *t2) return normalized(*s1);

203
Nef_3/include/CGAL/Nef_3/SNC_intersection.h
View File

@ -17,6 +17,7 @@
#include <CGAL/basic.h> #include <CGAL/basic.h>
#include <CGAL/Circulator_project.h>
#undef CGAL_NEF_DEBUG #undef CGAL_NEF_DEBUG
#define CGAL_NEF_DEBUG 37 #define CGAL_NEF_DEBUG 37
@ -39,13 +40,10 @@ struct Project_shalfedge_point {
}; };
template<typename SNC_structure_> template<typename SNC_structure_>
class SNC_intersection : public SNC_const_decorator<SNC_structure_> { class SNC_intersection {
// TODO: granados: is it really necessary to inherit from the decorator?
typedef SNC_structure_ SNC_structure; typedef SNC_structure_ SNC_structure;
typedef SNC_intersection<SNC_structure> Self; typedef SNC_intersection<SNC_structure> Self;
typedef SNC_const_decorator<SNC_structure> Base;
// typedef SNC_const_decorator<SNC_structure> SNC_const_decorator;
typedef typename SNC_structure::SHalfedge SHalfedge; typedef typename SNC_structure::SHalfedge SHalfedge;
typedef typename SNC_structure::Halfedge_handle Halfedge_handle; typedef typename SNC_structure::Halfedge_handle Halfedge_handle;
@ -58,108 +56,31 @@ class SNC_intersection : public SNC_const_decorator<SNC_structure_> {
typedef typename SNC_structure::Halffacet_cycle_const_iterator typedef typename SNC_structure::Halffacet_cycle_const_iterator
Halffacet_cycle_const_iterator; Halffacet_cycle_const_iterator;
typedef typename SNC_structure::Point_3 Point_3; typedef typename SNC_structure::Point_3 Point_3;
typedef typename SNC_structure::Vector_3 Vector_3; typedef typename SNC_structure::Vector_3 Vector_3;
typedef typename SNC_structure::Segment_3 Segment_3; typedef typename SNC_structure::Segment_3 Segment_3;
typedef typename SNC_structure::Line_3 Line_3; typedef typename SNC_structure::Line_3 Line_3;
typedef typename SNC_structure::Ray_3 Ray_3; typedef typename SNC_structure::Ray_3 Ray_3;
typedef typename SNC_structure::Plane_3 Plane_3; typedef typename SNC_structure::Plane_3 Plane_3;
typedef typename SNC_structure::Triangle_3 Triangle_3;
public: public:
SNC_intersection() : Base() {} static bool does_contain_internally(const Point_3& s,
SNC_intersection(const SNC_structure& W) : Base(W) {} const Point_3& t,
const Point_3& p) {
bool does_contain_internally(const Point_3& s, const Point_3& t, const Point_3& p) const {
return are_strictly_ordered_along_line (s, p, t); return are_strictly_ordered_along_line (s, p, t);
} }
bool does_contain_internally( Halffacet_const_handle f, static bool does_contain_internally(Halffacet_const_handle f,
const Point_3& p, const Point_3& p) {
bool check_has_on = true) const { if(!f->plane().has_on(p))
if(check_has_on && !f->plane().has_on(p))
return false; return false;
return (locate_point_in_halffacet( p, f) == CGAL::ON_BOUNDED_SIDE); return point_in_facet_interior( p, f);
} }
static bool does_intersect_internally(const Segment_3& s1,
bool does_contain_on_boundary( Halffacet_const_handle f, const Point_3& p) const { const Segment_3& s2,
typedef Project_shalfedge_point Point_3& p) {
< SHalfedge, const Point_3> Project;
typedef Circulator_project
< SHalfedge_around_facet_const_circulator, Project,
const Point_3&, const Point_3*> Circulator;
Halffacet_cycle_const_iterator fc = f->facet_cycles_begin();
CGAL_assertion(fc.is_shalfedge());
if (fc.is_shalfedge() ) {
SHalfedge_const_handle se(fc);
SHalfedge_around_facet_const_circulator hfc(se);
Circulator c(hfc), cp(c), cend(c);
do {
c++;
CGAL_NEF_TRACEN("contained on edge "<<Segment_3( *c, *cp)<<"? "<<
Segment_3( *c, *cp).has_on(p));
if( Segment_3( *c, *cp).has_on(p))
return true;
cp++;
}
while( c != cend);
}
Halffacet_cycle_const_iterator fe = f->facet_cycles_end();
++fc;
CGAL_For_all(fc, fe) {
if (fc.is_shalfloop() ) {
SHalfloop_const_handle l(fc);
CGAL_NEF_TRACEN("isolated point on "<<l->incident_sface()->center_vertex()->point()<<"? ");
if( l->incident_sface()->center_vertex()->point() == p)
return true;
}
else if (fc.is_shalfedge() ) {
SHalfedge_const_handle se(fc);
SHalfedge_around_facet_const_circulator hfc(se);
Circulator c(hfc), cp(c), cend(c);
do {
c++;
CGAL_NEF_TRACEN("contained on edge "<<Segment_3( *c, *cp)<<"? "<<
Segment_3( *c, *cp).has_on(p));
if( Segment_3( *c, *cp).has_on(p))
return true;
cp++;
}
while( c != cend);
}
else
CGAL_error_msg( "Damn wrong handle.");
}
return false;
}
#ifdef LINE3_LINE3_INTERSECTION
bool does_intersect_internally( const Segment_3& s1,
const Segment_3& s2,
Point_3& p) const {
CGAL_NEF_TRACEN("does intersect internally with LINE3_LINE3_INTERSECTION");
if ( s1.is_degenerate() || s2.is_degenerate())
/* the segment is degenerate so there is not internal intersection */
return false;
if ( s1.has_on(s2.source()) || s1.has_on(s2.target()) ||
s2.has_on(s1.source()) || s2.has_on(s1.target()))
/* the segments does intersect at one endpoint */
return false;
Object o = intersection(Line_3(ray), Line_3(s));
if ( !CGAL::assign(p, o))
return false;
return( does_contain_internally( s, p));
}
#else // LINE3_LINE3_INTERSECTION
bool does_intersect_internally( const Segment_3& s1,
const Segment_3& s2,
Point_3& p) const {
if(s2.has_on(s1.target())) if(s2.has_on(s1.target()))
return false; return false;
Ray_3 r(s1.source(), s1.target()); Ray_3 r(s1.source(), s1.target());
@ -169,14 +90,10 @@ class SNC_intersection : public SNC_const_decorator<SNC_structure_> {
return (pl.oriented_side(p) == CGAL::NEGATIVE); return (pl.oriented_side(p) == CGAL::NEGATIVE);
} }
bool does_intersect_internally( const Ray_3& s1, static bool does_intersect_internally(const Ray_3& s1,
const Segment_3& s2, const Segment_3& s2,
Point_3& p) const { Point_3& p) {
CGAL_NEF_TRACEN("does intersect internally without LINE3_LINE3_INTERSECTION"); if (!coplanar( s1.source(), s1.point(1), s2.source(), s2.target()))
CGAL_assertion(!s1.is_degenerate());
CGAL_assertion(!s2.is_degenerate());
if ( orientation( s1.source(), s1.point(1), s2.source(), s2.target())
!= COPLANAR)
// the segments doesn't define a plane // the segments doesn't define a plane
return false; return false;
if ( s1.has_on(s2.source()) || s1.has_on(s2.target()) || if ( s1.has_on(s2.source()) || s1.has_on(s2.target()) ||
@ -190,7 +107,7 @@ class SNC_intersection : public SNC_const_decorator<SNC_structure_> {
return false; return false;
Vector_3 vs1(s1.to_vector()), vs2(s2.to_vector()), Vector_3 vs1(s1.to_vector()), vs2(s2.to_vector()),
vt(cross_product( vs1, vs2)), vt(cross_product( vs1, vs2)),
ws1(cross_product( vt, vs1)); // , ws2(cross_product( vt, vs2)); ws1(cross_product( vt, vs1));
Plane_3 hs1( s1.source(), ws1); Plane_3 hs1( s1.source(), ws1);
Object o = intersection(hs1, ls2); Object o = intersection(hs1, ls2);
CGAL_assertion(CGAL::assign( p, o)); CGAL_assertion(CGAL::assign( p, o));
@ -207,73 +124,28 @@ class SNC_intersection : public SNC_const_decorator<SNC_structure_> {
return (pl.oriented_side(p) == CGAL::NEGATIVE); return (pl.oriented_side(p) == CGAL::NEGATIVE);
} }
#endif // LINE3_LINE3_INTERSECTION static bool does_intersect_internally(const Ray_3& ray,
Halffacet_const_handle f,
bool does_intersect( const Ray_3& r, const Triangle_3& tr, Point_3& p) {
Point_3& ip) const {
// Intersection between an open ray and
// a closed 2d-triangular region in the space
CGAL_NEF_TRACEN("-> Intersection triangle - ray");
CGAL_NEF_TRACEN(" -> Ray: "<<r);
CGAL_NEF_TRACEN(" -> Triangle: "<<tr);
CGAL_assertion( !r.is_degenerate());
Plane_3 h( tr.supporting_plane());
CGAL_assertion( !h.is_degenerate());
if( h.has_on( r.source()))
return false;
Object o = intersection( h, r);
if( !CGAL::assign( ip, o))
return false;
CGAL_NEF_TRACEN(" -> intersection point: "<<ip);
return tr.has_on(ip);
}
bool does_intersect( const Segment_3& s, const Triangle_3& tr,
Point_3& ip) const {
// Intersection between a open segment and
// a closed 2d-triangular region in the space
CGAL_NEF_TRACEN("-> Intersection triangle - segment");
CGAL_NEF_TRACEN(" -> Segment: "<<s);
CGAL_NEF_TRACEN(" -> Triangle: "<<tr);
CGAL_assertion( !s.is_degenerate());
Plane_3 h( tr.supporting_plane());
CGAL_assertion( !h.is_degenerate());
if( h.has_on( s.source()) || h.has_on( s.target()))
return false;
Object o = intersection( h, s);
if( !CGAL::assign( ip, o))
return false;
CGAL_NEF_TRACEN(" -> intersection point: "<<ip);
return tr.has_on(ip);
}
bool does_intersect_internally( const Ray_3& ray,
Halffacet_const_handle f,
Point_3& p,
bool checkHasOn = true) const {
CGAL_NEF_TRACEN("-> Intersection facet - ray"); CGAL_NEF_TRACEN("-> Intersection facet - ray");
Plane_3 h( f->plane()); Plane_3 h( f->plane());
CGAL_NEF_TRACEN("-> facet's plane: " << h); CGAL_NEF_TRACEN("-> facet's plane: " << h);
CGAL_NEF_TRACEN("-> a point on the plane: " << h.point()); CGAL_NEF_TRACEN("-> a point on the plane: " << h.point());
CGAL_NEF_TRACEN("-> ray: " << ray); CGAL_NEF_TRACEN("-> ray: " << ray);
CGAL_assertion(!ray.is_degenerate()); CGAL_assertion(!ray.is_degenerate());
if(checkHasOn) { if(h.has_on(ray.source()))
if(h.has_on(ray.source())) return false;
return false;
} else
CGAL_assertion(!h.has_on(ray.source()));
Object o = intersection( h, ray); Object o = intersection( h, ray);
if( !CGAL::assign( p, o)) if( !CGAL::assign( p, o))
return false; return false;
CGAL_NEF_TRACEN( "-> intersection point: " << p ); CGAL_NEF_TRACEN( "-> intersection point: " << p );
CGAL_NEF_TRACEN( "-> point in facet interior? "<<does_contain_internally( f, p)); CGAL_NEF_TRACEN( "-> point in facet interior? "<<point_in_facet_interior( f, p));
return does_contain_internally( f, p, false); return point_in_facet_interior( p, f);
} }
static bool does_intersect_internally(const Segment_3& seg,
bool does_intersect_internally( const Segment_3& seg, Halffacet_const_handle f,
Halffacet_const_handle f, Point_3& p) {
Point_3& p) const {
CGAL_NEF_TRACEN("-> Intersection facet - segment"); CGAL_NEF_TRACEN("-> Intersection facet - segment");
Plane_3 h( f->plane()); Plane_3 h( f->plane());
CGAL_NEF_TRACEN("-> facet's plane: " << h); CGAL_NEF_TRACEN("-> facet's plane: " << h);
@ -283,24 +155,23 @@ class SNC_intersection : public SNC_const_decorator<SNC_structure_> {
if( h.has_on( seg.source()) || h.has_on(seg.target())) if( h.has_on( seg.source()) || h.has_on(seg.target()))
/* no possible internal intersection */ /* no possible internal intersection */
return false; return false;
return does_intersect(seg, f, p);
}
bool does_intersect(const Segment_3& seg,
Halffacet_const_handle f,
Point_3& p) const {
Plane_3 h( f->plane());
Object o = intersection( h, seg); Object o = intersection( h, seg);
if( !CGAL::assign( p, o)) if( !CGAL::assign( p, o))
return false; return false;
CGAL_NEF_TRACEN( "-> intersection point: " << p ); CGAL_NEF_TRACEN( "-> intersection point: " << p );
CGAL_NEF_TRACEN( "-> point in facet interior? "<<does_contain_internally( f, p)); CGAL_NEF_TRACEN( "-> point in facet interior? "<<point_in_facet_interior( f, p));
return( does_contain_internally( f, p, false)); return point_in_facet_interior( p, f);
} }
private:
Bounded_side locate_point_in_halffacet( const Point_3& p, static bool point_in_facet_interior(const Point_3& p,
Halffacet_const_handle f) const { Halffacet_const_handle f) {
return (locate_point_in_halffacet( p, f) == CGAL::ON_BOUNDED_SIDE);
}
static Bounded_side locate_point_in_halffacet(const Point_3& p,
Halffacet_const_handle f) {
CGAL_NEF_TRACEN("locate point in halffacet " << p << ", " << f->plane()); CGAL_NEF_TRACEN("locate point in halffacet " << p << ", " << f->plane());
typedef Project_shalfedge_point typedef Project_shalfedge_point
< SHalfedge, const Point_3> Project; < SHalfedge, const Point_3> Project;

37
Nef_3/include/CGAL/Nef_3/SNC_point_locator.h
View File

@ -250,8 +250,8 @@ public:
else if( CGAL::assign( e, *o) && ((mask&2) != 0)) { else if( CGAL::assign( e, *o) && ((mask&2) != 0)) {
Point_3 q; Point_3 q;
_CGAL_NEF_TRACEN("trying edge on "<< Segment_3(e->source()->point(),e->twin()->source()->point())); _CGAL_NEF_TRACEN("trying edge on "<< Segment_3(e->source()->point(),e->twin()->source()->point()));
if( is.does_intersect_internally( ray, Segment_3(e->source()->point(), if( SNC_intersection::does_intersect_internally( ray, Segment_3(e->source()->point(),
e->twin()->source()->point()), q)) { e->twin()->source()->point()), q)) {
_CGAL_NEF_TRACEN("ray intersects edge on "<<q); _CGAL_NEF_TRACEN("ray intersects edge on "<<q);
_CGAL_NEF_TRACEN("prev. intersection? "<<hit); _CGAL_NEF_TRACEN("prev. intersection? "<<hit);
CGAL_assertion_code CGAL_assertion_code
@ -272,7 +272,7 @@ public:
Point_3 q; Point_3 q;
_CGAL_NEF_TRACEN("trying facet with on plane "<<f->plane()<< _CGAL_NEF_TRACEN("trying facet with on plane "<<f->plane()<<
" with point on "<<f->plane().point()); " with point on "<<f->plane().point());
if( is.does_intersect_internally( ray, f, q, true) ) { if( SNC_intersection::does_intersect_internally( ray, f, q) ) {
_CGAL_NEF_TRACEN("ray intersects facet on "<<q); _CGAL_NEF_TRACEN("ray intersects facet on "<<q);
_CGAL_NEF_TRACEN("prev. intersection? "<<hit); _CGAL_NEF_TRACEN("prev. intersection? "<<hit);
if( hit) { _CGAL_NEF_TRACEN("prev. intersection on "<<eor); } if( hit) { _CGAL_NEF_TRACEN("prev. intersection on "<<eor); }
@ -319,14 +319,14 @@ public:
} }
} }
else if( CGAL::assign( e, *o)) { else if( CGAL::assign( e, *o)) {
if ( is.does_contain_internally(e->source()->point(), e->twin()->source()->point(), p) ) { if ( SNC_intersection::does_contain_internally(e->source()->point(), e->twin()->source()->point(), p) ) {
_CGAL_NEF_TRACEN("found on edge "<<Segment_3(e->source()->point(),e->twin()->source()->point())); _CGAL_NEF_TRACEN("found on edge "<<Segment_3(e->source()->point(),e->twin()->source()->point()));
result = make_object(e); result = make_object(e);
found = true; found = true;
} }
} }
else if( CGAL::assign( f, *o)) { else if( CGAL::assign( f, *o)) {
if (is.does_contain_internally( f, p) ) { if (SNC_intersection::does_contain_internally( f, p) ) {
_CGAL_NEF_TRACEN("found on facet..."); _CGAL_NEF_TRACEN("found on facet...");
result = make_object(f); result = make_object(f);
found = true; found = true;
@ -415,11 +415,11 @@ public:
// (e->source() == v || e->twin()->source() == v)) continue; // (e->source() == v || e->twin()->source() == v)) continue;
Segment_3 ss(e->source()->point(),e->twin()->source()->point()); Segment_3 ss(e->source()->point(),e->twin()->source()->point());
CGAL_NEF_TRACEN("test edge " << e->source()->point() << "->" << e->twin()->source()->point()); CGAL_NEF_TRACEN("test edge " << e->source()->point() << "->" << e->twin()->source()->point());
if (is.does_contain_internally(e->source()->point(), e->twin()->source()->point(), p)) { if (SNC_intersection::does_contain_internally(e->source()->point(), e->twin()->source()->point(), p)) {
_CGAL_NEF_TRACEN("found on edge "<< ss); _CGAL_NEF_TRACEN("found on edge "<< ss);
return make_object(e); return make_object(e);
} }
if((e->source() != v) && (e->twin()->source() != v) && is.does_intersect_internally(s, ss, ip)) { if((e->source() != v) && (e->twin()->source() != v) && SNC_intersection::does_intersect_internally(s, ss, ip)) {
// first = false; // first = false;
s = Segment_3(p, normalized(ip)); s = Segment_3(p, normalized(ip));
result = make_object(e); result = make_object(e);
@ -428,7 +428,7 @@ public:
} else } else
if( CGAL::assign( f, *o)) { if( CGAL::assign( f, *o)) {
CGAL_NEF_TRACEN("test facet " << f->plane()); CGAL_NEF_TRACEN("test facet " << f->plane());
if (is.does_contain_internally(f,p) ) { if (SNC_intersection::does_contain_internally(f,p) ) {
_CGAL_NEF_TRACEN("found on facet..."); _CGAL_NEF_TRACEN("found on facet...");
return make_object(f); return make_object(f);
} }
@ -449,7 +449,7 @@ public:
} }
if( (! v_vertex_of_f) && is.does_intersect_internally(s,f,ip) ) { if( (! v_vertex_of_f) && SNC_intersection::does_intersect_internally(s,f,ip) ) {
s = Segment_3(p, normalized(ip)); s = Segment_3(p, normalized(ip));
result = make_object(f); result = make_object(f);
} }
@ -461,13 +461,13 @@ public:
/* /*
Halffacet_iterator fc; Halffacet_iterator fc;
CGAL_forall_facets(fc, *this->sncp()) { CGAL_forall_facets(fc, *this->sncp()) {
CGAL_assertion(!is.does_intersect_internally(s,f,ip)); CGAL_assertion(!SNC_intersection::does_intersect_internally(s,f,ip));
} }
Halfedge_iterator ec; Halfedge_iterator ec;
CGAL_forall_edges(ec, *this->sncp()) { CGAL_forall_edges(ec, *this->sncp()) {
Segment_3 ss(ec->source()->point(), ec->twin()->source()->point()); Segment_3 ss(ec->source()->point(), ec->twin()->source()->point());
CGAL_assertion(!is.does_intersect_internally(s,ss,ip)); CGAL_assertion(!SNC_intersection::does_intersect_internally(s,ss,ip));
} }
Vertex_iterator vc; Vertex_iterator vc;
@ -495,7 +495,7 @@ public:
for(;ox!=candidates.end();++ox) { for(;ox!=candidates.end();++ox) {
if(!CGAL::assign(e,*ox)) continue; if(!CGAL::assign(e,*ox)) continue;
CGAL_NEF_TRACEN("test edge " << e->source()->point() << "->" << e->twin()->source()->point()); CGAL_NEF_TRACEN("test edge " << e->source()->point() << "->" << e->twin()->source()->point());
if(is.does_intersect_internally(s,Segment_3(e->source()->point(),e->twin()->source()->point()),ip)) { if(SNC_intersection::does_intersect_internally(s,Segment_3(e->source()->point(),e->twin()->source()->point()),ip)) {
s = Segment_3(p, normalized(ip)); s = Segment_3(p, normalized(ip));
result = make_object(e); result = make_object(e);
} }
@ -551,8 +551,8 @@ public:
#endif #endif
Point_3 q; Point_3 q;
if( is.does_intersect_internally( s, Segment_3(e->source()->point(), if( SNC_intersection::does_intersect_internally( s, Segment_3(e->source()->point(),
e->twin()->source()->point()), q)) { e->twin()->source()->point()), q)) {
q = normalized(q); q = normalized(q);
call_back( e0, make_object(Halfedge_handle(e)), q); call_back( e0, make_object(Halfedge_handle(e)), q);
_CGAL_NEF_TRACEN("edge intersects edge "<<' '<<&*e<< Segment_3(e->source()->point(), _CGAL_NEF_TRACEN("edge intersects edge "<<' '<<&*e<< Segment_3(e->source()->point(),
@ -565,7 +565,7 @@ public:
#endif #endif
Point_3 q; Point_3 q;
if( is.does_intersect_internally( s, f, q) ) { if( SNC_intersection::does_intersect_internally( s, f, q) ) {
q = normalized(q); q = normalized(q);
call_back( e0, make_object(Halffacet_handle(f)), q); call_back( e0, make_object(Halffacet_handle(f)), q);
_CGAL_NEF_TRACEN("edge intersects facet on plane "<<f->plane()<<" on "<<q); _CGAL_NEF_TRACEN("edge intersects facet on plane "<<f->plane()<<" on "<<q);
@ -600,8 +600,8 @@ public:
#endif #endif
Point_3 q; Point_3 q;
if( is.does_intersect_internally( s, Segment_3(e->source()->point(), if( SNC_intersection::does_intersect_internally( s, Segment_3(e->source()->point(),
e->twin()->source()->point()), q)) { e->twin()->source()->point()), q)) {
q = normalized(q); q = normalized(q);
call_back( e0, make_object(Halfedge_handle(e)), q); call_back( e0, make_object(Halfedge_handle(e)), q);
_CGAL_NEF_TRACEN("edge intersects edge "<<' '<<&*e<< Segment_3(e->source()->point(), _CGAL_NEF_TRACEN("edge intersects edge "<<' '<<&*e<< Segment_3(e->source()->point(),
@ -643,7 +643,7 @@ public:
#endif #endif
Point_3 q; Point_3 q;
if( is.does_intersect_internally( s, f, q) ) { if( SNC_intersection::does_intersect_internally( s, f, q) ) {
q = normalized(q); q = normalized(q);
call_back( e0, make_object(Halffacet_handle(f)), q); call_back( e0, make_object(Halffacet_handle(f)), q);
_CGAL_NEF_TRACEN("edge intersects facet on plane "<<f->plane()<<" on "<<q); _CGAL_NEF_TRACEN("edge intersects facet on plane "<<f->plane()<<" on "<<q);
@ -705,7 +705,6 @@ public:
private: private:
bool initialized; bool initialized;
SNC_candidate_provider* candidate_provider; SNC_candidate_provider* candidate_provider;
SNC_intersection is;
}; };

32
Nef_3/include/CGAL/Nef_3/binop_intersection_tests.h
View File

@ -39,7 +39,6 @@ struct binop_intersection_test_segment_tree {
template<class Callback> template<class Callback>
struct Bop_edge0_face1_callback { struct Bop_edge0_face1_callback {
SNC_intersection &is;
Callback &cb; Callback &cb;
struct Pair_hash_function { struct Pair_hash_function {
@ -57,8 +56,8 @@ struct binop_intersection_test_segment_tree {
} }
}; };
Bop_edge0_face1_callback(SNC_intersection &is, Callback &cb) Bop_edge0_face1_callback(Callback &cb)
: is(is), cb(cb) : cb(cb)
{} {}
void operator()( Nef_box& box0, Nef_box& box1 ) { void operator()( Nef_box& box0, Nef_box& box1 ) {
@ -71,7 +70,7 @@ struct binop_intersection_test_segment_tree {
if( Infi_box::degree( f1->plane().d() ) > 0 ) if( Infi_box::degree( f1->plane().d() ) > 0 )
return; return;
Point_3 ip; Point_3 ip;
if( is.does_intersect_internally( Const_decorator::segment(e0), f1, ip )) { if( SNC_intersection::does_intersect_internally( Const_decorator::segment(e0), f1, ip )) {
cb(e0,make_object(f1),ip); cb(e0,make_object(f1),ip);
} }
} }
@ -80,11 +79,10 @@ struct binop_intersection_test_segment_tree {
template<class Callback> template<class Callback>
struct Bop_edge1_face0_callback { struct Bop_edge1_face0_callback {
SNC_intersection &is;
Callback &cb; Callback &cb;
Bop_edge1_face0_callback(SNC_intersection &is, Callback &cb) Bop_edge1_face0_callback(Callback &cb)
: is(is), cb(cb) : cb(cb)
{} {}
void operator()( Nef_box& box0, Nef_box& box1 ) { void operator()( Nef_box& box0, Nef_box& box1 ) {
@ -97,19 +95,18 @@ struct binop_intersection_test_segment_tree {
if( Infi_box::degree( f0->plane().d() ) > 0 ) if( Infi_box::degree( f0->plane().d() ) > 0 )
return; return;
Point_3 ip; Point_3 ip;
if( is.does_intersect_internally( Const_decorator::segment( e1 ), if( SNC_intersection::does_intersect_internally( Const_decorator::segment( e1 ),
f0, ip ) ) f0, ip ) )
cb(e1,make_object(f0),ip); cb(e1,make_object(f0),ip);
} }
}; };
template<class Callback> template<class Callback>
struct Bop_edge0_edge1_callback { struct Bop_edge0_edge1_callback {
SNC_intersection &is;
Callback &cb; Callback &cb;
Bop_edge0_edge1_callback(SNC_intersection &is, Callback &cb) Bop_edge0_edge1_callback(Callback &cb)
: is(is), cb(cb) : cb(cb)
{} {}
void operator()( Nef_box& box0, Nef_box& box1 ) { void operator()( Nef_box& box0, Nef_box& box1 ) {
@ -120,8 +117,8 @@ struct binop_intersection_test_segment_tree {
Halfedge_iterator e0 = box0.get_halfedge(); Halfedge_iterator e0 = box0.get_halfedge();
Halfedge_iterator e1 = box1.get_halfedge(); Halfedge_iterator e1 = box1.get_halfedge();
Point_3 ip; Point_3 ip;
if( is.does_intersect_internally( Const_decorator::segment( e0 ), if( SNC_intersection::does_intersect_internally( Const_decorator::segment( e0 ),
Const_decorator::segment( e1 ), ip )) Const_decorator::segment( e1 ), ip ))
cb(e0,make_object(e1),ip); cb(e0,make_object(e1),ip);
} }
}; };
@ -135,10 +132,9 @@ struct binop_intersection_test_segment_tree {
Halfedge_iterator e0, e1; Halfedge_iterator e0, e1;
Halffacet_iterator f0, f1; Halffacet_iterator f0, f1;
std::vector<Nef_box> a, b; std::vector<Nef_box> a, b;
SNC_intersection is( sncp );
CGAL_NEF_TRACEN("start edge0 edge1"); CGAL_NEF_TRACEN("start edge0 edge1");
Bop_edge0_edge1_callback<Callback> callback_edge0_edge1( is, cb0 ); Bop_edge0_edge1_callback<Callback> callback_edge0_edge1( cb0 );
CGAL_forall_edges( e0, sncp) a.push_back( Nef_box( e0 ) ); CGAL_forall_edges( e0, sncp) a.push_back( Nef_box( e0 ) );
CGAL_forall_edges( e1, snc1i) b.push_back( Nef_box( e1 ) ); CGAL_forall_edges( e1, snc1i) b.push_back( Nef_box( e1 ) );
#ifdef CGAL_NEF3_BOX_INTERSECTION_CUTOFF #ifdef CGAL_NEF3_BOX_INTERSECTION_CUTOFF
@ -153,7 +149,7 @@ struct binop_intersection_test_segment_tree {
b.clear(); b.clear();
CGAL_NEF_TRACEN("start edge0 face1"); CGAL_NEF_TRACEN("start edge0 face1");
Bop_edge0_face1_callback<Callback> callback_edge0_face1( is, cb0 ); Bop_edge0_face1_callback<Callback> callback_edge0_face1( cb0 );
CGAL_forall_edges( e0, sncp ) a.push_back( Nef_box( e0 ) ); CGAL_forall_edges( e0, sncp ) a.push_back( Nef_box( e0 ) );
CGAL_forall_facets( f1, snc1i) b.push_back( Nef_box( f1 ) ); CGAL_forall_facets( f1, snc1i) b.push_back( Nef_box( f1 ) );
#ifdef CGAL_NEF3_BOX_INTERSECTION_CUTOFF #ifdef CGAL_NEF3_BOX_INTERSECTION_CUTOFF
@ -168,7 +164,7 @@ struct binop_intersection_test_segment_tree {
b.clear(); b.clear();
CGAL_NEF_TRACEN("start edge1 face0"); CGAL_NEF_TRACEN("start edge1 face0");
Bop_edge1_face0_callback<Callback> callback_edge1_face0( is, cb1 ); Bop_edge1_face0_callback<Callback> callback_edge1_face0( cb1 );
CGAL_forall_edges( e1, snc1i) a.push_back( Nef_box( e1 ) ); CGAL_forall_edges( e1, snc1i) a.push_back( Nef_box( e1 ) );
CGAL_forall_facets( f0, sncp ) b.push_back( Nef_box( f0 ) ); CGAL_forall_facets( f0, sncp ) b.push_back( Nef_box( f0 ) );
#ifdef CGAL_NEF3_BOX_INTERSECTION_CUTOFF #ifdef CGAL_NEF3_BOX_INTERSECTION_CUTOFF

67
Nef_3/test/Nef_3/include/CGAL/test_Nef_3.h
View File

@ -499,112 +499,111 @@ private:
if(Infi_box::standard_kernel()) { if(Infi_box::standard_kernel()) {
Nef_polyhedron N = load_nef3("star.nef3.SH"); Nef_polyhedron N = load_nef3("star.nef3.SH");
SNC_intersection is(*N.sncp());
Point_3 p; Point_3 p;
assert(!is.does_contain_internally( assert(!SNC_intersection::does_contain_internally(
Point_3(0,0,0), Point_3(2,0,0), Point_3(0,0,0), Point_3(2,0,0),
Point_3(0,0,0))); Point_3(0,0,0)));
assert(!is.does_contain_internally( assert(!SNC_intersection::does_contain_internally(
Point_3(0,0,0), Point_3(2,0,0), Point_3(0,0,0), Point_3(2,0,0),
Point_3(2,0,0))); Point_3(2,0,0)));
assert(!is.does_contain_internally( assert(!SNC_intersection::does_contain_internally(
Point_3(0,0,0), Point_3(2,0,0), Point_3(0,0,0), Point_3(2,0,0),
Point_3(3,0,0))); Point_3(3,0,0)));
assert(!is.does_contain_internally( assert(!SNC_intersection::does_contain_internally(
Point_3(0,0,0), Point_3(2,0,0), Point_3(0,0,0), Point_3(2,0,0),
Point_3(-1,0,0))); Point_3(-1,0,0)));
assert(!is.does_contain_internally( assert(!SNC_intersection::does_contain_internally(
Point_3(0,0,0), Point_3(2,0,0), Point_3(0,0,0), Point_3(2,0,0),
Point_3(1,1,0))); Point_3(1,1,0)));
assert(!is.does_contain_internally( assert(!SNC_intersection::does_contain_internally(
Point_3(0,0,0), Point_3(2,0,0), Point_3(0,0,0), Point_3(2,0,0),
Point_3(7,25,11))); Point_3(7,25,11)));
assert(is.does_contain_internally( assert(SNC_intersection::does_contain_internally(
Point_3(0,0,0), Point_3(2,0,0), Point_3(0,0,0), Point_3(2,0,0),
Point_3(1,0,0))); Point_3(1,0,0)));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(0,0,0), Point_3(-1,0,0)), p)); Segment_3(Point_3(0,0,0), Point_3(-1,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(1,0,0), Point_3(0,0,0)), p)); Segment_3(Point_3(1,0,0), Point_3(0,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,1)), Segment_3(Point_3(0,1,0), Point_3(0,-1,1)),
Segment_3(Point_3(1,0,0), Point_3(-1,0,0)), p)); Segment_3(Point_3(1,0,0), Point_3(-1,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(0,2,0), Point_3(0,0,0)), p)); Segment_3(Point_3(0,2,0), Point_3(0,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(0,3,0), Point_3(0,1,0)), p)); Segment_3(Point_3(0,3,0), Point_3(0,1,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(0,4,0), Point_3(0,2,0)), p)); Segment_3(Point_3(0,4,0), Point_3(0,2,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(1,5,0), Point_3(1,7,0)), p)); Segment_3(Point_3(1,5,0), Point_3(1,7,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(1,7,0), Point_3(1,5,0)), p)); Segment_3(Point_3(1,7,0), Point_3(1,5,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(3,0,0), Point_3(1,0,0)), p)); Segment_3(Point_3(3,0,0), Point_3(1,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(1,0,0), Point_3(3,0,0)), p)); Segment_3(Point_3(1,0,0), Point_3(3,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,3,0), Point_3(0,1,0)), Segment_3(Point_3(0,3,0), Point_3(0,1,0)),
Segment_3(Point_3(1,0,0), Point_3(-1,0,0)), p)); Segment_3(Point_3(1,0,0), Point_3(-1,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,3,0)), Segment_3(Point_3(0,1,0), Point_3(0,3,0)),
Segment_3(Point_3(1,0,0), Point_3(-1,0,0)), p)); Segment_3(Point_3(1,0,0), Point_3(-1,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,3,0), Point_3(0,1,0)), Segment_3(Point_3(0,3,0), Point_3(0,1,0)),
Segment_3(Point_3(1,0,0), Point_3(3,0,0)), p)); Segment_3(Point_3(1,0,0), Point_3(3,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,3,0)), Segment_3(Point_3(0,1,0), Point_3(0,3,0)),
Segment_3(Point_3(1,0,0), Point_3(3,0,0)), p)); Segment_3(Point_3(1,0,0), Point_3(3,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,3,0), Point_3(0,1,0)), Segment_3(Point_3(0,3,0), Point_3(0,1,0)),
Segment_3(Point_3(3,0,0), Point_3(1,0,0)), p)); Segment_3(Point_3(3,0,0), Point_3(1,0,0)), p));
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,3,0)), Segment_3(Point_3(0,1,0), Point_3(0,3,0)),
Segment_3(Point_3(3,0,0), Point_3(1,0,0)), p)); Segment_3(Point_3(3,0,0), Point_3(1,0,0)), p));
assert(is.does_intersect_internally( assert(SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,1,0), Point_3(0,-1,0)), Segment_3(Point_3(0,1,0), Point_3(0,-1,0)),
Segment_3(Point_3(1,0,0), Point_3(-1,0,0)), p)); Segment_3(Point_3(1,0,0), Point_3(-1,0,0)), p));
assert(p == Point_3(0,0,0)); assert(p == Point_3(0,0,0));
Halffacet_const_iterator hf; Halffacet_const_iterator hf;
assert(!is.does_contain_internally( assert(!SNC_intersection::does_contain_internally(
N.halffacets_begin(), Point_3(0,0,0))); N.halffacets_begin(), Point_3(0,0,0)));
CGAL_forall_halffacets(hf, N) CGAL_forall_halffacets(hf, N)
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(-31,15,0),Point_3(-31,15,1)),hf,p)); Segment_3(Point_3(-31,15,0),Point_3(-31,15,1)),hf,p));
CGAL_forall_halffacets(hf, N) CGAL_forall_halffacets(hf, N)
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(-31,15,-1),Point_3(-31,15,0)),hf,p)); Segment_3(Point_3(-31,15,-1),Point_3(-31,15,0)),hf,p));
CGAL_forall_halffacets(hf, N) CGAL_forall_halffacets(hf, N)
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(-31,15,0),Point_3(-30,15,0)),hf,p)); Segment_3(Point_3(-31,15,0),Point_3(-30,15,0)),hf,p));
CGAL_forall_halffacets(hf, N) CGAL_forall_halffacets(hf, N)
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(-32,15,-1),Point_3(-32,15,0)),hf,p)); Segment_3(Point_3(-32,15,-1),Point_3(-32,15,0)),hf,p));
CGAL_forall_halffacets(hf, N) CGAL_forall_halffacets(hf, N)
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(-16,8,-1),Point_3(-16,8,0)),hf,p)); Segment_3(Point_3(-16,8,-1),Point_3(-16,8,0)),hf,p));
CGAL_forall_halffacets(hf, N) CGAL_forall_halffacets(hf, N)
assert(!is.does_intersect_internally( assert(!SNC_intersection::does_intersect_internally(
Segment_3(Point_3(0,0,-1),Point_3(0,0,1)),hf,p)); Segment_3(Point_3(0,0,-1),Point_3(0,0,1)),hf,p));
int i=0; int i=0;
CGAL_forall_halffacets(hf, N) { CGAL_forall_halffacets(hf, N) {
bool b = (i == 13 || i == 15); bool b = (i == 13 || i == 15);
assert( b == is.does_intersect_internally( assert( b == SNC_intersection::does_intersect_internally(
Segment_3(Point_3(-31,15,-1),Point_3(-31,15,1)), Segment_3(Point_3(-31,15,-1),Point_3(-31,15,1)),
hf, p)); hf, p));
if(b) assert(p == Point_3(-31,15,0)); if(b) assert(p == Point_3(-31,15,0));
@ -614,7 +613,7 @@ private:
i=0; i=0;
CGAL_forall_halffacets(hf, N) { CGAL_forall_halffacets(hf, N) {
bool b = (i == 14 || i == 16); bool b = (i == 14 || i == 16);
assert( b == is.does_intersect_internally( assert( b == SNC_intersection::does_intersect_internally(
Segment_3(Point_3(-15,7,-1), Point_3(-15,7,1)), Segment_3(Point_3(-15,7,-1), Point_3(-15,7,1)),
hf, p)); hf, p));
if(b) assert(p == Point_3(-15,7,0)); if(b) assert(p == Point_3(-15,7,0));