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

API revisited

This commit is contained in:
Efi Fogel 2007-11-21 10:24:10 +00:00
parent 606bd0169b
commit f17b5d1eaf
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Boolean_set_operations_2/demo/Boolean_set_operations_2/makefile
View File

@ -15,7 +15,8 @@ include $(CGAL_MAKEFILE)
BSO_CXXFLAGS = BSO_CXXFLAGS =
CXXFLAGS = \ CXXFLAGS = \
-I ../../../../branches/experimental-packages/Arrangement_on_surface_2/include \ -I ../../../Arrangement_on_surface_2/include \
-I ../../../Installation/include \
-I ../../../Minkowski_sum_2/include \ -I ../../../Minkowski_sum_2/include \
-I../../include \ -I../../include \
$(BSO_CXXFLAGS) \ $(BSO_CXXFLAGS) \

4
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
View File

@ -308,7 +308,7 @@ class Gps_agg_meta_traits :
if(cv.data().halfedge() == Halfedge_handle()) if(cv.data().halfedge() == Halfedge_handle())
return (Point_2 (m_base(cv.base()))); return (Point_2 (m_base(cv.base())));
CGAL_assertion((Halfedge_direction)cv.data().halfedge()->direction() == LEFT_TO_RIGHT); CGAL_assertion((Arr_halfedge_direction)cv.data().halfedge()->direction() == ARR_LEFT_TO_RIGHT);
return Point_2 (m_base(cv.base()), cv.data().halfedge()->source()); return Point_2 (m_base(cv.base()), cv.data().halfedge()->source());
} }
}; };
@ -341,7 +341,7 @@ class Gps_agg_meta_traits :
if(cv.data().halfedge() == Halfedge_handle()) if(cv.data().halfedge() == Halfedge_handle())
return (Point_2 (m_base(cv.base()))); return (Point_2 (m_base(cv.base())));
CGAL_assertion((Halfedge_direction)cv.data().halfedge()->direction() == LEFT_TO_RIGHT); CGAL_assertion((Arr_halfedge_direction)cv.data().halfedge()->direction() == ARR_LEFT_TO_RIGHT);
return Point_2 (m_base(cv.base()), cv.data().halfedge()->target()); return Point_2 (m_base(cv.base()), cv.data().halfedge()->target());
} }
}; };

2
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
View File

@ -132,7 +132,7 @@ public:
Halfedge_iterator he = itr; Halfedge_iterator he = itr;
if(he->face()->contained() == he->twin()->face()->contained()) if(he->face()->contained() == he->twin()->face()->contained())
continue; continue;
if ((Halfedge_direction)he->direction() == RIGHT_TO_LEFT) if ((Arr_halfedge_direction)he->direction() == ARR_RIGHT_TO_LEFT)
he = he->twin(); he = he->twin();
Curve_data cv_data(arr, he, 1, 0); Curve_data cv_data(arr, he, 1, 0);

4
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h
View File

