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

made initial bounding box more precise and added margin around the bbox

This commit is contained in:
Shepard Liu 2025-07-23 17:08:17 +08:00
parent fb9afae4ac
commit b3657277d7
3 changed files with 169 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Arrangement_on_surface_2/include/CGAL/Draw_aos/Arr_viewer.h
View File

@ -103,7 +103,8 @@ private:
this->camera_->computeModelViewMatrix(); this->camera_->computeModelViewMatrix();
this->camera_->getProjectionMatrix(proj_mat.data()); this->camera_->getProjectionMatrix(proj_mat.data());
this->camera_->getModelViewMatrix(mv_mat.data()); this->camera_->getModelViewMatrix(mv_mat.data());
if(proj_mat == m_last_proj_matrix && mv_mat == m_last_modelview_matrix) return false; if(proj_mat == m_last_proj_matrix && mv_mat == m_last_modelview_matrix)
return false;
m_last_proj_matrix = proj_mat; m_last_proj_matrix = proj_mat;
m_last_modelview_matrix = mv_mat; m_last_modelview_matrix = mv_mat;
return true; return true;
@ -119,15 +120,28 @@ private:
} }
Bbox_2 initial_bbox() const { Bbox_2 initial_bbox() const {
const auto& traits = *m_arr.geometry_traits();
Bbox_2 bbox; Bbox_2 bbox;
// Computes a rough bounding box from the vertices. // Computes a rough bounding box from the vertices.
for(const auto& vh : m_arr.vertex_handles()) { for(const auto& vh : m_arr.vertex_handles()) {
Approx_point pt = m_arr.geometry_traits()->approximate_2_object()(vh->point()); bbox += traits.approximate_2_object()(vh->point()).bbox();
bbox += pt.bbox();
} }
double approx_error = get_approx_error(bbox);
// Computes a more precise bounding box from the halfedges.
for(const auto& he : m_arr.halfedge_handles()) {
traits.approximate_2_object()(
he->curve(), approx_error,
boost::make_function_output_iterator([&bbox](const Approx_point& pt) { bbox += pt.bbox(); }));
}
// Place margin around the bbox.
double dx = bbox.x_span() * 0.1;
double dy = bbox.y_span() * 0.1;
bbox = Bbox_2(bbox.xmin() - dx, bbox.ymin() - dy, bbox.xmax() + dx, bbox.ymax() + dy);
// Make sure the bbox is not degenerate. // Make sure the bbox is not degenerate.
if(bbox.x_span() == 0) bbox += Bbox_2(bbox.xmin() - 1, bbox.ymin(), bbox.xmax() + 1, bbox.ymax()); if(bbox.x_span() == 0)
if(bbox.y_span() == 0) bbox += Bbox_2(bbox.xmin(), bbox.ymin() - 1, bbox.xmax(), bbox.ymax() + 1); bbox += Bbox_2(bbox.xmin() - 1, bbox.ymin(), bbox.xmax() + 1, bbox.ymax());
if(bbox.y_span() == 0)
bbox += Bbox_2(bbox.xmin(), bbox.ymin() - 1, bbox.xmax(), bbox.ymax() + 1);
return bbox; return bbox;
} }
@ -149,7 +163,8 @@ private:
double ymax = std::numeric_limits<double>::lowest(); double ymax = std::numeric_limits<double>::lowest();
for(const QVector4D& corner : clip_space_corners) { for(const QVector4D& corner : clip_space_corners) {
QVector4D world = inverse_mvp * corner; QVector4D world = inverse_mvp * corner;
if(world.w() != 0.0) world /= world.w(); if(world.w() != 0.0)
world /= world.w();
double x = world.x(); double x = world.x();
double y = world.y(); double y = world.y();
xmin = std::min(xmin, x); xmin = std::min(xmin, x);
@ -193,7 +208,7 @@ private:
#endif #endif
// add faces // add faces
for (const auto& [fh, face_tris] : cache.face_cache()) { for(const auto& [fh, face_tris] : cache.face_cache()) {
const auto& points = face_tris.points; const auto& points = face_tris.points;
const auto& tris = face_tris.triangles; const auto& tris = face_tris.triangles;
bool draw_face = m_gso.colored_face(m_arr, fh); bool draw_face = m_gso.colored_face(m_arr, fh);
@ -202,21 +217,24 @@ private:
m_gs.face_begin(m_gso.face_color(m_arr, fh)); m_gs.face_begin(m_gso.face_color(m_arr, fh));
else else
m_gs.face_begin(); m_gs.face_begin();
for(const auto idx : t) m_gs.add_point_in_face(points[idx]); for(const auto idx : t)
m_gs.add_point_in_face(points[idx]);
m_gs.face_end(); m_gs.face_end();
} }
} }
// add edges // add edges
for(const auto& [he, polyline] : cache.halfedge_cache()) { for(const auto& [he, polyline] : cache.halfedge_cache()) {
if(polyline.size() < 2) continue; if(polyline.size() < 2)
continue;
bool draw_colored_edge = m_gso.colored_edge(m_arr, he); bool draw_colored_edge = m_gso.colored_edge(m_arr, he);
auto color = draw_colored_edge ? m_gso.edge_color(m_arr, he) : CGAL::IO::Color(); auto color = draw_colored_edge ? m_gso.edge_color(m_arr, he) : CGAL::IO::Color();
for(size_t i = 0; i < polyline.size() - 1; ++i) { for(size_t i = 0; i < polyline.size() - 1; ++i) {
const auto& cur_pt = polyline[i]; const auto& cur_pt = polyline[i];
const auto& next_pt = polyline[i + 1]; const auto& next_pt = polyline[i + 1];
auto mid_pt = CGAL::midpoint(cur_pt, next_pt); auto mid_pt = CGAL::midpoint(cur_pt, next_pt);
if(!contains(bbox, mid_pt)) continue; if(!contains(bbox, mid_pt))
continue;
if(draw_colored_edge) if(draw_colored_edge)
m_gs.add_segment(cur_pt, next_pt, color); m_gs.add_segment(cur_pt, next_pt, color);
else else
@ -226,7 +244,8 @@ private:
// add vertices // add vertices
for(const auto& [vh, pt] : cache.vertex_cache()) { for(const auto& [vh, pt] : cache.vertex_cache()) {
if(!contains(bbox, pt)) continue; if(!contains(bbox, pt))
continue;
if(m_gso.colored_vertex(m_arr, vh)) if(m_gso.colored_vertex(m_arr, vh))
m_gs.add_point(pt, m_gso.vertex_color(m_arr, vh)); m_gs.add_point(pt, m_gso.vertex_color(m_arr, vh));
else else
@ -234,7 +253,8 @@ private:
} }
// keep scene non-empty to make sure that the Basic_viewer works in 2D mode for planar arrangements. // keep scene non-empty to make sure that the Basic_viewer works in 2D mode for planar arrangements.
if(m_gs.empty()) fill_background(bbox); if(m_gs.empty())
fill_background(bbox);
} }
/*! /*!
@ -254,7 +274,7 @@ public:
, m_pl(arr) {} , m_pl(arr) {}
virtual void draw() override { virtual void draw() override {
if (is_camera_changed()) { if(is_camera_changed()) {
Bbox_2 bbox = view_bbox_from_camera(); Bbox_2 bbox = view_bbox_from_camera();
#if defined(CGAL_DRAW_AOS_DEBUG) #if defined(CGAL_DRAW_AOS_DEBUG)

22
Arrangement_on_surface_2/include/CGAL/Draw_aos/type_utils.h
View File

@ -17,17 +17,21 @@ enum class Side_of_boundary {
}; };
template <typename, typename = std::void_t<>> template <typename, typename = std::void_t<>>
struct has_construct_x_monotone_curve_2 : std::false_type {}; struct has_construct_x_monotone_curve_2 : std::false_type
{};
template <typename T> template <typename T>
struct has_construct_x_monotone_curve_2<T, std::void_t<typename T::Construct_x_monotone_curve_2>> : std::true_type {}; struct has_construct_x_monotone_curve_2<T, std::void_t<typename T::Construct_x_monotone_curve_2>> : std::true_type
{};
template <typename, typename = std::void_t<>> template <typename, typename = std::void_t<>>
struct has_approximate_2_object : std::false_type {}; struct has_approximate_2_object : std::false_type
{};
// Specialization: detection succeeds if decltype(T::approximate_2_object()) is valid // Specialization: detection succeeds if decltype(T::approximate_2_object()) is valid
template <typename T> template <typename T>
struct has_approximate_2_object<T, std::void_t<decltype(std::declval<T>().approximate_2_object())>> : std::true_type {}; struct has_approximate_2_object<T, std::void_t<decltype(std::declval<T>().approximate_2_object())>> : std::true_type
{};
// Convenience variable // Convenience variable
template <typename T> template <typename T>
@ -36,12 +40,13 @@ inline constexpr bool has_approximate_2_object_v = has_approximate_2_object<T>::
// Primary templates: detection fails by default // Primary templates: detection fails by default
// Does a class have operator()(const Point&)? // Does a class have operator()(const Point&)?
template <typename, typename, typename = std::void_t<>> template <typename, typename, typename = std::void_t<>>
struct has_operator_point : std::false_type {}; struct has_operator_point : std::false_type
{};
// Specialization: detection succeeds if decltype works out // Specialization: detection succeeds if decltype works out
template <typename T, typename A> template <typename T, typename A>
struct has_operator_point<T, A, std::void_t<decltype(std::declval<A>()(std::declval<const typename T::Point_2&>()))>> : struct has_operator_point<T, A, std::void_t<decltype(std::declval<A>()(std::declval<const typename T::Point_2&>()))>>
std::true_type : std::true_type
{}; {};
// Convenience variable // Convenience variable
@ -51,7 +56,8 @@ inline constexpr bool has_operator_point_v = has_operator_point<T, A>::value;
// Primary templates: detection fails by default // Primary templates: detection fails by default
// Does a class have operator()(const X_monotone_curve&)? // Does a class have operator()(const X_monotone_curve&)?
template <typename, typename, typename, typename = std::void_t<>> template <typename, typename, typename, typename = std::void_t<>>
struct has_operator_xcv : std::false_type {}; struct has_operator_xcv : std::false_type
{};
/*! /*!
*/ */

198
Arrangement_on_surface_2/include/CGAL/draw_arrangement_2.h
View File

@ -45,11 +45,13 @@ namespace draw_function_for_arrangement_2 {
// Primary templates: detection fails by default // Primary templates: detection fails by default
// Does the traits have approximate_2_object()? // Does the traits have approximate_2_object()?
template <typename, typename = std::void_t<>> template <typename, typename = std::void_t<>>
struct has_approximate_2_object : std::false_type {}; struct has_approximate_2_object : std::false_type
{};
// Specialization: detection succeeds if decltype(T::approximate_2_object()) is valid // Specialization: detection succeeds if decltype(T::approximate_2_object()) is valid
template <typename T> template <typename T>
struct has_approximate_2_object<T, std::void_t<decltype(std::declval<T>().approximate_2_object())>> : std::true_type {}; struct has_approximate_2_object<T, std::void_t<decltype(std::declval<T>().approximate_2_object())>> : std::true_type
{};
// Convenience variable // Convenience variable
template <typename T> template <typename T>
@ -60,7 +62,8 @@ inline constexpr bool has_approximate_2_object_v = has_approximate_2_object<T>::
// Primary templates: detection fails by default // Primary templates: detection fails by default
// Does a class have operator()(const Point&)? // Does a class have operator()(const Point&)?
template <typename, typename, typename = std::void_t<>> template <typename, typename, typename = std::void_t<>>
struct has_operator_point : std::false_type {}; struct has_operator_point : std::false_type
{};
// Specialization: detection succeeds if decltype works out // Specialization: detection succeeds if decltype works out
template <typename T, typename A> template <typename T, typename A>
@ -77,7 +80,8 @@ inline constexpr bool has_operator_point_v = has_operator_point<T, A>::value;
// Primary templates: detection fails by default // Primary templates: detection fails by default
// Does a class have operator()(const X_monotone_curve&)? // Does a class have operator()(const X_monotone_curve&)?
template <typename, typename, typename = std::void_t<>> template <typename, typename, typename = std::void_t<>>
struct has_operator_xcv : std::false_type {}; struct has_operator_xcv : std::false_type
{};
// Specialization: detection succeeds if decltype works out // Specialization: detection succeeds if decltype works out
struct Dummy_output struct Dummy_output
@ -101,7 +105,8 @@ inline constexpr bool has_operator_xcv_v = has_operator_xcv<T, A>::value;
// Helper: detect whether T is or derives from Arr_geodesic_arc_on_sphere_traits_2<*, *, *> // Helper: detect whether T is or derives from Arr_geodesic_arc_on_sphere_traits_2<*, *, *>
template <typename T> template <typename T>
struct is_or_derived_from_agas { struct is_or_derived_from_agas
{
private: private:
template <typename Kernel_, int AtanX, int AtanY> template <typename Kernel_, int AtanX, int AtanY>
static std::true_type test(const Arr_geodesic_arc_on_sphere_traits_2<Kernel_, AtanX, AtanY>*); static std::true_type test(const Arr_geodesic_arc_on_sphere_traits_2<Kernel_, AtanX, AtanY>*);
@ -119,7 +124,8 @@ inline constexpr bool is_or_derived_from_agas_v = is_or_derived_from_agas<T>::va
/// ///
template <typename Arr, typename GSOptions> template <typename Arr, typename GSOptions>
class Draw_arr_tool { class Draw_arr_tool
{
public: public:
using Halfedge_const_handle = typename Arr::Halfedge_const_handle; using Halfedge_const_handle = typename Arr::Halfedge_const_handle;
using Vertex_const_handle = typename Arr::Vertex_const_handle; using Vertex_const_handle = typename Arr::Vertex_const_handle;
@ -133,18 +139,18 @@ public:
/*! Construct /*! Construct
*/ */
Draw_arr_tool(Arr& a_aos, CGAL::Graphics_scene& a_gs, const GSOptions& a_gso) : Draw_arr_tool(Arr& a_aos, CGAL::Graphics_scene& a_gs, const GSOptions& a_gso)
m_aos(a_aos), : m_aos(a_aos)
m_gs(a_gs), , m_gs(a_gs)
m_gso(a_gso) , m_gso(a_gso) {}
{}
/// Add a face. /// Add a face.
void add_face(Face_const_handle face) { void add_face(Face_const_handle face) {
// std::cout << "add_face()\n"; // std::cout << "add_face()\n";
for(Inner_ccb_const_iterator it = face->inner_ccbs_begin(); it != face->inner_ccbs_end(); ++it) add_ccb(*it); for(Inner_ccb_const_iterator it = face->inner_ccbs_begin(); it != face->inner_ccbs_end(); ++it)
add_ccb(*it);
for (Outer_ccb_const_iterator it = face->outer_ccbs_begin(); it != face->outer_ccbs_end(); ++it) { for(Outer_ccb_const_iterator it = face->outer_ccbs_begin(); it != face->outer_ccbs_end(); ++it) {
add_ccb(*it); add_ccb(*it);
draw_region(*it); draw_region(*it);
} }
@ -156,7 +162,8 @@ public:
auto curr = circ; auto curr = circ;
do { do {
auto new_face = curr->twin()->face(); auto new_face = curr->twin()->face();
if(m_visited.find(new_face) != m_visited.end()) continue; if(m_visited.find(new_face) != m_visited.end())
continue;
m_visited[new_face] = true; m_visited[new_face] = true;
add_face(new_face); add_face(new_face);
} while(++curr != circ); } while(++curr != circ);
@ -180,8 +187,10 @@ public:
* *
* For now we use C++14 features. * For now we use C++14 features.
*/ */
if (m_gso.colored_face(m_aos, circ->face())) m_gs.face_begin(m_gso.face_color(m_aos, circ->face())); if(m_gso.colored_face(m_aos, circ->face()))
else m_gs.face_begin(); m_gs.face_begin(m_gso.face_color(m_aos, circ->face()));
else
m_gs.face_begin();
const auto* traits = this->m_aos.geometry_traits(); const auto* traits = this->m_aos.geometry_traits();
auto ext = find_smallest(circ, *traits); auto ext = find_smallest(circ, *traits);
@ -189,8 +198,10 @@ public:
do { do {
// Skip halfedges that are "antenas": // Skip halfedges that are "antenas":
while(curr->face() == curr->twin()->face()) curr = curr->twin()->next(); while(curr->face() == curr->twin()->face())
while(curr->face() == curr->twin()->face()) curr = curr->twin()->next(); curr = curr->twin()->next();
while(curr->face() == curr->twin()->face())
curr = curr->twin()->next();
draw_region_impl1(*traits, curr); draw_region_impl1(*traits, curr);
curr = curr->next(); curr = curr->next();
} while(curr != ext); } while(curr != ext);
@ -202,19 +213,22 @@ public:
/// ///
template <typename T, typename A, std::enable_if_t<!has_operator_point_v<T, A>, int> = 0> template <typename T, typename A, std::enable_if_t<!has_operator_point_v<T, A>, int> = 0>
void draw_region_impl2(const T& /* traits */, const A& /* approximate */, Halfedge_const_handle curr) void draw_region_impl2(const T& /* traits */, const A& /* approximate */, Halfedge_const_handle curr) {
{ draw_exact_region(curr); } draw_exact_region(curr);
}
/// ///
template <typename T, typename A, std::enable_if_t<has_operator_point_v<T, A>, int> = 0> template <typename T, typename A, std::enable_if_t<has_operator_point_v<T, A>, int> = 0>
auto draw_region_impl2(const T& /* traits */, const A& approx, Halfedge_const_handle curr) auto draw_region_impl2(const T& /* traits */, const A& approx, Halfedge_const_handle curr) {
{ draw_approximate_region(curr, approx); } draw_approximate_region(curr, approx);
}
/*! Draw a region, where the traits does not has approximate_2_object. /*! Draw a region, where the traits does not has approximate_2_object.
*/ */
template <typename T, std::enable_if_t<!has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0> template <typename T, std::enable_if_t<!has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0>
void draw_region_impl1(const T& /* traits */, Halfedge_const_handle curr) void draw_region_impl1(const T& /* traits */, Halfedge_const_handle curr) {
{ draw_exact_region(curr); } draw_exact_region(curr);
}
/// ///
template <typename T, std::enable_if_t<has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0> template <typename T, std::enable_if_t<has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0>
@ -244,10 +258,12 @@ public:
double error(0.01); // TODO? (this->pixel_ratio()); double error(0.01); // TODO? (this->pixel_ratio());
bool l2r = curr->direction() == ARR_LEFT_TO_RIGHT; bool l2r = curr->direction() == ARR_LEFT_TO_RIGHT;
approx(curr->curve(), error, std::back_inserter(polyline), l2r); approx(curr->curve(), error, std::back_inserter(polyline), l2r);
if(polyline.empty()) return; if(polyline.empty())
return;
auto it = polyline.begin(); auto it = polyline.begin();
auto prev = it++; auto prev = it++;
for(; it != polyline.end(); prev = it++) m_gs.add_point_in_face(*prev); for(; it != polyline.end(); prev = it++)
m_gs.add_point_in_face(*prev);
} }
/*! Draw an exact curve. /*! Draw an exact curve.
@ -258,8 +274,10 @@ public:
auto ctr_min = traits->construct_min_vertex_2_object(); auto ctr_min = traits->construct_min_vertex_2_object();
auto ctr_max = traits->construct_max_vertex_2_object(); auto ctr_max = traits->construct_max_vertex_2_object();
m_gs.add_segment(ctr_min(curve), ctr_max(curve)); m_gs.add_segment(ctr_min(curve), ctr_max(curve));
if (colored) m_gs.add_segment(ctr_min(curve), ctr_max(curve), c); if(colored)
else m_gs.add_segment(ctr_min(curve), ctr_max(curve)); m_gs.add_segment(ctr_min(curve), ctr_max(curve), c);
else
m_gs.add_segment(ctr_min(curve), ctr_max(curve));
} }
/*! Draw a region in an exact manner. /*! Draw a region in an exact manner.
@ -270,7 +288,8 @@ public:
/// Add all faces. /// Add all faces.
template <typename Traits> template <typename Traits>
void add_faces(const Traits&) { void add_faces(const Traits&) {
for(auto it = m_aos.unbounded_faces_begin(); it != m_aos.unbounded_faces_end(); ++it) add_face(it); for(auto it = m_aos.unbounded_faces_begin(); it != m_aos.unbounded_faces_end(); ++it)
add_face(it);
} }
/// Compile time dispatching /// Compile time dispatching
@ -279,39 +298,47 @@ public:
*/ */
template <typename Approximate> template <typename Approximate>
void draw_approximate_point(const Point& p, const Approximate& approx, bool colored, const CGAL::IO::Color& color) { void draw_approximate_point(const Point& p, const Approximate& approx, bool colored, const CGAL::IO::Color& color) {
if (colored) m_gs.add_point(approx(p), color); if(colored)
else m_gs.add_point(approx(p)); m_gs.add_point(approx(p), color);
else
m_gs.add_point(approx(p));
} }
/// ///
void draw_exact_point(const Point& p, bool colored, const CGAL::IO::Color& color) { void draw_exact_point(const Point& p, bool colored, const CGAL::IO::Color& color) {
if (colored) m_gs.add_point(p, color); if(colored)
else m_gs.add_point(p); m_gs.add_point(p, color);
else
m_gs.add_point(p);
} }
/// ///
template <typename T, typename A, std::enable_if_t<!has_operator_point_v<T, A>, int> = 0> template <typename T, typename A, std::enable_if_t<!has_operator_point_v<T, A>, int> = 0>
void draw_point_impl2(const T& /* traits */, const A& /* approximate */, const Point& p, bool colored, void draw_point_impl2(
const CGAL::IO::Color& c) const T& /* traits */, const A& /* approximate */, const Point& p, bool colored, const CGAL::IO::Color& c) {
{ draw_exact_point(p, colored, c); } draw_exact_point(p, colored, c);
}
/// ///
template <typename T, typename A, std::enable_if_t<has_operator_point_v<T, A>, int> = 0> template <typename T, typename A, std::enable_if_t<has_operator_point_v<T, A>, int> = 0>
auto auto
draw_point_impl2(const T& /* traits */, const A& approx, const Point& p, bool colored, const CGAL::IO::Color& c) draw_point_impl2(const T& /* traits */, const A& approx, const Point& p, bool colored, const CGAL::IO::Color& c) {
{ draw_approximate_point(p, approx, colored, c); } draw_approximate_point(p, approx, colored, c);
}
/*! Draw a point, where the traits does not has approximate_2_object. /*! Draw a point, where the traits does not has approximate_2_object.
*/ */
template <typename T, std::enable_if_t<!has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0> template <typename T, std::enable_if_t<!has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0>
void draw_point_impl1(const T& /* traits */, const Point& p, bool colored, const CGAL::IO::Color& c) void draw_point_impl1(const T& /* traits */, const Point& p, bool colored, const CGAL::IO::Color& c) {
{ draw_exact_point(p, colored, c); } draw_exact_point(p, colored, c);
}
/*! Draw a point, where the traits does have approximate_2_object. /*! Draw a point, where the traits does have approximate_2_object.
*/ */
template <typename T, std::enable_if_t<has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0> template <typename T, std::enable_if_t<has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0>
auto draw_point_impl1(const T& traits, const Point& p, bool colored, const CGAL::IO::Color& c) auto draw_point_impl1(const T& traits, const Point& p, bool colored, const CGAL::IO::Color& c) {
{ draw_point_impl2(traits, traits.approximate_2_object(), p, colored, c); } draw_point_impl2(traits, traits.approximate_2_object(), p, colored, c);
}
/*! Draw a geodesic point. /*! Draw a geodesic point.
*/ */
@ -328,8 +355,10 @@ public:
auto z = ap.dz(); auto z = ap.dz();
auto l = std::sqrt(x * x + y * y + z * z); auto l = std::sqrt(x * x + y * y + z * z);
Approx_point_3 p3(x / l, y / l, z / l); Approx_point_3 p3(x / l, y / l, z / l);
if (colored) m_gs.add_point(p3, color); if(colored)
else m_gs.add_point(p3); m_gs.add_point(p3, color);
else
m_gs.add_point(p3);
} }
/// Draw a point. /// Draw a point.
@ -341,8 +370,9 @@ public:
/// ///
template <typename Kernel, int AtanX, int AtanY> template <typename Kernel, int AtanX, int AtanY>
Halfedge_const_handle find_smallest(Ccb_halfedge_const_circulator circ, Halfedge_const_handle find_smallest(Ccb_halfedge_const_circulator circ,
Arr_geodesic_arc_on_sphere_traits_2<Kernel, AtanX, AtanY> const&) Arr_geodesic_arc_on_sphere_traits_2<Kernel, AtanX, AtanY> const&) {
{ return circ; } return circ;
}
/*! Find the halfedge incident to the lexicographically smallest vertex /*! Find the halfedge incident to the lexicographically smallest vertex
* along the CCB, such that there is no other halfedge underneath. * along the CCB, such that there is no other halfedge underneath.
@ -357,7 +387,8 @@ public:
// Find the first halfedge directed from left to right // Find the first halfedge directed from left to right
auto curr = circ; auto curr = circ;
do do
if(curr->direction() == CGAL::ARR_LEFT_TO_RIGHT) break; if(curr->direction() == CGAL::ARR_LEFT_TO_RIGHT)
break;
while(++curr != circ); while(++curr != circ);
Halfedge_const_handle ext = curr; Halfedge_const_handle ext = curr;
@ -365,22 +396,25 @@ public:
// such that there is no other halfedge underneath. // such that there is no other halfedge underneath.
do { do {
// Discard edges not directed from left to right: // Discard edges not directed from left to right:
if(curr->direction() != CGAL::ARR_LEFT_TO_RIGHT) continue; if(curr->direction() != CGAL::ARR_LEFT_TO_RIGHT)
continue;
auto res = cmp_xy(curr->source()->point(), ext->source()->point()); auto res = cmp_xy(curr->source()->point(), ext->source()->point());
// Discard the edges inciden to a point strictly larger than the point // Discard the edges inciden to a point strictly larger than the point
// incident to the stored extreme halfedge: // incident to the stored extreme halfedge:
if(res == LARGER) continue; if(res == LARGER)
continue;
// Store the edge inciden to a point strictly smaller: // Store the edge inciden to a point strictly smaller:
if (res == SMALLER) { if(res == SMALLER) {
ext = curr; ext = curr;
continue; continue;
} }
// The incident points are equal; compare the halfedges themselves: // The incident points are equal; compare the halfedges themselves:
if(cmp_y(curr->curve(), ext->curve(), curr->source()->point()) == SMALLER) ext = curr; if(cmp_y(curr->curve(), ext->curve(), curr->source()->point()) == SMALLER)
ext = curr;
} while(++curr != circ); } while(++curr != circ);
return ext; return ext;
@ -392,27 +426,33 @@ public:
// std::cout << "ratio: " << this->pixel_ratio() << std::endl; // std::cout << "ratio: " << this->pixel_ratio() << std::endl;
m_visited.clear(); m_visited.clear();
if(m_aos.is_empty()) return; if(m_aos.is_empty())
return;
if(m_gso.are_faces_enabled()) add_faces(*(this->m_aos.geometry_traits())); if(m_gso.are_faces_enabled())
add_faces(*(this->m_aos.geometry_traits()));
// Add edges that do not separate faces. // Add edges that do not separate faces.
if (m_gso.are_edges_enabled()) { if(m_gso.are_edges_enabled()) {
for (auto it = m_aos.edges_begin(); it != m_aos.edges_end(); ++it) { for(auto it = m_aos.edges_begin(); it != m_aos.edges_end(); ++it) {
if (it->face() != it->twin()->face()) { if(it->face() != it->twin()->face()) {
if (m_gso.draw_edge(m_aos, it)) { if(m_gso.draw_edge(m_aos, it)) {
if (m_gso.colored_edge(m_aos, it)) draw_curve(it->curve(), true, m_gso.edge_color(m_aos, it)); if(m_gso.colored_edge(m_aos, it))
else draw_curve(it->curve(), false, CGAL::IO::Color()); draw_curve(it->curve(), true, m_gso.edge_color(m_aos, it));
else
draw_curve(it->curve(), false, CGAL::IO::Color());
} }
} }
} }
} }
// Add all points // Add all points
if (m_gso.are_vertices_enabled()) { if(m_gso.are_vertices_enabled()) {
for (auto it = m_aos.vertices_begin(); it != m_aos.vertices_end(); ++it) { for(auto it = m_aos.vertices_begin(); it != m_aos.vertices_end(); ++it) {
if (m_gso.colored_vertex(m_aos, it)) draw_point(it->point(), true, m_gso.vertex_color(m_aos, it)); if(m_gso.colored_vertex(m_aos, it))
else draw_point(it->point(), false, CGAL::IO::Color()); draw_point(it->point(), true, m_gso.vertex_color(m_aos, it));
else
draw_point(it->point(), false, CGAL::IO::Color());
} }
} }
@ -434,12 +474,15 @@ public:
std::vector<typename Gt::Approximate_point_2> polyline; std::vector<typename Gt::Approximate_point_2> polyline;
double error(0.01); // TODO? (this->pixel_ratio()); double error(0.01); // TODO? (this->pixel_ratio());
approx(curve, error, std::back_inserter(polyline)); approx(curve, error, std::back_inserter(polyline));
if(polyline.empty()) return; if(polyline.empty())
return;
auto it = polyline.begin(); auto it = polyline.begin();
auto prev = it++; auto prev = it++;
for (; it != polyline.end(); prev = it++) { for(; it != polyline.end(); prev = it++) {
if (colored) m_gs.add_segment(*prev, *it, c); if(colored)
else m_gs.add_segment(*prev, *it); m_gs.add_segment(*prev, *it, c);
else
m_gs.add_segment(*prev, *it);
} }
} }
@ -449,20 +492,23 @@ public:
const A& /* approximate */, const A& /* approximate */,
const X_monotone_curve& xcv, const X_monotone_curve& xcv,
bool colored, bool colored,
const CGAL::IO::Color& c) const CGAL::IO::Color& c) {
{ draw_exact_curve(xcv, colored, c); } draw_exact_curve(xcv, colored, c);
}
/// ///
template <typename T, typename A, std::enable_if_t<has_operator_point_v<T, A>, int> = 0> template <typename T, typename A, std::enable_if_t<has_operator_point_v<T, A>, int> = 0>
auto draw_curve_impl2(const T& /* traits */, const A& approx, const X_monotone_curve& xcv, bool colored, auto draw_curve_impl2(
const CGAL::IO::Color& c) const T& /* traits */, const A& approx, const X_monotone_curve& xcv, bool colored, const CGAL::IO::Color& c) {
{ draw_approximate_curve(xcv, approx, colored, c); } draw_approximate_curve(xcv, approx, colored, c);
}
/*! Draw a curve, where the traits does not has approximate_2_object. /*! Draw a curve, where the traits does not has approximate_2_object.
*/ */
template <typename T, std::enable_if_t<!has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0> template <typename T, std::enable_if_t<!has_approximate_2_object_v<T> && !is_or_derived_from_agas_v<T>, int> = 0>
void draw_curve_impl1(const T& /* traits */, const X_monotone_curve& xcv, bool colored, const CGAL::IO::Color& c) void draw_curve_impl1(const T& /* traits */, const X_monotone_curve& xcv, bool colored, const CGAL::IO::Color& c) {
{ draw_exact_curve(xcv, colored, c); } draw_exact_curve(xcv, colored, c);
}
/*! Draw a curve, where the traits does have approximate_2_object. /*! Draw a curve, where the traits does have approximate_2_object.
*/ */
@ -493,13 +539,13 @@ public:
auto z = it->dz(); auto z = it->dz();
auto l = std::sqrt(x * x + y * y + z * z); auto l = std::sqrt(x * x + y * y + z * z);
Approx_point_3 prev(x / l, y / l, z / l); Approx_point_3 prev(x / l, y / l, z / l);
for (++it; it != apoints.end(); ++it) { for(++it; it != apoints.end(); ++it) {
auto x = it->dx(); auto x = it->dx();
auto y = it->dy(); auto y = it->dy();
auto z = it->dz(); auto z = it->dz();
auto l = std::sqrt(x * x + y * y + z * z); auto l = std::sqrt(x * x + y * y + z * z);
Approx_point_3 next(x / l, y / l, z / l); Approx_point_3 next(x / l, y / l, z / l);
if (colored) if(colored)
m_gs.add_segment(prev, next, c); m_gs.add_segment(prev, next, c);
else else
m_gs.add_segment(prev, next); m_gs.add_segment(prev, next);