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

Bug fix

This commit is contained in:
Guillaume Damiand 2019-11-13 11:51:54 +01:00
parent d638c80b5a
commit bb117e9792
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GraphicsView/include/CGAL/Buffer_for_vao.h
View File

@ -98,7 +98,7 @@ namespace internal
CGAL::Cartesian_converter<K, Local_kernel> converter; CGAL::Cartesian_converter<K, Local_kernel> converter;
return converter(v); return converter(v);
} }
static Local_ray get_local_ray(const typename K::Ray_2& r) static typename Local_kernel::Ray_2 get_local_ray(const typename K::Ray_2& r)
{ {
CGAL::Cartesian_converter<K, Local_kernel> converter; CGAL::Cartesian_converter<K, Local_kernel> converter;
return converter(r); return converter(r);
@ -121,6 +121,8 @@ namespace internal
{ return typename Local_kernel::Vector_3(v.x(), 0, v.y()); } { return typename Local_kernel::Vector_3(v.x(), 0, v.y()); }
static const typename Local_kernel::Vector_3& get_local_vector(const typename Local_kernel::Vector_3& v) static const typename Local_kernel::Vector_3& get_local_vector(const typename Local_kernel::Vector_3& v)
{ return v; } { return v; }
static const typename Local_kernel::Ray_2& get_local_ray(const typename Local_kernel::Ray_2& r)
{ return r; }
}; };
} // End namespace internal } // End namespace internal
@ -223,7 +225,7 @@ public:
{ {
if (!has_position()) return (std::size_t)-1; if (!has_position()) return (std::size_t)-1;
Local_point p=internal::get_local_point(kp); Local_point p=get_local_point(kp);
add_point_in_buffer(p, *m_pos_buffer); add_point_in_buffer(p, *m_pos_buffer);
return m_pos_buffer->size()-3; return m_pos_buffer->size()-3;
} }

18
GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
View File

@ -429,23 +429,21 @@ public:
{ m_buffer_for_colored_segments.add_segment(p1, p2, acolor); } { m_buffer_for_colored_segments.add_segment(p1, p2, acolor); }
template <typename KPoint, typename KVector> template <typename KPoint, typename KVector>
void update_bounding_box_for_ray(const KPoint &p, const KVector &v) { void update_bounding_box_for_ray(const KPoint &p, const KVector &v)
// m_buffer_for_mono_points.add_point(p); {
Local_point lp = internal::get_local_point(p); Local_point lp = get_local_point(p);
Local_vector lv = internal::get_local_vector(v); Local_vector lv = get_local_vector(v);
CGAL::Bbox_3 b = (lp + lv).bbox(); CGAL::Bbox_3 b = (lp + lv).bbox();
m_bounding_box += b; m_bounding_box += b;
// m_bounding_box += CGAL::Bbox_3(b.xmin(), 0, b.ymin(), b.xmax(), 0,
// b.ymax());
} }
template <typename KPoint, typename KVector> template <typename KPoint, typename KVector>
void update_bounding_box_for_line(const KPoint &p, const KVector &v, void update_bounding_box_for_line(const KPoint &p, const KVector &v,
const KVector &pv) const KVector &pv)
{ {
Local_point lp = internal::get_local_point(p); Local_point lp = get_local_point(p);
Local_vector lv = internal::get_local_vector(v); Local_vector lv = get_local_vector(v);
Local_vector lpv = internal::get_local_vector(pv); Local_vector lpv = get_local_vector(pv);
CGAL::Bbox_3 b = lp.bbox() + (lp + lv).bbox() + (lp + lpv).bbox(); CGAL::Bbox_3 b = lp.bbox() + (lp + lv).bbox() + (lp + lpv).bbox();
m_bounding_box += b; m_bounding_box += b;
@ -484,7 +482,7 @@ public:
template<typename KPoint> template<typename KPoint>
void add_text(const KPoint& kp, const QString& txt) void add_text(const KPoint& kp, const QString& txt)
{ {
Local_point p=internal::get_local_point(kp); Local_point p=get_local_point(kp);
m_texts.push_back(std::make_tuple(p, txt)); m_texts.push_back(std::make_tuple(p, txt));
} }