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

Merge pull request #6445 from GilesBathgate/Convex_decomposition-cleanup_ray_hit_generator2-GilesBathgate 

Consolidate the differences and use inheritance to remove duplication
This commit is contained in:
Sébastien Loriot 2022-03-29 17:48:17 +02:00
parent 4c4aeb74f4 c356c621cd
commit 1172c9df7d
2 changed files with 35 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ namespace CGAL {
template<typename Nef_>
class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
protected:
typedef Nef_ Nef_polyhedron;
typedef typename Nef_polyhedron::SNC_and_PL SNC_and_PL;
typedef typename Nef_polyhedron::SNC_structure SNC_structure;
@ -50,13 +50,15 @@ class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
typedef typename Base::Vector_3 Vector_3;
typedef typename Base::Sphere_point Sphere_point;
typedef typename Base::Vertex_handle Vertex_handle;
typedef typename Base::SVertex_handle SVertex_handle;
typedef typename Base::SVertex_handle SVertex_handle;
typedef typename Base::Halfedge_handle Halfedge_handle;
typedef typename Base::Halffacet_handle Halffacet_handle;
typedef typename Base::Object_handle Object_handle;
typedef typename Base::Vertex_iterator Vertex_iterator;
typedef typename Base::SVertex_iterator SVertex_iterator;
typedef typename Base::SVertex_iterator SVertex_iterator;
Vector_3 dir;
SNC_structure* sncp;
@ -64,7 +66,7 @@ class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
int mask;
public:
Ray_hit_generator(Vector_3 d = Vector_3()) : dir(d), mask(255) {}
Ray_hit_generator(Vector_3 d = Vector_3()) : dir(d), sncp(nullptr), pl(nullptr), mask(255) {}
Ray_hit_generator(SNC_structure* sncin, SNC_point_locator* plin, int m = 255)
: sncp(sncin), pl(plin), mask(m) {}
@ -76,7 +78,7 @@ class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
Vertex_handle v;
if(assign(v, o)) {
CGAL_NEF_TRACEN( "Found vertex " << v->point() );
CGAL_NEF_TRACEN("Found vertex " << v->point());
return v;
}
@ -85,15 +87,15 @@ class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
Halfedge_handle e;
if(assign(e, o)) {
CGAL_NEF_TRACEN( "Found edge " << e->source()->point()
<< "->" << e->twin()->source()->point() );
CGAL_NEF_TRACEN("Found edge " << e->source()->point()
<< "->" << e->twin()->source()->point());
Segment_3 seg(e->source()->point(), e->twin()->source()->point());
SNC_intersection::does_intersect_internally(r, seg, ip);
ip = normalized(ip);
v = C.create_from_edge(e,ip);
pl->add_vertex(v);
CGAL_NEF_TRACEN( "new vertex " << ip );
CGAL_NEF_TRACEN("new vertex " << ip);
SVertex_iterator svi = v->svertices_begin();
SVertex_handle svf = svi;
@ -119,26 +121,21 @@ class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
#endif
}
// TODO: that's too much
pl->add_edge(svf);
pl->add_edge(svb);
CGAL_NEF_TRACEN("new edge " << e->source()->point() <<
"->" << e->twin()->source()->point());
CGAL_NEF_TRACEN("new edge " << svf->source()->point() <<
"->" << svf->twin()->source()->point());
handle_splits(e,svf,svb);
return v;
}
Halffacet_handle f;
if(assign(f, o)) {
CGAL_NEF_TRACEN( "Found facet " );
CGAL_NEF_TRACEN("Found facet ");
SNC_intersection::does_intersect_internally(r, f, ip);
ip = normalized(ip);
v = C.create_from_facet(f,ip);
pl->add_vertex(v);
CGAL_NEF_TRACEN( "new vertex " << ip );
CGAL_NEF_TRACEN("new vertex " << ip);
return v;
}
@ -147,7 +144,15 @@ class Ray_hit_generator : public Modifier_base<typename Nef_::SNC_and_PL> {
return Vertex_handle();
}
void operator()(SNC_and_PL& sncpl) {
virtual void handle_splits(Halfedge_handle, SVertex_handle, SVertex_handle) {
CGAL_NEF_TRACEN("new edge " << e->source()->point() <<
"->" << e->twin()->source()->point());
CGAL_NEF_TRACEN("new edge " << svf->source()->point() <<
"->" << svf->twin()->source()->point());
}
virtual void operator()(SNC_and_PL& sncpl) {
sncp = sncpl.sncp;
pl = sncpl.pl;

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

@ -18,6 +18,7 @@
#include <CGAL/Nef_3/SNC_decorator.h>
#include <CGAL/Nef_3/SNC_intersection.h>
#include <CGAL/Convex_decomposition_3/SM_walls.h>
#include <CGAL/Convex_decomposition_3/Ray_hit_generator.h>
#undef CGAL_NEF_DEBUG
#define CGAL_NEF_DEBUG 233
@ -26,42 +27,23 @@
namespace CGAL {
template<typename Nef_>
class Ray_hit_generator2 : public Modifier_base<typename Nef_::SNC_and_PL> {
class Ray_hit_generator2 : public Ray_hit_generator<Nef_> {
typedef Nef_ Nef_polyhedron;
typedef typename Nef_polyhedron::SNC_and_PL SNC_and_PL;
typedef typename Nef_polyhedron::SNC_structure SNC_structure;
typedef typename Nef_polyhedron::Items Items;
typedef CGAL::SNC_decorator<SNC_structure> Base;
typedef CGAL::SNC_point_locator<Base> SNC_point_locator;
typedef CGAL::SNC_intersection<SNC_structure> SNC_intersection;
typedef CGAL::SNC_constructor<Items, SNC_structure>
SNC_constructor;
typedef Ray_hit_generator<Nef_polyhedron> Base;
typedef typename SNC_structure::Sphere_map Sphere_map;
typedef CGAL::SM_decorator<Sphere_map> SM_decorator;
typedef CGAL::SM_point_locator<SM_decorator> SM_point_locator;
typedef CGAL::SM_walls<Sphere_map> SM_walls;
typedef typename Base::Segment_3 Segment_3;
typedef typename Base::Point_3 Point_3;
typedef typename Base::Ray_3 Ray_3;
typedef typename Base::Vector_3 Vector_3;
typedef typename Base::Sphere_point Sphere_point;
typedef typename Base::Vertex_handle Vertex_handle;
typedef typename Base::SVertex_handle SVertex_handle;
typedef typename Base::SVertex_handle SVertex_handle;
typedef typename Base::Halfedge_handle Halfedge_handle;
typedef typename Base::Halffacet_handle Halffacet_handle;
typedef typename Base::Object_handle Object_handle;
typedef typename Base::Vertex_iterator Vertex_iterator;
typedef typename Base::SVertex_iterator SVertex_iterator;
Vector_3 dir;
Vertex_handle vs;
SNC_structure* sncp;
SNC_point_locator* pl;
bool edge_splitted;
Halfedge_handle second_half;
@ -70,64 +52,9 @@ class Ray_hit_generator2 : public Modifier_base<typename Nef_::SNC_and_PL> {
public:
Ray_hit_generator2(Vector_3 d, Vertex_handle v)
: dir(d), vs(v), sncp(nullptr), pl(nullptr), edge_splitted(false), vertex_added(false) {}
Vertex_handle create_vertex_on_first_hit(const Ray_3& r) {
CGAL_NEF_TRACEN("shoot ray in SNC " << r);
// CGAL_NEF_SETDTHREAD(503*509);
Object_handle o = pl->shoot(r);
// CGAL_NEF_SETDTHREAD(1);
Vertex_handle v;
if(assign(v, o)) {
CGAL_NEF_TRACEN("Found vertex " << v->point());
return v;
}
Point_3 ip;
SNC_constructor C(*sncp);
Halfedge_handle e;
if(assign(e, o)) {
CGAL_NEF_TRACEN("Found edge " << e->source()->point()
<< "->" << e->twin()->source()->point());
Segment_3 seg(e->source()->point(), e->twin()->source()->point());
SNC_intersection::does_intersect_internally(r, seg, ip);
ip = normalized(ip);
v = C.create_from_edge(e,ip);
pl->add_vertex(v);
CGAL_NEF_TRACEN("new vertex " << ip);
SVertex_iterator svi = v->svertices_begin();
SVertex_handle svf = svi;
SVertex_handle svb = ++svi;
if(svf->point() == e->point()) {
svb->twin() = e;
svf->twin() = e->twin();
e->twin()->twin() = svf;
e->twin() = svb;
#ifndef CGAL_NEF_NO_INDEXED_ITEMS
svb->set_index(e->get_index());
svf->twin()->set_index(svf->new_index());
#endif
} else {
svf->twin() = e;
svb->twin() = e->twin();
e->twin()->twin() = svb;
e->twin() = svf;
#ifndef CGAL_NEF_NO_INDEXED_ITEMS
svf->set_index(e->get_index());
svb->twin()->set_index(svb->new_index());
#endif
}
pl->add_edge(svf);
pl->add_edge(svb);
: Base(d), vs(v), edge_splitted(false), vertex_added(false) {}
void handle_splits(Halfedge_handle e, SVertex_handle svf, SVertex_handle svb) override {
edge_splitted = true;
if(e->source()->point() < e->twin()->source()->point())
second_half = svf;
@ -140,28 +67,11 @@ class Ray_hit_generator2 : public Modifier_base<typename Nef_::SNC_and_PL> {
<< "->" << second_half->twin()->source()->point());
vertex_added = true;
return v;
}
Halffacet_handle f;
if(assign(f, o)) {
CGAL_NEF_TRACEN("Found facet ");
SNC_intersection::does_intersect_internally(r, f, ip);
ip = normalized(ip);
v = C.create_from_facet(f,ip);
pl->add_vertex(v);
CGAL_NEF_TRACEN("new vertex " << ip);
return v;
}
CGAL_error_msg( "ray should hit vertex, edge, or facet");
return Vertex_handle();
}
void operator()(SNC_and_PL& sncpl) {
sncp = sncpl.sncp;
pl = sncpl.pl;
void operator()(SNC_and_PL& sncpl) override {
Base::sncp = sncpl.sncp;
Base::pl = sncpl.pl;
edge_splitted = false;
vertex_added = false;
@ -170,11 +80,11 @@ class Ray_hit_generator2 : public Modifier_base<typename Nef_::SNC_and_PL> {
<< " (" << dir << ")");
SM_walls smw(&*vs);
SVertex_handle sv1, sv2;
if(smw.need_to_shoot(Sphere_point(dir),sv1)) {
Ray_3 r(vs->point(), dir);
v_new = create_vertex_on_first_hit(r);
if(smw.need_to_shoot(Sphere_point(Base::dir),sv1)) {
Ray_3 r(vs->point(), Base::dir);
v_new = Base::create_vertex_on_first_hit(r);
SM_walls smw(&*v_new);
sv2 = smw.add_ray_svertex(Sphere_point(-dir));
sv2 = smw.add_ray_svertex(Sphere_point(-Base::dir));
CGAL_NEF_TRACEN("sv1 " << sv1->source()->point() << "( " << sv1->point() << ")");
CGAL_NEF_TRACEN("sv2 " << sv2->source()->point() << "( " << sv2->point() << ")");
sv1->twin() = sv2; // TODO: why is this necessary?