phynexis-deps/cgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed Infinity_type to Boundary_type.

Browse Source
This commit is contained in:
Ron Wein
2006-12-11 15:35:58 +00:00
parent 41b652da56
commit c38c22bad8
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Envelope_3/doc_tex/Envelope_3_ref/EnvelopeTraits_3.tex
+2 -2
View File
@@ -10,7 +10,7 @@ operations needed to compute the envelope of a set of arbitrary
surfaces in $\reals^3$. It refines the
\ccc{ArrangementXMonotoneTraits_2} concept. In addition to the
\ccc{Point_2} and \ccc{X_monotone_curve_2} types and the
\ccc{Has_infinite_category} category tag listed in the base concept,
\ccc{Has_boundary_category} category tag listed in the base concept,
it also lists the \ccc{Surface_3} and \ccc{Xy_monotone_surface_3}
types, which represent arbitrary surfaces and $xy$-monotone surfaces,
respectively, and some constructions and predicates on these types.
@@ -118,7 +118,7 @@ Note however, that these operations usually involve the projection of
at all.
The functor should therefore return the comparison result of
$s_1(p)$ and $s_2(p)$ for some planar point $p \in \reals^2$.
This operator is required iff the category tag \ccc{Has_infinite_category}
This operator is required iff the category tag \ccc{Has_boundary_category}
is defined as \ccc{Tag_true}.
\end{itemize}}
Envelope_3/include/CGAL/Env_plane_traits_3.h
+1 -1
View File
@@ -54,7 +54,7 @@ class Env_plane_traits_3 : public Arr_linear_traits_2<Kernel_>
typedef typename Kernel::Object_3 Object_3;
typedef std::pair<Curve_2,
Multiplicity> Intersection_curve;
typedef Tag_true Has_infinite_category;
typedef Tag_true Has_boundary_category;
class Is_vertical_3
Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h
+10 -10
View File
@@ -57,7 +57,7 @@ public:
typedef MinimizationDiagram_2 Minimization_diagram_2;
typedef typename Traits::Point_2 Point_2;
typedef typename Traits::X_monotone_curve_2 X_monotone_curve_2;
typedef typename Traits::Has_infinite_category Has_infinite_category;
typedef typename Traits::Has_boundary_category Has_boundary_category;
protected:
@@ -539,16 +539,16 @@ public:
// we will add the *icv end points to the split_points, unless
// but we should be carefull with infinite curves.
Arr_traits_adaptor_2<Traits> tr_adaptor(*traits);
if(tr_adaptor.infinite_in_y_2_object()(*icv, MIN_END) == FINITE &&
tr_adaptor.infinite_in_x_2_object()(*icv, MIN_END) == FINITE)
if(tr_adaptor.boundary_in_y_2_object()(*icv, MIN_END) == NO_BOUNDARY &&
tr_adaptor.boundary_in_x_2_object()(*icv, MIN_END) == NO_BOUNDARY)
split_points.push_back(Point_2_with_info(
traits->construct_min_vertex_2_object()(*icv),
true, false));
else
is_min_end_at_inf = true;
if(tr_adaptor.infinite_in_y_2_object()(*icv, MAX_END) == FINITE &&
tr_adaptor.infinite_in_x_2_object()(*icv, MAX_END) == FINITE)
if(tr_adaptor.boundary_in_y_2_object()(*icv, MAX_END) == NO_BOUNDARY &&
tr_adaptor.boundary_in_x_2_object()(*icv, MAX_END) == NO_BOUNDARY)
split_points.push_back(Point_2_with_info(
traits->construct_max_vertex_2_object()(*icv),
false, true));
@@ -815,7 +815,7 @@ protected:
else
{
//two infinite surfaces, no outer boundary or holes.
res = compare_distance_to_envelope(surf1,surf2, Has_infinite_category());
res = compare_distance_to_envelope(surf1,surf2, Has_boundary_category());
}
}
@@ -1962,15 +1962,15 @@ protected:
// and is also no isolated)
new_vertices.push_back(v);
}
void before_create_vertex_at_infinity(Infinity_type inf_x,
Infinity_type inf_y)
void before_create_vertex_at_infinity(Boundary_type inf_x,
Boundary_type inf_y)
{}
void after_create_vertex_at_infinity(Vertex_handle v)
{
Vertex_handle new_v =
big_arr_accessor.create_vertex_at_infinity(v->infinite_in_x(),
v->infinite_in_y());
big_arr_accessor.create_vertex_at_infinity(v->boundary_in_x(),
v->boundary_in_y());
map_vertices[v] = new_v;
}