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

initiation of active edges should be good edges after visibility cone is introduced.

This commit is contained in:
kanhuang 2013-09-04 23:40:46 -04:00
parent 7945dc12da
commit 382e673b73
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Visibility_2/include/CGAL/Rotational_sweep_visibility_2_.h
View File

@ -105,7 +105,7 @@ public:
target = e->next()->target()->point(); target = e->next()->target()->point();
is_big_cone = CGAL::right_turn(source, q, target); is_big_cone = CGAL::right_turn(source, q, target);
Input_arrangement_2::Halfedge_around_vertex_const_circulator first, curr; typename Input_arrangement_2::Halfedge_around_vertex_const_circulator first, curr;
first = curr = e->target()->incident_halfedges(); first = curr = e->target()->incident_halfedges();
do { do {
if (curr->face() == e->face()) if (curr->face() == e->face())
@ -122,7 +122,7 @@ public:
bad_edges.push_back(e); bad_edges.push_back(e);
is_big_cone = false; is_big_cone = false;
} }
visibility_region_impl(e->face(), q, e); visibility_region_impl(e->face(), q);
//Decide which inside of the visibility butterfly is needed. //Decide which inside of the visibility butterfly is needed.
int source_i, target_i ; int source_i, target_i ;
@ -196,7 +196,7 @@ public:
is_vertex_query = false; is_vertex_query = false;
is_edge_query = false; is_edge_query = false;
visibility_region_impl(f, q, f->outer_ccb()); visibility_region_impl(f, q);
build_arr(polygon, out_arr); build_arr(polygon, out_arr);
conditional_regularize(out_arr, Regularization_tag()); conditional_regularize(out_arr, Regularization_tag());
@ -300,7 +300,7 @@ private:
} }
void visibility_region_impl(const Face_const_handle f, const Point_2& q, const Halfedge_const_handle e) { void visibility_region_impl(const Face_const_handle f, const Point_2& q) {
vs.clear(); vs.clear();
polygon.clear(); polygon.clear();
heap.clear(); heap.clear();
@ -325,31 +325,35 @@ private:
dp = Point_2(q.x()+dir.x(), q.y()+dir.y()); dp = Point_2(q.x()+dir.x(), q.y()+dir.y());
//initiation of active_edges //initiation of active_edges
if (is_vertex_query || is_edge_query) {
//TODO: just check intersection with good edges
for (int i=0; i!=bbox.size(); i++) {
if (do_intersect_ray(q, dp, bbox[i].first, bbox[i].second))
heap_insert(bbox[i]);
}
}
else {
Ccb_halfedge_const_circulator curr = f->outer_ccb(); Ccb_halfedge_const_circulator curr = f->outer_ccb();
Ccb_halfedge_const_circulator circ = curr; Ccb_halfedge_const_circulator circ = curr;
do { do {
Point_2 p1 = curr->target()->point(); Point_2 p1 = curr->target()->point();
Point_2 p2 = curr->source()->point(); Point_2 p2 = curr->source()->point();
if (q != p1 && q != p2 && do_intersect_ray(q, dp, p1, p2)) if (do_intersect_ray(q, dp, p1, p2))
heap_insert(create_pair(p1, p2)); heap_insert(create_pair(p1, p2));
} while (++curr != circ); } while (++curr != circ);
typename Arrangement_2::Hole_const_iterator hi; typename Arrangement_2::Hole_const_iterator hi;
for (hi = f->holes_begin(); hi != f->holes_end(); ++hi) { for (hi = f->holes_begin(); hi != f->holes_end(); ++hi) {
Ccb_halfedge_const_circulator c1 = *hi, c2 = *hi; Ccb_halfedge_const_circulator curr = *hi, circ = *hi;
do { do {
Point_2 p1 = c1->target()->point(); Point_2 p1 = curr->target()->point();
Point_2 p2 = c1->source()->point(); Point_2 p2 = curr->source()->point();
if (q != p1 && q != p2 && do_intersect_ray(q, dp, p1, p2)) if (do_intersect_ray(q, dp, p1, p2))
heap_insert(create_pair(p1, p2)); heap_insert(create_pair(p1, p2));
} while (++c1 != c2); } while (++curr != circ);
} }
for (int i=0; i!=bbox.size(); i++) {
if (do_intersect_ray(q, dp, bbox[i].first, bbox[i].second))
heap_insert(bbox[i]);
} }
//angular sweep begins //angular sweep begins
for (int i=0; i!=vs.size(); i++) { for (int i=0; i!=vs.size(); i++) {
@ -713,16 +717,16 @@ private:
} }
bool is_in_cone(Point_2 p) { bool is_in_cone(Point_2 p) {
if (is_big_cone) { if (is_big_cone) {
return !right_turn(source, q, p) || !left_turn(target, q, p); return (!right_turn(source, q, p)) || (!left_turn(target, q, p));
} }
else { else {
return !right_turn(source, q, p) && !left_turn(target, q, p); return (!right_turn(source, q, p)) && (!left_turn(target, q, p));
} }
} }
void input_edge(const Halfedge_const_handle e) { void input_edge(const Halfedge_const_handle e) {
for (int i=0; i<bad_edges.size(); i++) for (int i=0; i<bad_edges.size(); i++)
if (e = bad_edges[i]) if (e == bad_edges[i])
return; return;
Point_2 v1 = e->target()->point(); Point_2 v1 = e->target()->point();