@ -227,7 +227,7 @@ public:
CGAL_assertion (vert_map.is_defined (he->source())); CGAL_assertion (vert_map.is_defined (he->source()));
CGAL_assertion (vert_map.is_defined (he->target())); CGAL_assertion (vert_map.is_defined (he->target()));
if ((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) if ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT)
{ {
e_left = vert_map[he->source()]; e_left = vert_map[he->source()];
e_right = vert_map[he->target()]; e_right = vert_map[he->target()];
@ -275,7 +275,7 @@ private:
// containment flags (otherwise we will simply not keep it). // containment flags (otherwise we will simply not keep it).
if (circ->face()->contained() != circ->twin()->face()->contained()) if (circ->face()->contained() != circ->twin()->face()->contained())
{ {
if ((Halfedge_direction)circ->direction() == LEFT_TO_RIGHT) if ((Arr_halfedge_direction)circ->direction() == ARR_LEFT_TO_RIGHT)
return (Base_event::RIGHT_END); return (Base_event::RIGHT_END);
else else
return (Base_event::LEFT_END); return (Base_event::LEFT_END);

8
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
View File

@ -116,7 +116,7 @@ private:
void insert_edge_to_hash(Halfedge_handle he, const X_monotone_curve_2& cv) void insert_edge_to_hash(Halfedge_handle he, const X_monotone_curve_2& cv)
{ {
const Comparison_result he_dir = const Comparison_result he_dir =
((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) ? SMALLER : LARGER; ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT) ? SMALLER : LARGER;
const Comparison_result cv_dir = const Comparison_result cv_dir =
this->m_arr_access.arrangement().traits()-> this->m_arr_access.arrangement().traits()->
@ -219,7 +219,7 @@ public:
Event *curr_event = reinterpret_cast<Event*>(this->current_event()); Event *curr_event = reinterpret_cast<Event*>(this->current_event());
Event *last_event = reinterpret_cast<Event*>((sc)->last_event()); Event *last_event = reinterpret_cast<Event*>((sc)->last_event());
CGAL_assertion ((Halfedge_direction)res_he->direction() == LEFT_TO_RIGHT); CGAL_assertion ((Arr_halfedge_direction)res_he->direction() == ARR_LEFT_TO_RIGHT);
_insert_vertex (curr_event, res_he->target()); _insert_vertex (curr_event, res_he->target());
_insert_vertex (last_event, res_he->source()); _insert_vertex (last_event, res_he->source());
@ -236,7 +236,7 @@ public:
// We now have a halfedge whose target vertex is associated with the // We now have a halfedge whose target vertex is associated with the
// last event (we have already dealt with its source vertex). // last event (we have already dealt with its source vertex).
Event *last_event = reinterpret_cast<Event*>((sc)->last_event()); Event *last_event = reinterpret_cast<Event*>((sc)->last_event());
CGAL_assertion ((Halfedge_direction)res_he->direction() == RIGHT_TO_LEFT); CGAL_assertion ((Arr_halfedge_direction)res_he->direction() == ARR_RIGHT_TO_LEFT);
_insert_vertex (last_event, res_he->target()); _insert_vertex (last_event, res_he->target());
return (res_he); return (res_he);
@ -253,7 +253,7 @@ public:
// current event (we have already dealt with its source vertex). // current event (we have already dealt with its source vertex).
Event *curr_event = reinterpret_cast<Event*>(this->current_event()); Event *curr_event = reinterpret_cast<Event*>(this->current_event());
CGAL_assertion ((Halfedge_direction)res_he->direction() == LEFT_TO_RIGHT); CGAL_assertion ((Arr_halfedge_direction)res_he->direction() == ARR_LEFT_TO_RIGHT);
_insert_vertex (curr_event, res_he->target()); _insert_vertex (curr_event, res_he->target());
return (res_he); return (res_he);

2
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h
View File

@ -79,7 +79,7 @@ public:
Halfedge_iterator he = eit; Halfedge_iterator he = eit;
const X_monotone_curve_2& cv = he->curve(); const X_monotone_curve_2& cv = he->curve();
const bool is_cont = he->face()->contained(); const bool is_cont = he->face()->contained();
const Comparison_result he_res = ((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) ? const Comparison_result he_res = ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT) ?
SMALLER : LARGER; SMALLER : LARGER;
const bool has_same_dir = (cmp_endpoints(cv) == he_res); const bool has_same_dir = (cmp_endpoints(cv) == he_res);

4
Boolean_set_operations_2/include/CGAL/General_polygon_set_2.h
View File

@ -430,7 +430,7 @@ public:
Halfedge_handle he = eit; Halfedge_handle he = eit;
const X_monotone_curve_2& cv = he->curve(); const X_monotone_curve_2& cv = he->curve();
const bool is_cont = he->face()->contained(); const bool is_cont = he->face()->contained();
const Comparison_result he_res = ((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) ? const Comparison_result he_res = ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT) ?
SMALLER : LARGER; SMALLER : LARGER;
const bool has_same_dir = (cmp_endpoints(cv) == he_res); const bool has_same_dir = (cmp_endpoints(cv) == he_res);
@ -569,7 +569,7 @@ public:
const X_monotone_curve_2& cv = he->curve(); const X_monotone_curve_2& cv = he->curve();
const bool is_cont = he->face()->contained(); const bool is_cont = he->face()->contained();
const Comparison_result he_res = ((Halfedge_direction)he->direction() == LEFT_TO_RIGHT) ? const Comparison_result he_res = ((Arr_halfedge_direction)he->direction() == ARR_LEFT_TO_RIGHT) ?
SMALLER : LARGER; SMALLER : LARGER;
const bool has_same_dir = (cmp_endpoints(cv) == he_res); const bool has_same_dir = (cmp_endpoints(cv) == he_res);